diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml
index 477a43b..b357293 100644
--- a/.gitea/workflows/build-release.yml
+++ b/.gitea/workflows/build-release.yml
@@ -67,16 +67,13 @@ jobs:
           echo "tag_name=${TAG_NAME}" >> "$GITHUB_OUTPUT"
           echo "short_sha=${SHORT_SHA}" >> "$GITHUB_OUTPUT"
 
-      - name: Set version tag in sources
-        env:
-          TAG_NAME: ${{ steps.prep.outputs.tag_name }}
-        run: |
-          sed -i "s/version_tag/${TAG_NAME}/g" main/User_config.h scripts/latest_version.json
-
       - name: Build OpenMQTTGateway Firmware (${{ steps.prep.outputs.pio_env }})
         env:
           PIO_ENV: ${{ steps.prep.outputs.pio_env }}
+          TAG_NAME: ${{ steps.prep.outputs.tag_name }}
         run: |
+          # Inject the firmware version (same mechanism as upstream scripts/ci_build_firmware.sh)
+          export PLATFORMIO_BUILD_FLAGS="-DOMG_VERSION=\\\"${TAG_NAME}\\\""
           mkdir -p ".pio/build/${PIO_ENV}"
           pio run -e "${PIO_ENV}"
 
diff --git a/.gitignore b/.gitignore
index 4887bbf..9185faa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,50 @@
 .pio
 .vscode
 *_env.ini
+*.pem
 **/.DS_Store
 node_modules
 *.ps1
 main/certs/private*
 lib/*
 !lib/esp32-bt-lib
+!lib/TheengsUtils
+!lib/LEDManager
 CMakeLists.txt
 dependencies.lock
 sdkconfig.*
 !sdkconfig.defaults
+__pycache__
+*.pem
+managed_components
+
+
+.github/chatmodes
+.github/prompts
+.github/*instructions.md
+.github/workflows/_docs
+# CI/CD Generated outputs
+docs/.vitepress/dist/
+docs/.vitepress/cache/
+docs/.vitepress/public/boards-info.json
+docs/.vitepress/public/commonConfig.js
+docs/.vitepress/public/firmware_build
+
+# Generated site/firmware/reports files
+generated/
+
+# Generated ssl for testing
+.ssl
+
+# Generated JSON files from templates
+scripts/latest_version.json
+scripts/latest_version_dev.json
+
+# Generated configuration files
+docs/.vitepress/meta.json
+
+# Generated full documentation pages
+docs/prerequisites/board-full.md
+docs/upload/web-install-full.md
+.superpowers/
+docs/superpowers/
diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 0000000..db9bb42
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1 @@
+disable=SC1091
\ No newline at end of file
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..56f138f
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,319 @@
+# OpenMQTTGateway - Claude Code Context
+
+This document provides essential context about the OpenMQTTGateway project for AI assistants working on the codebase.
+
+## Project Overview
+
+OpenMQTTGateway is a unified firmware that bridges various wireless technologies (RF 433MHz, IR, BLE, LoRa, etc.) to MQTT protocol, enabling home automation integration with platforms like Home Assistant, OpenHAB, and Node-RED.
+
+**Key Features:**
+- Multi-protocol gateway (BLE, RF 433MHz, IR, LoRa, RTL_433, Pilight, etc.)
+- ESP8266/ESP32 and Arduino support
+- MQTT-based communication
+- Web UI for configuration
+- Home Assistant MQTT Discovery support
+- Over 100 supported BLE sensors via Theengs Decoder
+
+**Main Branch:** `development` (not master/main)
+
+## Architecture
+
+### Modular Design
+
+The firmware uses a modular architecture where each protocol/sensor/actuator is implemented as a separate "gateway" or "sensor" module:
+
+- **Gateways**: Receive and transmit signals (e.g., `gatewayBT.cpp`, `gatewayRF.cpp`, `gatewayIR.cpp`)
+- **Sensors**: Read physical sensor data (e.g., `sensorBME280.cpp`, `sensorDHT.cpp`)
+- **Actuators**: Control outputs (e.g., `actuatorONOFF.cpp`, `actuatorPWM.cpp`)
+
+Each module has:
+- A config file (e.g., `config_BT.h`, `config_RF.h`)
+- An implementation file (e.g., `gatewayBT.cpp`, `gatewayRF.cpp`)
+
+### Configuration System
+
+Configuration is managed through:
+1. **User_config.h** - Main configuration file with defaults
+2. **config_*.h** - Module-specific configurations
+3. **platformio.ini & environments.ini** - Build-time configurations
+4. **prod_env.ini** - User-specific environments (gitignored)
+
+Build flags in `environments.ini` can override User_config.h parameters.
+
+## Directory Structure
+
+```
+OpenMQTTGateway/
+├── main/                    # Main source code (Arduino convention)
+│   ├── main.cpp            # Main application entry point
+│   ├── User_config.h       # Global configuration
+│   ├── config_*.h          # Module configurations
+│   ├── gateway*.cpp        # Gateway implementations
+│   ├── sensor*.cpp         # Sensor implementations
+│   ├── actuator*.cpp       # Actuator implementations
+│   ├── webUI.cpp           # Web interface
+│   ├── mqttDiscovery.cpp   # Home Assistant discovery
+│   └── rf/                 # RF-specific modules
+├── lib/                     # Custom libraries
+├── scripts/                 # Build and automation scripts
+├── docs/                    # VuePress documentation
+├── tests/                   # Test configurations
+├── environments.ini         # PlatformIO environment definitions
+├── platformio.ini          # PlatformIO configuration
+└── prod_env.ini.example    # Example production environment
+
+Note: src_dir is set to "main" in platformio.ini
+```
+
+## Key Concepts
+
+### Environment-Based Builds
+
+The project supports 80+ hardware configurations defined in `environments.ini`. Examples:
+- `esp32dev-ble` - ESP32 with BLE gateway
+- `esp32dev-pilight` - ESP32 with Pilight RF
+- `esp32dev-rtl_433` - ESP32 with RTL_433 decoder
+- `nodemcuv2-ir` - NodeMCU with IR
+- `rfbridge` - Sonoff RF Bridge
+
+### MQTT Topics
+
+Standard topic structure:
+- Base: `home/` (configurable via Base_Topic)
+- Gateway name: `OpenMQTTGateway` or `OMG` (configurable)
+- Example: `home/OpenMQTTGateway/BTtoMQTT`
+
+### Module Activation
+
+Modules are activated via build flags in environments.ini:
+```ini
+build_flags =
+    '-DZgatewayBT="BT"'     # Enable BLE gateway
+    '-DZgatewayRF="RF"'     # Enable RF gateway
+    '-DZsensorBME280="BME280"' # Enable BME280 sensor
+```
+
+### Web UI & WiFi Manager
+
+- ESP32/ESP8266 boards include a WiFiManager for initial setup
+- Access point: SSID = `WifiManager_ssid`, Password = `WifiManager_password`
+- Web UI provides runtime configuration and control
+- Can disable WiFiManager with `ESPWifiManualSetup` flag
+
+## Important Files
+
+### Core Files
+
+- **main/main.cpp** - Main application loop, MQTT handling, module coordination
+- **main/User_config.h** - Global configuration defaults
+- **main/webUI.cpp** - Web interface implementation
+- **main/mqttDiscovery.cpp** - Home Assistant MQTT discovery
+
+### Gateway Files
+
+- **main/gatewayBT.cpp** - BLE gateway (uses Theengs Decoder)
+- **main/gatewayRF.cpp** - RF 433MHz gateway (RCSwitch library)
+- **main/gatewayRF2.cpp** - Alternative RF implementation
+- **main/gatewayPilight.cpp** - Pilight protocol gateway
+- **main/gatewayRTL_433.cpp** - RTL_433 decoder integration
+- **main/gatewayIR.cpp** - Infrared gateway
+- **main/gatewayLORA.cpp** - LoRa gateway
+
+### Configuration Files
+
+All in `main/` directory:
+- **config_RF.h** - RF gateway configuration
+- **config_BT.h** - BLE gateway configuration
+- **config_IR.h** - IR gateway configuration
+- etc.
+
+### Build System
+
+- **platformio.ini** - Main PlatformIO config
+- **environments.ini** - All environment definitions (~3000+ lines)
+- **scripts/** - Python scripts for build automation
+
+## Common Patterns
+
+### Adding a New Gateway Module
+
+1. Create `gateway[NAME].cpp` in `main/`
+2. Create `config_[NAME].h` in `main/`
+3. Add build flag in `environments.ini`: `-DZgateway[NAME]="[NAME]"`
+4. Include conditional compilation: `#ifdef Zgateway[NAME]`
+5. Implement setup function: `setup[NAME]()`
+6. Implement loop function: `[NAME]toMQTT()`
+7. Optionally implement MQTT callback: `MQTTto[NAME]()`
+
+### Adding a New Sensor Module
+
+Similar to gateways, but prefix with `sensor` instead of `gateway` and `Z` becomes `Zsensor`.
+
+### Configuration Override Pattern
+
+```cpp
+#ifndef PARAM_NAME
+#  define PARAM_NAME default_value
+#endif
+```
+
+This allows platformio.ini build flags to override defaults.
+
+### MQTT Publishing Pattern
+
+```cpp
+pub(subjectToMQTT, data);  // Basic publish
+pub_custom_topic(topic, data, retain);  // Custom topic with retain
+```
+
+## Development Workflow
+
+### Building
+
+```bash
+# List all environments
+pio run --list-targets
+
+# Build specific environment
+pio run -e esp32dev-ble
+
+# Upload to device
+pio run -e esp32dev-ble -t upload
+
+# Monitor serial
+pio device monitor
+```
+
+### Code Formatting
+
+- Uses clang-format with config in `.clang-format`
+- CI checks formatting automatically
+- Format before committing
+
+### Testing
+
+- Unit tests in `tests/` directory
+- CI runs builds for all environments
+- Nightly builds test comprehensive environment matrix
+
+### Documentation
+
+- Documentation uses VuePress, located in `docs/`
+- Hosted at https://docs.openmqttgateway.com
+
+## CI/CD
+
+### GitHub Actions Workflows
+
+Located in `.github/workflows/`:
+- **build.yml** - Build validation on PRs
+- **nightly.yml** - Nightly builds of all environments
+- **format-check.yml** - Code formatting validation
+
+### Build Matrix
+
+The nightly build tests configurations:
+- ESP32 variants (ESP32, ESP32-S3, ESP32-C3)
+- ESP8266 variants (NodeMCU, Sonoff)
+- Different gateway combinations
+- Board-specific builds (M5Stack, Heltec, TTGO, etc.)
+
+## Common Issues & Solutions
+
+### Memory Constraints
+
+- ESP8266 has limited RAM (~40KB free)
+- Use `PROGMEM` for constants
+- Minimize module combinations on ESP8266
+- ESP32 has more headroom (~200KB+ free)
+
+### RF Module Conflicts
+
+- Some RF implementations (RF, RF2, Pilight, RTL_433) may conflict
+- Use separate environments for different RF approaches
+- Check GPIO pin assignments in config files
+
+### BLE on ESP32
+
+- BLE stack uses significant RAM
+- Limit simultaneous BLE connections
+
+## Related Projects
+
+- **Theengs Decoder** - BLE device decoder library
+- **Theengs Gateway** - Python version for Raspberry Pi/PC
+- **RTL_433_ESP** - ESP32 port of RTL_433
+
+## Resources
+
+- **Documentation**: https://docs.openmqttgateway.com
+- **Community Forum**: https://community.openmqttgateway.com
+- **GitHub**: https://github.com/1technophile/OpenMQTTGateway
+- **Web Installer**: https://docs.openmqttgateway.com/upload/web-install.html
+
+## Products
+
+- **Theengs Bridge** - ESP32 BLE gateway with Ethernet
+- **Theengs Plug** - Smart plug with BLE gateway
+
+## Conventions
+
+### Naming
+
+- Gateways: `gateway[NAME].cpp` with `Zgateway[NAME]` flag
+- Sensors: `sensor[NAME].cpp` with `Zsensor[NAME]` flag
+- Actuators: `actuator[NAME].cpp` with `Zactuator[NAME]` flag
+- Config files: `config_[NAME].h`
+
+### Code Style
+
+- 2-space indentation
+- Follow existing patterns in similar modules
+- Use preprocessor directives for module isolation
+- Comment complex RF protocols or BLE parsing
+
+### Git Workflow
+
+- Main branch: `development`
+- Feature branches from `development`
+- PRs target `development`
+- Squash commits when appropriate
+- Descriptive commit messages
+
+## Quick Start for Contributors
+
+1. Fork the repository
+2. Create `prod_env.ini` for your local environments
+3. Choose an environment from `environments.ini`
+4. Build: `pio run -e [environment-name]`
+5. Make changes following existing patterns
+6. Test build with your environment
+7. Run format check
+8. Submit PR to `development` branch
+
+## Platform-Specific Notes
+
+### ESP32
+- Preferred platform for new development
+- More RAM and Flash
+- Supports BLE natively
+- Can use Ethernet via add-on boards
+
+### ESP8266
+- Legacy support
+- Memory constrained
+- No native BLE
+- Good for simple RF/IR gateways
+
+## Tips for AI Assistants
+
+1. **Check environments.ini** when modifying build configurations
+2. **Follow existing module patterns** when adding new features
+3. **Test on relevant environments** - changes may affect multiple boards
+4. **Memory is precious** especially on ESP8266
+5. **MQTT topic structure** is critical for Home Assistant integration
+6. **Config headers** allow user customization without code changes
+7. **Use conditional compilation** to keep builds modular
+8. **WebUI changes** need both backend (webUI.cpp) and frontend (config_WebUI.h)
+9. **RF protocols** often need precise timing - be careful with changes
+10. **The main branch is `development`** - always target PRs there
diff --git a/README.md b/README.md
index 8ef78d4..c0ac0e9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
 [![Community forum](https://img.shields.io/badge/community-forum-brightgreen.svg)](https://community.openmqttgateway.com)
 
-![Build](https://github.com/1technophile/OpenMQTTGateway/workflows/Build/badge.svg?branch=development)
-![Check Code Format](https://github.com/1technophile/OpenMQTTGateway/workflows/Check%20Code%20Format/badge.svg?branch=development)
-
 [![OpenMQTTGateway capabilities](https://github.com/1technophile/OpenMQTTGateway/blob/development/docs/img/OpenMQTTGateway.png)](https://community.openmqttgateway.com)
 
 OpenMQTTGateway aims to unify various technologies and protocols into a single firmware. This reduces the need for multiple physical bridges and streamlines diverse technologies under the widely-used [MQTT](http://mqtt.org/) protocol.
@@ -15,49 +12,39 @@ OpenMQTTGateway aims to unify various technologies and protocols into a single f
 
 The documentation is [here](https://docs.openmqttgateway.com)
 
+New to OpenMQTTGateway? Follow the [Getting Started guide](https://docs.openmqttgateway.com/getting-started.html) to flash a board from your browser and see your first sensor data in about 15 minutes.
+
 The reference sheet, with the list of all functions, pinouts is [here](https://docs.google.com/spreadsheets/d/1_5fQjAixzRtepkykmL-3uN3G5bLfQ0zMajM9OBZ1bx0/edit#gid=0)
 
 ## Upload
 
-Upload OpenMQTTGateway directly from the [upload page](https://docs.openmqttgateway.com/upload/web-install.html) (no additional software required) or [build your own configuration](https://docs.openmqttgateway.com/upload/builds.html) with [PlatformIO](https://platformio.org/) or [Arduino IDE](https://www.arduino.cc/en/software)
+Upload OpenMQTTGateway directly from the [upload page](https://docs.openmqttgateway.com/upload/web-install.html) (no additional software required) or [build your own configuration](https://docs.openmqttgateway.com/upload/builds.html) with [PlatformIO](https://platformio.org/).
 
 ## Using OpenMQTTGateway ?
-Support open-source development through sponsorship and gain exclusive access to our private forum. Your questions, issues, and feature requests will receive priority attention, plus you'll gain insider access to our roadmap.
+Support open-source development through sponsorship, it helps keep the project healthy and evolving.
 
-[![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/theengs)
+[![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/1technophile)
 
 ## Products powered by OpenMQTTGateway
 
 ### Theengs Bridge, Bluetooth gateway (BLE) with external antenna
 
-[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [90 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity.
+[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [100 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity.
 
 [![Theengs bridge view](./docs/img/Theengs-Bridge-ble-gateway.png)](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna)
 
-### Theengs Plug, Bluetooth gateway (BLE) gateway and Smart Plug
-
-[Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption) brings the following features:
-* BLE to MQTT gateway, tens of [Bluetooth devices](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/) supported thanks to Theengs Decoder library. The plug uses an ESP32 acting as a BLE to Wifi gateway to scan, decode and forward the data of the nearby sensors,
-* Smart plug that can be controlled remotely,
-* Energy consumption monitoring,
-* Device tracker,
-* Presence detection (beta),
-* Local connectivity first.
-
-[![Theengs plug view](./docs/img/Theengs-Plug-OpenMQTTGateway.png)](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
-
-Support the project by purchasing the [Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) or the [Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
+Support the project by purchasing the [Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna)
 
 ## Compatible items
 
-* [List of supported devices](https://compatible.openmqttgateway.com/index.php/devices/), door/window sensors, PIR sensors, smoke detectors, weather stations...
+* [List of supported BLE devices](https://decoder.theengs.io/devices/devices.html), thermometers, scales, plant sensors, beacons...
 
-* [List of compatible boards (Off the shelf or DIY) is available](https://compatible.openmqttgateway.com/index.php/boards/), RF Bridge, IR, BLE gateways...
+* [Boards guide](https://docs.openmqttgateway.com/prerequisites/board.html), RF Bridge, IR, BLE gateways...
 
 *Running on a computer*
 If you want to use the BLE decoding capabilities of OpenMQTTGateway with a Raspberry Pi, Windows or Unix PC you can now leverage [Theengs Gateway](https://theengs.github.io/gateway/).
 
-* [List of compatible components to build your gateway](https://compatible.openmqttgateway.com/index.php/parts/), DHT, RF, IR emitters and receivers...
+* [Parts to build your gateway](https://docs.openmqttgateway.com/prerequisites/parts.html), DHT, RF, IR emitters and receivers...
 
 ## Compatible controllers, saas or software
 
@@ -82,7 +69,6 @@ For Questions or Support please don't open an issue, first go to the [docs](http
 If you like the project and/or used it please consider supporting it! It can be done in different ways:
 * Helping other users in the [community](https://community.openmqttgateway.com)
 * [Contribute](development) to the [code](https://github.com/1technophile/OpenMQTTGateway) or the [documentation](https://docs.openmqttgateway.com)
-* Buy devices, boards or parts from the [compatible web site](https://compatible.openmqttgateway.com), the devices and parts linked use affiliated links.
 * Donate or sponsor the project [developers](https://github.com/1technophile/OpenMQTTGateway/graphs/contributors)
 * Make a video or a blog article about what you have done with [OpenMQTTGateway](https://docs.openmqttgateway.com) and share it to the [community](https://community.openmqttgateway.com)
 
diff --git a/docs/.vitepress/commonConfig.mts b/docs/.vitepress/commonConfig.mts
new file mode 100644
index 0000000..fc0bf1d
--- /dev/null
+++ b/docs/.vitepress/commonConfig.mts
@@ -0,0 +1,41 @@
+// docs/.vitepress/commonConfig.mts
+// Adapter that loads the shared Theengs commonConfig.js (CommonJS) downloaded
+// by CI from https://www.theengs.io/commonConfig.js, and re-exports the nav
+// and head arrays in a format VitePress can consume.
+//
+// This keeps theengs.io as the single source of truth for nav/head until all
+// Theengs docs sites are migrated to VitePress.
+
+import { createRequire } from 'module'
+import { existsSync } from 'fs'
+import { resolve, dirname } from 'path'
+import { fileURLToPath } from 'url'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const require = createRequire(import.meta.url)
+
+const commonConfigPath = resolve(__dirname, 'public/commonConfig.js')
+
+let sharedConfig: any = null
+
+if (existsSync(commonConfigPath)) {
+  sharedConfig = require(commonConfigPath)
+} else {
+  console.warn(
+    'commonConfig.js not found in .vitepress/public/. ' +
+    'Using fallback nav/head. Run CI or download from https://www.theengs.io/commonConfig.js'
+  )
+}
+
+// Re-export nav from shared config, or use a minimal fallback
+export const commonNav = sharedConfig?.themeConfig?.nav ?? [
+  { text: 'Home', link: 'https://www.theengs.io' },
+  { text: 'Community', link: 'https://community.openmqttgateway.com' },
+  { text: 'Shop', link: 'https://shop.theengs.io/' }
+]
+
+// Re-export head from shared config, or use a minimal fallback
+export const commonHead = sharedConfig?.head ?? [
+  ['meta', { name: 'viewport', content: 'width=device-width, initial-scale=1' }],
+  ['meta', { name: 'theme-color', content: '#3eaf7c' }]
+]
diff --git a/docs/.vitepress/components/BoardEnvironmentTable.vue b/docs/.vitepress/components/BoardEnvironmentTable.vue
new file mode 100644
index 0000000..137d727
--- /dev/null
+++ b/docs/.vitepress/components/BoardEnvironmentTable.vue
@@ -0,0 +1,926 @@
+<template>
+  <div class="board-environment-list">
+    <div v-if="loading" class="custom-block tip">
+      <p class="custom-block-title">
+        <span class="loading-spinner" aria-label="Loading"></span>
+        Loading supported environments...
+      </p>
+    </div>
+
+    <div v-if="error" class="custom-block danger">
+      <p class="custom-block-title">Error</p>
+      <p>{{ error }}</p>
+    </div>
+
+    <div v-if="!loading && !error">
+      <!-- Guided picker -->
+      <div class="wizard">
+        <span class="wizard-title">Help me choose</span>
+        <div class="wizard-row">
+          <span class="filter-group__label">I want to bridge:</span>
+          <div class="filter-chips">
+            <button
+              v-for="b in bridgeOptions"
+              :key="b.key"
+              :class="['filter-chip', { 'filter-chip--active': wizardBridge === b.key }]"
+              @click="wizardBridge = wizardBridge === b.key ? null : b.key">
+              {{ b.label }}
+            </button>
+          </div>
+        </div>
+        <div class="wizard-row">
+          <span class="filter-group__label">My hardware:</span>
+          <div class="filter-chips">
+            <button
+              v-for="h in hardwareOptions"
+              :key="h.key"
+              :class="['filter-chip', { 'filter-chip--active': wizardHardware === h.key }]"
+              @click="wizardHardware = wizardHardware === h.key ? null : h.key">
+              {{ h.label }}
+            </button>
+          </div>
+        </div>
+        <div v-if="wizardBridge && recommendedBoard" class="wizard-result">
+          <div class="wizard-result__text">
+            <span>Recommended: <code>{{ recommendedBoard.environment }}</code></span>
+            <span v-if="recommendedBoard.description" class="wizard-result__desc" v-html="recommendedBoard.description"></span>
+            <span v-if="wizardHardware === 'none' && shoppingHint" class="wizard-result__desc">🛒 {{ shoppingHint }}</span>
+          </div>
+          <button class="wizard-result__cta" @click="openSelector(recommendedBoard.environment)">Flash it →</button>
+        </div>
+        <div v-else-if="wizardBridge && !recommendedBoard" class="wizard-result wizard-result--none">
+          No pre-built environment matches this combination<template v-if="wizardBridge === 'ble' && wizardHardware === 'esp8266'"> — Bluetooth needs an ESP32</template>. Try another hardware choice, or <a :href="buildsUrl">build from source</a>.
+        </div>
+      </div>
+
+      <!-- Search and Filter Bar -->
+      <div class="filter-bar">
+        <div class="search-box">
+          <svg class="search-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
+          <input
+            v-model="searchQuery"
+            type="text"
+            placeholder="Search by name, description, module..."
+            class="search-input"
+            aria-label="Search boards">
+          <button
+            v-if="searchQuery"
+            class="search-clear"
+            @click="searchQuery = ''"
+            aria-label="Clear search">
+            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+          </button>
+        </div>
+
+        <div v-if="hasActiveFilters" class="filter-status">
+          <span>Showing {{ filteredBoards.length }} of {{ boards.length }} boards</span>
+          <button class="filter-clear" @click="clearFilters">Clear all filters</button>
+        </div>
+      </div>
+
+      <!-- No Results -->
+      <div v-if="filteredBoards.length === 0" class="no-results">
+        <p>No boards match your filters.</p>
+        <button class="filter-clear" @click="clearFilters">Clear all filters</button>
+      </div>
+
+      <div class="boards-grid">
+      <article
+        v-for="board in filteredBoards"
+        :key="board.environment"
+        class="board-card"
+        @click="openSelector(board.environment)">
+
+        <div class="board-card__image">
+          <span v-if="popularEnvironments.includes(board.environment)" class="popular-badge">Popular</span>
+          <img
+            :src="getBoardImageUrl(board)"
+            :alt="board.environment"
+            loading="lazy">
+        </div>
+
+        <div class="board-card__content">
+          <div class="board-card__header">
+            <h3 class="board-card__title">
+              <code>{{ board.environment }}</code>
+            </h3>
+            <span v-if="board.microcontroller" class="board-card__chip">
+              {{ board.microcontroller }}
+            </span>
+          </div>
+
+          <p v-if="board.description" class="board-card__description" v-html="board.description">
+          </p>
+
+
+          <!-- Modules Section with expand/collapse -->
+          <div v-if="Array.isArray(board.modules) && board.modules.length" class="board-card__libraries">
+            <div class="modules-label-row">
+              <span class="libraries-label">Modules:</span>
+              <span
+                v-if="board.modules.length > 2"
+                class="expand-icon-btn"
+                @click.stop="toggleModules(board.environment)"
+                :title="expandedModules[board.environment] ? 'Hide' : 'Show all'">
+                <svg :class="{rotated: expandedModules[board.environment]}" width="19" height="19" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 6 15 12 9 18"/></svg>
+              </span>
+            </div>
+            <Transition name="expand-fade">
+              <div class="libraries-badges"
+                :style="expandedModules[board.environment] ? '' : 'max-height: 2.2em; overflow: hidden;'">
+                <span
+                  v-for="(mod, index) in board.modules"
+                  :key="index"
+                  class="lib-badge">
+                  {{ mod }}
+                </span>
+              </div>
+            </Transition>
+
+          </div>
+
+          <!-- Libraries Section with expand/collapse -->
+          <div v-if="Array.isArray(board.libraries) && board.libraries.length" class="board-card__libraries">
+            <div class="modules-label-row">
+              <span class="libraries-label">Libraries:</span>
+              <span
+                v-if="board.libraries.length > 2"
+                class="expand-icon-btn"
+                @click.stop="toggleLibraries(board.environment)"
+                :title="expandedLibraries[board.environment] ? 'Hide' : 'Show all'">
+                <svg :class="{rotated: expandedLibraries[board.environment]}" width="19" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 6 15 12 9 18"/></svg>
+              </span>
+
+            </div>
+            <Transition name="expand-fade">
+              <div class="libraries-badges"
+                :style="expandedLibraries[board.environment] ? '' : 'max-height: 2.2em; overflow: hidden;'">
+                <span
+                  v-for="(lib, index) in board.libraries"
+                  :key="index"
+                  class="lib-badge">
+                  {{ lib }}
+                </span>
+              </div>
+            </Transition>
+
+          </div>
+
+          <div class="board-card__action">
+            <span class="action-text">More info →</span>
+          </div>
+        </div>
+      </article>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted, watch } from 'vue'
+
+interface Board {
+  environment: string
+  description?: string
+  microcontroller?: string
+  modules?: string[]
+  libraries?: string[]
+  customImg?: string
+  CustomImg?: string
+}
+
+const props = withDefaults(defineProps<{
+  boardsUrl?: string
+  selectorPath?: string
+}>(), {
+  boardsUrl: '/boards-info.json',
+  selectorPath: '/upload/board-selector.html'
+})
+
+const boards = ref<Board[]>([])
+const loading = ref(false)
+const error = ref<string | null>(null)
+const expandedModules = reactive<Record<string, boolean>>({})
+const expandedLibraries = reactive<Record<string, boolean>>({})
+const searchQuery = ref('')
+const wizardBridge = ref<string | null>(null)
+const wizardHardware = ref<string | null>(null)
+
+const bridgeOptions = [
+  { key: 'ble', label: 'Bluetooth devices' },
+  { key: 'rf433', label: 'RF devices (433/868/915MHz)' },
+  { key: 'ir', label: 'Infrared' },
+  { key: 'lora', label: 'LoRa' }
+]
+
+const hardwareOptions = [
+  { key: 'esp32dev', label: 'Generic ESP32' },
+  { key: 'esp32c3', label: 'ESP32-C3' },
+  { key: 'esp32s3', label: 'ESP32-S3' },
+  { key: 'lilygo', label: 'LilyGo / Heltec / TTGO' },
+  { key: 'm5', label: 'M5Stack' },
+  { key: 'esp8266', label: 'ESP8266 / NodeMCU' },
+  { key: 'none', label: "I don't have hardware yet" }
+]
+
+const popularEnvironments = [
+  'esp32dev-ble',
+  'theengs-bridge-v11',
+  'lilygo-rtl_433',
+  'lilygo-rtl_433-fsk',
+  'esp32dev-ir'
+]
+
+function buildUrl(path: string): string {
+  const base = import.meta.env.BASE_URL || '/'
+  const cleanBase = base.endsWith('/') ? base.slice(0, -1) : base
+  const cleanPath = path.startsWith('/') ? path : `/${path}`
+  return `${cleanBase}${cleanPath}`
+}
+
+const resolvedBoardsUrl = computed(() => buildUrl(props.boardsUrl))
+const resolvedSelectorUrl = computed(() => buildUrl(props.selectorPath))
+
+function getMcuFamily(mcu: string | undefined): string | null {
+  if (!mcu) return null
+  const m = mcu.toLowerCase()
+  if (m.includes('esp32-s3') || m.includes('esp32s3') || m.includes('atoms3') || m.includes('lilygo-t3-s3')) return 'ESP32-S3'
+  if (m.includes('esp32-c3') || m.includes('esp32c3') || m.includes('lolin_c3') || m.includes('airm2m')) return 'ESP32-C3'
+  if (m.includes('esp32') || m.includes('m5st') || m.includes('heltec') || m.includes('ttgo') || m.includes('lolin32') || m.includes('pico32') || m.includes('tinypico') || m.includes('feather')) return 'ESP32'
+  if (m.includes('esp8') || m.includes('nodemcu')) return 'ESP8266'
+  return 'Other'
+}
+
+function matchesBridge(board: Board, bridge: string): boolean {
+  const mods = (board.modules || []).map(m => m.toLowerCase())
+  switch (bridge) {
+    case 'ble': return mods.some(m => m.includes('bt'))
+    case 'rf433': return mods.some(m => m.includes('rf') || m.includes('rtl_433') || m.includes('pilight'))
+    case 'ir': return mods.some(m => m.includes('ir'))
+    case 'lora': return mods.some(m => m.includes('lora'))
+    default: return true
+  }
+}
+
+function matchesHardware(board: Board, hardware: string): boolean {
+  const haystack = `${board.environment} ${board.microcontroller || ''}`.toLowerCase()
+  switch (hardware) {
+    case 'esp32dev': return board.environment.toLowerCase().includes('esp32dev')
+    case 'esp32c3': return getMcuFamily(board.microcontroller) === 'ESP32-C3'
+    case 'esp32s3': return getMcuFamily(board.microcontroller) === 'ESP32-S3'
+    case 'lilygo': return /lilygo|heltec|ttgo/.test(haystack)
+    case 'm5': return haystack.includes('m5')
+    case 'esp8266': return getMcuFamily(board.microcontroller) === 'ESP8266'
+    default: return true // 'none': no hardware constraint
+  }
+}
+
+// Preferred defaults per bridge choice, consulted before the generic
+// popular-first order. All entries must be web-flashable environments.
+const preferredByBridge: Record<string, string[]> = {
+  ble: ['esp32dev-ble', 'esp32c3-dev-c2-ble', 'esp32s3-dev-c1-ble', 'esp32-m5atom-lite', 'heltec-ble', 'lilygo-ble'],
+  rf433: ['lilygo-rtl_433', 'esp32dev-rtl_433', 'heltec-rtl_433', 'nodemcuv2-rf'],
+  ir: ['esp32dev-ir', 'nodemcuv2-ir', 'esp32-m5atom-lite'],
+  lora: ['ttgo-lora32-v21', 'heltec-wifi-lora-32', 'ttgo-lora32-v1', 'ttgo-t-beam']
+}
+
+const recommendedBoard = ref<Board | null>(null)
+const manifestCache = new Map<string, boolean>()
+
+// Not every environment in boards-info.json has a pre-built firmware
+// manifest; only recommend ones that can actually be web-flashed.
+async function hasManifest(env: string): Promise<boolean> {
+  const cached = manifestCache.get(env)
+  if (cached !== undefined) return cached
+  let ok = false
+  try {
+    const response = await fetch(buildUrl(`/firmware_build/${env}.manifest.json`), { method: 'HEAD' })
+    ok = response.ok
+  } catch {
+    ok = false
+  }
+  manifestCache.set(env, ok)
+  return ok
+}
+
+let recommendationToken = 0
+watch([wizardBridge, wizardHardware, boards], async () => {
+  const token = ++recommendationToken
+  const bridge = wizardBridge.value
+  if (!bridge) {
+    recommendedBoard.value = null
+    return
+  }
+  const candidates = boards.value.filter(b =>
+    matchesBridge(b, bridge) &&
+    (!wizardHardware.value || matchesHardware(b, wizardHardware.value))
+  )
+  const preferred = preferredByBridge[bridge] || []
+  const ordered = [...candidates].sort((a, b) => {
+    const ai = preferred.indexOf(a.environment)
+    const bi = preferred.indexOf(b.environment)
+    return (ai === -1 ? preferred.length : ai) - (bi === -1 ? preferred.length : bi)
+  })
+  for (const candidate of ordered.slice(0, 8)) {
+    if (await hasManifest(candidate.environment)) {
+      if (token === recommendationToken) recommendedBoard.value = candidate
+      return
+    }
+  }
+  if (token === recommendationToken) recommendedBoard.value = null
+})
+
+const shoppingHint = computed<string>(() => {
+  switch (wizardBridge.value) {
+    case 'ble':
+    case 'ir': return 'Any ESP32 development board will do.'
+    case 'rf433': return 'A LILYGO LoRa32 or Heltec LoRa V2 board matching your devices\' frequency (433/868/915MHz) needs no soldering.'
+    case 'lora': return 'Get a LILYGO LoRa32 or Heltec LoRa board matching the frequency used in your region.'
+    default: return ''
+  }
+})
+
+const buildsUrl = computed(() => buildUrl('/upload/builds.html'))
+
+const hasActiveFilters = computed(() =>
+  searchQuery.value || wizardBridge.value || wizardHardware.value
+)
+
+const filteredBoards = computed<Board[]>(() =>
+  boards.value.filter(board => {
+    if (wizardBridge.value && !matchesBridge(board, wizardBridge.value)) return false
+    if (wizardHardware.value && wizardHardware.value !== 'none' && !matchesHardware(board, wizardHardware.value)) return false
+    if (searchQuery.value) {
+      const q = searchQuery.value.toLowerCase()
+      const haystack = [
+        board.environment,
+        board.description || '',
+        board.microcontroller || '',
+        (board.modules || []).join(' ')
+      ].join(' ').toLowerCase()
+      if (!haystack.includes(q)) return false
+    }
+    return true
+  })
+)
+
+function clearFilters() {
+  searchQuery.value = ''
+  wizardBridge.value = null
+  wizardHardware.value = null
+}
+
+async function loadBoards() {
+  loading.value = true
+  error.value = null
+  try {
+    const response = await fetch(resolvedBoardsUrl.value)
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+    }
+    const data = await response.json()
+    if (!Array.isArray(data)) {
+      throw new Error('boards-info.json must be an array')
+    }
+    boards.value = data
+      .filter((board: Board) => board && typeof board.environment === 'string')
+      .sort((a: Board, b: Board) => {
+        const aPopular = popularEnvironments.includes(a.environment)
+        const bPopular = popularEnvironments.includes(b.environment)
+        if (aPopular && !bPopular) return -1
+        if (!aPopular && bPopular) return 1
+        return a.environment.localeCompare(b.environment)
+      })
+  } catch (err: unknown) {
+    console.error('Failed to load boards-info:', err)
+    error.value = err instanceof Error ? err.message : 'Unable to load board information'
+  } finally {
+    loading.value = false
+  }
+}
+
+function toggleModules(env: string) {
+  expandedModules[env] = !expandedModules[env]
+}
+
+function toggleLibraries(env: string) {
+  expandedLibraries[env] = !expandedLibraries[env]
+}
+
+function openSelector(environment: string) {
+  if (!environment) return
+  const url = `${resolvedSelectorUrl.value}?env=${encodeURIComponent(environment)}`
+  window.location.href = url
+}
+
+function getBoardImageUrl(board: Board): string {
+  const customImg = board.customImg || board.CustomImg
+  if (customImg) {
+    if (customImg.startsWith('http')) {
+      return customImg
+    }
+    return buildUrl(customImg)
+  }
+  return buildUrl('/img/microcontroller.gif')
+}
+
+onMounted(() => {
+  // Preset the guided picker from query parameters, e.g. ?bridge=ble&hardware=esp32dev
+  const params = new URLSearchParams(window.location.search)
+  const bridgeParam = params.get('bridge')
+  if (bridgeParam && bridgeOptions.some(b => b.key === bridgeParam)) {
+    wizardBridge.value = bridgeParam
+  }
+  const hardwareParam = params.get('hardware')
+  if (hardwareParam && hardwareOptions.some(h => h.key === hardwareParam)) {
+    wizardHardware.value = hardwareParam
+  }
+  loadBoards()
+})
+</script>
+
+<style scoped>
+.board-environment-list {
+  margin: 2rem 0;
+}
+
+/* Guided picker */
+.wizard {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 1.25rem;
+}
+
+.wizard-title {
+  font-weight: 600;
+  font-size: 0.95rem;
+}
+
+.wizard-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.wizard-result {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  flex-wrap: wrap;
+  border-top: 1px dashed var(--vp-c-divider);
+  padding-top: 12px;
+  font-size: 0.9rem;
+}
+
+.wizard-result__text {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.wizard-result__desc {
+  color: var(--vp-c-text-2);
+  font-size: 0.85rem;
+}
+
+.wizard-result__cta {
+  background: var(--vp-c-brand-1);
+  color: var(--vp-c-white, #fff);
+  border: none;
+  border-radius: 20px;
+  padding: 8px 18px;
+  font-weight: 600;
+  font-size: 0.9rem;
+  cursor: pointer;
+  transition: background 0.2s ease;
+}
+
+.wizard-result__cta:hover {
+  background: var(--vp-c-brand-2);
+}
+
+.wizard-result--none {
+  display: block;
+  color: var(--vp-c-text-2);
+}
+
+.wizard-result--none a {
+  color: var(--vp-c-brand-1);
+}
+
+/* Search and Filter Bar */
+.filter-bar {
+  margin-bottom: 1.5rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.search-box {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+
+.search-icon {
+  position: absolute;
+  left: 12px;
+  color: var(--vp-c-text-2);
+  pointer-events: none;
+}
+
+.search-input {
+  width: 100%;
+  padding: 0.6rem 2.2rem 0.6rem 2.4rem;
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 8px;
+  font-size: 0.9rem;
+  background: var(--vp-c-bg);
+  color: var(--vp-c-text-1);
+  transition: border-color 0.2s;
+}
+
+.search-input:focus {
+  outline: none;
+  border-color: var(--vp-c-brand-1);
+  box-shadow: 0 0 0 3px rgba(62, 175, 124, 0.15);
+}
+
+.search-input::placeholder {
+  color: var(--vp-c-text-3);
+}
+
+.search-clear {
+  position: absolute;
+  right: 8px;
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 4px;
+  color: var(--vp-c-text-2);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+}
+
+.search-clear:hover {
+  background: var(--vp-c-bg-soft);
+}
+
+.filter-groups {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 1rem;
+}
+
+.filter-group {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.filter-group__label {
+  font-size: 0.8rem;
+  font-weight: 600;
+  color: var(--vp-c-text-2);
+  white-space: nowrap;
+}
+
+.filter-chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.4rem;
+}
+
+.filter-chip {
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-1);
+  border: 1px solid var(--vp-c-divider);
+  padding: 0.25rem 0.7rem;
+  border-radius: 16px;
+  font-size: 0.78rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.filter-chip:hover {
+  border-color: var(--vp-c-brand-1);
+  color: var(--vp-c-brand-1);
+}
+
+.filter-chip--active {
+  background: var(--vp-c-brand-1);
+  color: #ffffff;
+  border-color: var(--vp-c-brand-1);
+}
+
+.filter-chip--active:hover {
+  color: #ffffff;
+  opacity: 0.9;
+}
+
+.filter-status {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  font-size: 0.85rem;
+  color: var(--vp-c-text-2);
+}
+
+.filter-clear {
+  background: none;
+  border: none;
+  color: var(--vp-c-brand-1);
+  cursor: pointer;
+  font-size: 0.85rem;
+  font-weight: 500;
+  padding: 0;
+}
+
+.filter-clear:hover {
+  text-decoration: underline;
+}
+
+.no-results {
+  text-align: center;
+  padding: 3rem 1rem;
+  color: var(--vp-c-text-2);
+}
+
+.no-results p {
+  margin-bottom: 1rem;
+}
+
+/* Grid Layout */
+.boards-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 1rem;
+  margin-top: 1.5rem;
+}
+
+/* Card Design */
+.board-card {
+  background: var(--vp-c-bg);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 8px;
+  overflow: hidden;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.board-card:hover {
+  transform: translateY(-4px);
+  box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+  border-color: var(--vp-c-brand-1);
+}
+
+/* Image Section */
+.board-card__image {
+  background: var(--vp-c-bg-soft);
+  padding: 1.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 120px;
+  border-bottom: 1px solid var(--vp-c-divider);
+  position: relative;
+}
+
+.popular-badge {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  background: #ff9800;
+  color: #ffffff;
+  font-size: 0.65rem;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  padding: 0.2rem 0.5rem;
+  border-radius: 4px;
+}
+
+.board-card__image img {
+  max-width: 100px;
+  max-height: 100px;
+  object-fit: contain;
+}
+
+/* Content Section */
+.board-card__content {
+  padding: 1.25rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+/* Header */
+.board-card__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 0.75rem;
+  margin-bottom: 0.25rem;
+}
+
+.board-card__title {
+  margin: 0;
+  font-size: 1rem;
+  font-weight: 600;
+  line-height: 1.4;
+  flex: 1;
+}
+
+.board-card__title code {
+  background: transparent;
+  color: var(--vp-c-brand-1);
+  font-size: 0.9em;
+  padding: 0;
+  font-weight: 600;
+}
+
+.board-card__chip {
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-2);
+  padding: 0.3rem 0.8rem;
+  border-radius: 4px;
+  font-size: 0.75rem;
+  font-weight: 600;
+  white-space: nowrap;
+  flex-shrink: 0;
+  border: 1px solid var(--vp-c-divider);
+}
+
+/* Description */
+.board-card__description {
+  margin: 0;
+  font-size: 0.9rem;
+  line-height: 1.5;
+  color: var(--vp-c-text-2);
+
+}
+
+/* Libraries Section */
+.board-card__libraries {
+  margin-top: 0.5rem;
+  padding-top: 0.25rem;
+  border-top: 1px solid var(--vp-c-divider);
+}
+
+.modules-label-row {
+  display: flex;
+  align-items: center;
+  gap: 0.2em;
+  margin-bottom: 0.5rem;
+}
+.libraries-label {
+  font-size: 0.8rem;
+  font-weight: 600;
+  color: var(--vp-c-text-2);
+  display: inline-block;
+}
+
+.libraries-badges {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.4rem;
+}
+
+.lib-badge {
+  display: inline-block;
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-1);
+  padding: 0.2rem 0.6rem;
+  border-radius: 4px;
+  font-size: 0.75rem;
+  font-weight: 500;
+  border: 1px solid var(--vp-c-divider);
+}
+
+/* Action Footer */
+.board-card__action {
+  padding-top: 0.75rem;
+  margin-top: 0.5rem;
+  border-top: 1px solid var(--vp-c-divider);
+}
+
+.action-text {
+  color: var(--vp-c-brand-1);
+  font-size: 0.85rem;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.board-card:hover .action-text {
+  text-decoration: underline;
+}
+
+/* Loading Spinner */
+.loading-spinner {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  min-width: 16px;
+  border: 2px solid #cfd8dc;
+  border-top-color: var(--vp-c-brand-1);
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+  vertical-align: middle;
+  margin-right: 0.5rem;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* Responsive */
+@media (max-width: 768px) {
+  .filter-groups {
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+
+  .filter-group {
+    flex-wrap: wrap;
+  }
+
+  .boards-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .board-card__image {
+    min-height: 100px;
+    padding: 1rem;
+  }
+
+  .board-card__image img {
+    max-width: 80px;
+    max-height: 80px;
+  }
+}
+
+@media (max-width: 480px) {
+  .board-card__header {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .board-card__chip {
+    align-self: flex-start;
+  }
+}
+/* Espansione animata per badge */
+.expand-fade-enter-active, .expand-fade-leave-active {
+  transition: max-height 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s;
+}
+.expand-fade-enter-from, .expand-fade-leave-to {
+  opacity: 0;
+  max-height: 0;
+}
+.expand-fade-enter-to, .expand-fade-leave-from {
+  opacity: 1;
+  max-height: 500px;
+}
+
+.expand-icon-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  background: none;
+  border: none;
+  color: var(--vp-c-brand-1);
+  cursor: pointer;
+  margin-top: 0.3em;
+  margin-left: 0.2em;
+  padding: 0.1em 0.2em;
+  border-radius: 50%;
+  transition: background 0.2s;
+}
+.expand-icon-btn:hover {
+  background: rgba(62, 175, 124, 0.08);
+}
+.expand-icon-btn svg {
+  transition: transform 0.25s cubic-bezier(0.4,0,0.2,1);
+  vertical-align: middle;
+}
+.expand-icon-btn svg.rotated {
+  transform: rotate(90deg);
+}
+</style>
diff --git a/docs/.vitepress/components/FlashEnvironmentSelector.vue b/docs/.vitepress/components/FlashEnvironmentSelector.vue
new file mode 100644
index 0000000..f8b78a0
--- /dev/null
+++ b/docs/.vitepress/components/FlashEnvironmentSelector.vue
@@ -0,0 +1,730 @@
+<template>
+  <div class="flash-selector">
+    <!-- Loading State -->
+    <div v-if="loading" class="custom-block tip">
+      <p class="custom-block-title">
+        <span class="loading-spinner"></span>
+        Loading environments...
+      </p>
+    </div>
+
+    <!-- Error State -->
+    <div v-if="error" class="custom-block danger">
+      <p class="custom-block-title">Error</p>
+      <p>{{ error }}</p>
+    </div>
+
+    <!-- Board Details (when selected) -->
+    <Transition name="fade">
+      <div v-if="currentEnvironment && !loading" class="board-details">
+
+        <!-- Hero Section - Clean and Focused -->
+        <div class="board-hero">
+          <div class="board-hero__content">
+            <!-- Inline Board Switcher -->
+            <h2>
+              <div class="board-switcher">
+                <label for="envSelect" class="switcher-label">Environment:</label>
+                <div class="switcher-select-wrapper">
+                  <select
+                    id="envSelect"
+                    v-model="selectedEnvironment"
+                    class="switcher-select">
+                    <option
+                      v-for="env in environments"
+                      :key="env.environment"
+                      :value="env.environment">
+                      {{ env.environment }}
+                    </option>
+                  </select>
+                  <span class="switcher-icon">⚙️</span>
+                </div>
+              </div>
+            </h2>
+
+            <div v-if="currentEnvironment.microcontroller" class="board-hero__meta">
+              <span class="meta-label">MCU:</span>
+              <span class="meta-value">{{ currentEnvironment.microcontroller }}</span>
+            </div>
+
+            <p v-if="currentEnvironment.description" class="board-hero__description">
+             <span class="meta-label">Description:</span> <span v-html="currentEnvironment.description"></span>
+            </p>
+
+            <!-- Primary Action -->
+            <div class="hero-action">
+              <esp-web-install-button
+                v-if="manifestUrl"
+                :manifest="manifestUrl"
+                aria-label="Flash firmware to device">
+              </esp-web-install-button>
+              <button v-else class="connect-button connect-button--disabled" disabled>
+                CONNECT
+              </button>
+            </div>
+          </div>
+
+          <!-- Image Optional -->
+          <div v-if="boardImageUrl && !imageError" class="board-hero__image">
+            <img
+              :src="boardImageUrl"
+              :alt="currentEnvironment.environment"
+              loading="lazy"
+              @error="handleImageError">
+          </div>
+        </div>
+
+        <!-- Technical Details - Collapsible -->
+        <details class="tech-details" open>
+          <summary class="tech-details__summary">
+            <span class="tech-details__icon">📋</span>
+            <span class="tech-details__title">Technical Information</span>
+            <span class="tech-details__toggle">▼</span>
+          </summary>
+
+          <div class="tech-details__content">
+            <div class="tech-grid">
+
+              <!-- Libraries -->
+              <div v-if="currentEnvironment.libraries && currentEnvironment.libraries.length" class="tech-section">
+                <h4 class="tech-section__title">Libraries</h4>
+                <div class="tech-section__content">
+                  <div class="chip-group">
+                    <span v-for="(lib, index) in currentEnvironment.libraries" :key="index" class="chip">
+                      {{ lib }}
+                    </span>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Gateway Modules -->
+              <div v-if="currentEnvironment.modules && currentEnvironment.modules.length" class="tech-section">
+                <h4 class="tech-section__title">Gateway Modules</h4>
+                <div class="tech-section__content">
+                  <div class="chip-group">
+                    <span v-for="(mod, index) in currentEnvironment.modules" :key="index" class="chip">
+                      {{ mod }}
+                    </span>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Hardware -->
+              <div v-if="currentEnvironment.hardware" class="tech-section">
+                <h4 class="tech-section__title">Hardware</h4>
+                <div class="tech-section__content" >
+                  <span class="chip" v-html="currentEnvironment.hardware"></span>
+                </div>
+              </div>
+
+              <!-- Partitions -->
+              <div v-if="currentEnvironment.partitions" class="tech-section">
+                <h4 class="tech-section__title">Partitions</h4>
+                <div class="tech-section__content">
+                  <code class="code-inline">{{ currentEnvironment.partitions }}</code>
+                </div>
+              </div>
+
+              <!-- Build Options -->
+              <div v-if="currentEnvironment.options" class="tech-section tech-section--full">
+                <h4 class="tech-section__title">Build Options</h4>
+                <div class="tech-section__content">
+                  <pre class="code-block">{{ formatOptions(currentEnvironment.options) }}</pre>
+                </div>
+              </div>
+            </div>
+          </div>
+        </details>
+
+        <!-- Post-flash next steps -->
+        <div class="next-steps">
+          <h3 class="next-steps__title">✅ After flashing</h3>
+          <ol class="next-steps__list">
+            <li>Keep the board powered — it starts a WiFi access point named <code>OpenMQTTGateway</code> or starting with <code>OMG_</code>.</li>
+            <li>From your phone or computer, connect to that WiFi network and follow the <a :href="portalUrl">configuration portal guide</a> to enter your WiFi and MQTT broker credentials.</li>
+            <li>The gateway restarts, joins your network and connects to your broker — <a :href="verifyUrl">check that it works</a>.</li>
+          </ol>
+        </div>
+      </div>
+
+    </Transition>
+    <!-- Board Detail not selected message -->
+    <Transition name="fade">
+      <div v-if="!currentEnvironment && !loading && !error" class="custom-block info">
+        <p class="custom-block-title">Need to select one environment...</p>
+      </div>
+    </Transition>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, onMounted } from 'vue'
+
+interface Environment {
+  environment: string
+  description?: string
+  microcontroller?: string
+  modules?: string[]
+  libraries?: string[]
+  hardware?: string
+  partitions?: string
+  options?: string | string[]
+  customImg?: string
+  CustomImg?: string
+}
+
+const props = withDefaults(defineProps<{
+  boardsUrl?: string
+  firmwareBaseUrl?: string
+}>(), {
+  boardsUrl: '/boards-info.json',
+  firmwareBaseUrl: '/firmware_build/'
+})
+
+const environments = ref<Environment[]>([])
+const selectedEnvironment = ref<string>('')
+const loading = ref<boolean>(true)
+const error = ref<string | null>(null)
+const imageError = ref<boolean>(false)
+
+const currentEnvironment = computed<Environment | undefined>(() => {
+  return environments.value.find(env => env.environment === selectedEnvironment.value)
+})
+
+const resolvedBoardsUrl = computed<string>(() => buildUrl(props.boardsUrl))
+
+const resolvedFirmwareBaseUrl = computed<string>(() => buildUrl(props.firmwareBaseUrl))
+
+const manifestUrl = computed<string | null>(() => {
+  if (!selectedEnvironment.value) return null
+  return `${resolvedFirmwareBaseUrl.value}${selectedEnvironment.value}.manifest.json`
+})
+
+const portalUrl = computed<string>(() => buildUrl('/upload/portal.html'))
+const verifyUrl = computed<string>(() => buildUrl('/getting-started.html#step-4-check-that-it-works'))
+
+const boardImageUrl = computed<string | null>(() => {
+  if (!currentEnvironment.value) return null
+  const customImg = currentEnvironment.value.customImg || currentEnvironment.value.CustomImg
+  if (customImg && !imageError.value) {
+    if (customImg.startsWith('http')) {
+      return customImg
+    }
+    return buildUrl(customImg)
+  }
+  return buildUrl('/img/microcontroller.gif')
+})
+
+watch(selectedEnvironment, () => {
+  imageError.value = false
+  error.value = null
+})
+
+onMounted(() => {
+  const script = document.createElement('script')
+  script.type = 'module'
+  script.src = 'https://unpkg.com/esp-web-tools@10/dist/web/install-button.js?module'
+  document.head.appendChild(script)
+  loadEnvironments()
+})
+
+function buildUrl(path: string): string {
+  const base = import.meta.env.BASE_URL || '/'
+  const cleanBase = base.endsWith('/') ? base.slice(0, -1) : base
+  const cleanPath = path.startsWith('/') ? path : `/${path}`
+  return `${cleanBase}${cleanPath}`
+}
+
+function getQueryParam(param: string): string | null {
+  const params = new URLSearchParams(window.location.search)
+  return params.get(param)
+}
+
+async function loadEnvironments(): Promise<void> {
+  loading.value = true
+  error.value = null
+
+  try {
+    const response = await fetch(resolvedBoardsUrl.value)
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+    }
+
+    const data = await response.json()
+
+    if (!Array.isArray(data)) {
+      throw new Error('Invalid data format: expected an array')
+    }
+
+    const validEnvironments = data.filter((env: unknown) =>
+      env &&
+      typeof env === 'object' &&
+      (env as Environment).environment &&
+      typeof (env as Environment).environment === 'string'
+    ) as Environment[]
+
+    if (validEnvironments.length === 0) {
+      throw new Error('No valid environments found in data')
+    }
+
+    environments.value = validEnvironments
+
+    const envParam = getQueryParam('env')
+    if (envParam) {
+      const matchingEnv = validEnvironments.find(env => env.environment === envParam)
+      if (matchingEnv) {
+        selectedEnvironment.value = envParam
+      } else {
+        console.warn(`Environment '${envParam}' not found in available environments`)
+      }
+    }
+  } catch (err) {
+    console.error('Failed to load environments:', err)
+    error.value = (err instanceof Error ? err.message : null) || 'Failed to load environments'
+  } finally {
+    loading.value = false
+  }
+}
+
+function formatOptions(optionsText: string | string[]): string {
+  if (!optionsText) return ''
+  let optionsTextMap: string[] = []
+  if (typeof optionsText === 'string') {
+    optionsTextMap = optionsText.split('\n')
+  } else if (Array.isArray(optionsText)) {
+    optionsTextMap = optionsText
+  }
+
+  return optionsTextMap.map(line => line.trim())
+    .filter(line => line.length > 0)
+    .join('\n')
+}
+
+function handleImageError(): void {
+  imageError.value = true
+}
+</script>
+
+<style scoped>
+/* Post-flash next steps */
+.next-steps {
+  margin-top: 16px;
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 12px;
+  padding: 20px 24px;
+}
+
+.next-steps__title {
+  margin: 0 0 8px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.next-steps__list {
+  margin: 0;
+  padding-left: 20px;
+}
+
+.next-steps__list li {
+  margin: 6px 0;
+  line-height: 1.6;
+}
+
+.next-steps__list a {
+  color: var(--vp-c-brand-1);
+  font-weight: 500;
+}
+
+/* Main Container */
+.flash-selector {
+  max-width: 1200px;
+  margin: 2rem auto;
+  padding: 0 1rem;
+}
+
+/* Board Details Container */
+.board-details {
+  margin-top: 2rem;
+}
+
+/* Hero Section - Material Design 3 */
+.board-hero {
+  display: grid;
+  grid-template-columns: 1fr auto;
+  gap: 24px;
+  background: var(--vp-c-bg);
+  border-radius: 12px;
+  padding: 32px;
+  margin-bottom: 16px;
+  box-shadow: 0 1px 2px 0 var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+}
+
+.board-hero__content {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  min-width: 0;
+}
+
+.board-hero__title {
+  margin: 0 0 8px 0;
+  font-size: 1.75rem;
+  font-weight: 400;
+  color: var(--vp-c-brand-1);
+  font-family: 'Monaco', 'Courier New', monospace;
+  line-height: 1.2;
+  letter-spacing: -0.01em;
+}
+
+/* Board Switcher - Material Chip Style */
+.board-switcher {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin: 0;
+  min-width: 0;
+}
+
+.switcher-label {
+  font-size: 0.75rem;
+  text-transform: uppercase;
+  font-weight: 500;
+  letter-spacing: 0.1em;
+  color: var(--vp-c-text-2);
+}
+
+.switcher-select-wrapper {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+  max-width: 100%;
+}
+
+.switcher-select {
+  appearance: none;
+  max-width: 100%;
+  text-overflow: ellipsis;
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-1);
+  border: none;
+  padding: 6px 32px 6px 12px;
+  border-radius: 16px;
+  font-size: 0.875rem;
+  font-weight: 500;
+  font-family: 'Monaco', 'Courier New', monospace;
+  cursor: pointer;
+  transition: background 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  min-height: 32px;
+  min-width: 280px;
+  width: auto;
+}
+
+.switcher-select:hover {
+  background: var(--vp-c-bg-soft);
+}
+
+.switcher-select:focus {
+  outline: 2px solid var(--vp-c-brand-1);
+  outline-offset: 2px;
+}
+
+.switcher-icon {
+  position: absolute;
+  right: 8px;
+  pointer-events: none;
+  font-size: 1rem;
+  opacity: 0.6;
+}
+
+.board-hero__meta {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+  margin: 0;
+}
+
+.meta-label {
+  font-size: 0.75rem;
+  text-transform: uppercase;
+  font-weight: 500;
+  letter-spacing: 0.1em;
+  color: var(--vp-c-text-2);
+}
+
+.meta-value {
+  font-size: 0.875rem;
+  font-weight: 500;
+  color: var(--vp-c-text-1);
+  font-family: 'Monaco', 'Courier New', monospace;
+}
+
+.board-hero__description {
+  margin: 0;
+  font-size: 1rem;
+  line-height: 1.5;
+  color: var(--vp-c-text-1);
+  max-width: 600px;
+}
+
+.board-hero__image {
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+  min-width: 0;
+  max-width: 200px;
+}
+
+.board-hero__image img {
+  max-width: 100%;
+  max-height: 180px;
+  object-fit: contain;
+}
+
+/* Primary Action - Material Filled Button */
+.hero-action {
+  margin-top: 8px;
+}
+
+.connect-button {
+  background: #1976d2;
+  color: #ffffff;
+  border: none;
+  padding: 10px 24px;
+  border-radius: 20px;
+  font-size: 0.875rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.15);
+  text-transform: uppercase;
+  letter-spacing: 0.125em;
+  height: 40px;
+  min-width: 120px;
+}
+
+.connect-button:hover:not(:disabled) {
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.3), 0 2px 6px 2px rgba(0, 0, 0, 0.15);
+}
+
+.connect-button:active:not(:disabled) {
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.15);
+}
+
+.connect-button--disabled {
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-3);
+  cursor: not-allowed;
+  box-shadow: none;
+}
+
+/* Technical Details - Material Surface */
+.tech-details {
+  background: var(--vp-c-bg);
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 1px 2px 0 var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+}
+
+.tech-details__summary {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 16px 24px;
+  cursor: pointer;
+  user-select: none;
+  background: var(--vp-c-bg-alt);
+  transition: background 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  list-style: none;
+}
+
+.tech-details__summary::-webkit-details-marker {
+  display: none;
+}
+
+.tech-details__summary:hover {
+  background: var(--vp-c-bg-soft);
+}
+
+.tech-details__icon {
+  font-size: 1.25rem;
+  opacity: 0.6;
+}
+
+.tech-details__title {
+  font-size: 1rem;
+  font-weight: 500;
+  color: var(--vp-c-text-1);
+  flex: 1;
+  letter-spacing: 0.01em;
+}
+
+.tech-details__toggle {
+  font-size: 0.875rem;
+  transition: transform 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  opacity: 0.6;
+}
+
+.tech-details[open] .tech-details__toggle {
+  transform: rotate(180deg);
+}
+
+.tech-details__content {
+  padding: 24px;
+}
+
+/* Tech Grid */
+.tech-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+  gap: 24px;
+}
+
+.tech-section {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.tech-section--full {
+  grid-column: 1 / -1;
+}
+
+.tech-section__title {
+  margin: 0;
+  font-size: 0.75rem;
+  text-transform: uppercase;
+  font-weight: 500;
+  letter-spacing: 0.1em;
+  color: var(--vp-c-text-2);
+}
+
+.tech-section__content {
+  font-size: 0.875rem;
+  line-height: 1.5;
+  color: var(--vp-c-text-1);
+}
+
+/* Chips - Material Design */
+.chip-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.chip {
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-1);
+  padding: 6px 12px;
+  border-radius: 8px;
+  font-size: 0.875rem;
+  font-weight: 400;
+  border: none;
+  height: 32px;
+  display: inline-flex;
+  align-items: center;
+}
+
+/* Code Styles - Material Surface */
+.code-inline {
+  background: var(--vp-c-bg-soft);
+  padding: 2px 6px;
+  border-radius: 4px;
+  font-size: 0.875rem;
+  font-family: 'Monaco', 'Courier New', monospace;
+  color: var(--vp-c-text-1);
+}
+
+.code-block {
+  background: var(--vp-c-bg-soft);
+  padding: 16px;
+  border-radius: 8px;
+  font-size: 0.8125rem;
+  line-height: 1.5;
+  overflow-x: auto;
+  margin: 0;
+  border: 1px solid var(--vp-c-divider);
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: 'Monaco', 'Courier New', monospace;
+  color: var(--vp-c-text-1);
+}
+
+/* Loading Spinner */
+.loading-spinner {
+  display: inline-block;
+  width: 18px;
+  height: 18px;
+  border: 2px solid rgba(62, 175, 124, 0.3);
+  border-top-color: var(--vp-c-brand-1);
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+  vertical-align: middle;
+  margin-right: 0.5rem;
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+/* Fade Transition */
+.fade-enter-active, .fade-leave-active {
+  transition: opacity 0.3s ease;
+}
+
+.fade-enter-from, .fade-leave-to {
+  opacity: 0;
+}
+
+/* Accessibility */
+.visually-hidden {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+
+/* Responsive Design */
+@media (max-width: 968px) {
+  .board-hero {
+    grid-template-columns: 1fr;
+  }
+
+  .board-hero__image {
+    order: -1;
+    max-width: 150px;
+    margin: 0 auto;
+  }
+
+  .tech-grid {
+    grid-template-columns: 1fr;
+  }
+}
+
+@media (max-width: 640px) {
+  .selector-card {
+    padding: 1.5rem;
+  }
+
+  .board-hero {
+    padding: 1.5rem;
+  }
+
+  .board-hero__title {
+    font-size: 1.5rem;
+  }
+
+  .connect-button {
+    width: 100%;
+    padding: 0.9rem 2rem;
+  }
+}
+</style>
diff --git a/docs/.vitepress/components/OmgPipeline.vue b/docs/.vitepress/components/OmgPipeline.vue
new file mode 100644
index 0000000..6667b91
--- /dev/null
+++ b/docs/.vitepress/components/OmgPipeline.vue
@@ -0,0 +1,124 @@
+<template>
+  <div class="omg-pipeline-wrap">
+    <div class="omg-pipeline">
+      <div class="omg-node">
+        <span class="omg-node-icon">🌡️</span>
+        <strong>Your devices</strong>
+        <span class="omg-node-sub">BLE · RF · IR · LoRa</span>
+      </div>
+      <span class="omg-arrow">⇄</span>
+      <div class="omg-node omg-node-brand">
+        <span class="omg-node-icon">📟</span>
+        <strong>OpenMQTTGateway</strong>
+        <span class="omg-node-sub">ESP32 / ESP8266</span>
+      </div>
+      <span class="omg-arrow">⇄</span>
+      <div class="omg-node">
+        <span class="omg-node-icon">🔀</span>
+        <strong>MQTT broker</strong>
+        <span class="omg-node-sub">Mosquitto...</span>
+      </div>
+      <span class="omg-arrow">⇄</span>
+      <div class="omg-node">
+        <span class="omg-node-icon">🏠</span>
+        <strong>Your controller</strong>
+        <span class="omg-node-sub">Home Assistant, OpenHAB...</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.omg-pipeline-wrap {
+  container-type: inline-size;
+  margin: 24px 0;
+}
+
+.omg-pipeline {
+  display: flex;
+  align-items: stretch;
+  gap: 8px;
+}
+
+.omg-node {
+  flex: 1 1 0;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  gap: 4px;
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 12px;
+  padding: 20px 10px;
+}
+
+.omg-node-brand {
+  border-color: var(--vp-c-brand-1);
+  box-shadow: 0 0 0 1px var(--vp-c-brand-1);
+}
+
+.omg-node-icon {
+  font-size: 28px;
+}
+
+.omg-node strong {
+  font-size: 15px;
+  line-height: 1.3;
+}
+
+.omg-node-sub {
+  color: var(--vp-c-text-2);
+  font-size: 13px;
+}
+
+.omg-arrow {
+  align-self: center;
+  flex-shrink: 0;
+  color: var(--vp-c-brand-1);
+  font-size: 20px;
+  font-weight: 700;
+}
+
+/* Narrow containers (doc column, tablets): tighten the nodes, keep one row */
+@container (max-width: 760px) {
+  .omg-pipeline {
+    gap: 6px;
+  }
+  .omg-node {
+    padding: 12px 6px;
+  }
+  .omg-node strong {
+    font-size: 13px;
+  }
+  .omg-node-sub {
+    font-size: 11px;
+  }
+  .omg-node-icon {
+    font-size: 22px;
+  }
+  .omg-arrow {
+    font-size: 16px;
+  }
+}
+
+/* Narrow (phones, small tablets): stack vertically. Below ~680px the four nodes
+   no longer leave room for the longest label ("OpenMQTTGateway"), which spilled
+   out of its box and over the arrows. */
+@container (max-width: 680px) {
+  .omg-pipeline {
+    flex-direction: column;
+  }
+  .omg-arrow {
+    transform: rotate(90deg);
+  }
+  .omg-node strong {
+    font-size: 15px;
+  }
+  .omg-node-sub {
+    font-size: 13px;
+  }
+}
+</style>
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
new file mode 100644
index 0000000..5191bba
--- /dev/null
+++ b/docs/.vitepress/config.mts
@@ -0,0 +1,147 @@
+// docs/.vitepress/config.mts
+import { defineConfig } from 'vitepress'
+import { resolve, dirname } from 'path'
+import { fileURLToPath } from 'url'
+import { commonNav, commonHead } from './commonConfig.mts'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+// Load metadata with override support
+import defaults from './defaults.json'
+let meta = { ...defaults }
+try {
+  const overrides = await import('./meta.json')
+  meta = { ...meta, ...overrides.default }
+} catch {
+  console.warn('meta.json not found or not valid. Using default configuration.')
+}
+
+export default defineConfig({
+  title: `${meta.title} - ${meta.version}`,
+  description: 'One gateway, many technologies: MQTT gateway for ESP8266 or ESP32 with bidirectional 433mhz/315mhz/868mhz/915mhz RF, Infrared communications, BLE, LoRa, beacons detection, mi flora / mi jia / LYWSD02/ Mi Scale compatibility, SMS & LORA.',
+  base: meta.url_prefix as '/' | `/${string}/`,
+  outDir: resolve(__dirname, '../../', meta.dest),
+  // Internal working documents, not part of the published site
+  srcExclude: ['superpowers/**'],
+  head: commonHead,
+  ignoreDeadLinks: [
+    /localhost/,
+    /LoraTemperature/
+  ],
+  lastUpdated: true,
+  markdown: {
+    lineNumbers: true
+  },
+  themeConfig: {
+    siteTitle: 'OpenMQTTGateway',
+    // @ts-expect-error custom fields consumed by index.md to render the dev-version banner
+    mode: meta.mode,
+    // @ts-expect-error
+    version: meta.version,
+    // @ts-expect-error
+    repo: meta.theme_config_repo,
+    nav: commonNav,
+    socialLinks: [
+      { icon: 'github', link: `https://github.com/${meta.theme_config_repo}` }
+    ],
+    editLink: {
+      pattern: `https://github.com/${meta.theme_config_repo}/edit/development/docs/:path`
+    },
+    sidebar: [
+      { text: 'What is it for', link: '/' },
+      { text: 'Getting Started', link: '/getting-started' },
+      {
+        text: '1 - Prerequisites',
+        collapsed: true,
+        items: [
+          { text: 'Devices', link: '/prerequisites/devices' },
+          { text: 'Board', link: '/prerequisites/board' },
+          { text: 'Parts', link: '/prerequisites/parts' },
+          { text: 'Broker', link: '/prerequisites/broker' },
+          { text: 'Controller', link: '/prerequisites/controller' }
+        ]
+      },
+      {
+        text: '2 - Upload',
+        collapsed: true,
+        link: '/upload/',
+        items: [
+          { text: '1. Web installer (easiest)', link: '/upload/web-install' },
+          { text: '2. Ready-to-go binaries', link: '/upload/binaries' },
+          { text: '3. Build from source', link: '/upload/builds' },
+          { text: 'Configuration portal', link: '/upload/portal' },
+          { text: 'Portal HTTP API', link: '/upload/portal-api' },
+          { text: 'Advanced Configuration', link: '/upload/advanced-configuration' },
+          { text: 'Troubleshoot', link: '/upload/troubleshoot' }
+        ]
+      },
+      {
+        text: '3 - Hardware setup',
+        collapsed: true,
+        items: [
+          { text: 'RF', link: '/setitup/rf' },
+          { text: 'BLE', link: '/setitup/ble' },
+          { text: 'IR', link: '/setitup/ir' },
+          { text: 'LoRa', link: '/setitup/lora' },
+          { text: 'GSM', link: '/setitup/gsm' },
+          { text: 'Serial', link: '/setitup/serial' },
+          { text: 'Sensors', link: '/setitup/sensors' },
+          { text: 'Actuators', link: '/setitup/actuators' }
+        ]
+      },
+      {
+        text: '4 - Use',
+        collapsed: true,
+        items: [
+          { text: 'RF', link: '/use/rf' },
+          { text: 'BLE', link: '/use/ble' },
+          { text: 'IR', link: '/use/ir' },
+          { text: 'LoRa', link: '/use/lora' },
+          { text: 'GSM', link: '/use/gsm' },
+          { text: 'Serial', link: '/use/serial' },
+          { text: 'RFM69', link: '/use/rfm69' },
+          { text: 'Sensors', link: '/use/sensors' },
+          { text: 'Actuators', link: '/use/actuators' },
+          { text: 'Boards', link: '/use/boards' },
+          { text: 'Displays', link: '/use/displays' },
+          { text: 'Gateway', link: '/use/gateway' },
+          { text: 'WebUI', link: '/use/webui' }
+        ]
+      },
+      {
+        text: '5 - Integrate',
+        collapsed: true,
+        items: [
+          { text: 'OpenHAB 2', link: '/integrate/openhab2' },
+          { text: 'OpenHAB 3', link: '/integrate/openhab3' },
+          { text: 'Home Assistant', link: '/integrate/home_assistant' },
+          { text: 'Node-RED', link: '/integrate/node_red' },
+          { text: 'AWS IoT', link: '/integrate/aws_iot' },
+          { text: 'Jeedom', link: '/integrate/jeedom' }
+        ]
+      },
+      {
+        text: '6 - Participate',
+        collapsed: true,
+        link: '/participate/',
+        items: [
+          { text: 'Contributor Quick Start', link: '/participate/quick_start' },
+          { text: 'Support', link: '/participate/support' },
+          { text: 'Development', link: '/participate/development' },
+          { text: 'Adding Protocols', link: '/participate/adding-protocols' },
+          { text: 'Community', link: '/participate/community' },
+          { text: 'License', link: meta.url_license_file }
+        ]
+      }
+    ],
+    search: {
+      provider: 'local'
+    }
+  },
+  sitemap: {
+    hostname: meta.hostname
+  },
+  vite: {
+    publicDir: '.vitepress/public'
+  }
+})
diff --git a/docs/.vitepress/defaults.json b/docs/.vitepress/defaults.json
new file mode 100644
index 0000000..2c8ddca
--- /dev/null
+++ b/docs/.vitepress/defaults.json
@@ -0,0 +1,12 @@
+{
+    "title": "Theengs OpenMQTTGateway",
+    "version": "edge",
+    "url_prefix": "/",
+    "dest": "generated/site",
+    "mode": "prod",
+    "url_license_file": "https://github.com/1technophile/OpenMQTTGateway/blob/development/LICENSE.txt",
+    "url_community_forum": "https://community.openmqttgateway.com",
+    "hostname": "https://docs.openmqttgateway.com",
+    "repo": "1technophile/OpenMQTTGateway",
+    "theme_config_repo": "1technophile/OpenMQTTGateway"
+}
\ No newline at end of file
diff --git a/docs/.vuepress/public/apple-touch-icon.png b/docs/.vitepress/public/apple-touch-icon.png
similarity index 100%
rename from docs/.vuepress/public/apple-touch-icon.png
rename to docs/.vitepress/public/apple-touch-icon.png
diff --git a/docs/.vuepress/public/favicon-144x144.png b/docs/.vitepress/public/favicon-144x144.png
similarity index 100%
rename from docs/.vuepress/public/favicon-144x144.png
rename to docs/.vitepress/public/favicon-144x144.png
diff --git a/docs/.vuepress/public/favicon-16x16.png b/docs/.vitepress/public/favicon-16x16.png
similarity index 100%
rename from docs/.vuepress/public/favicon-16x16.png
rename to docs/.vitepress/public/favicon-16x16.png
diff --git a/docs/.vuepress/public/favicon-32x32.png b/docs/.vitepress/public/favicon-32x32.png
similarity index 100%
rename from docs/.vuepress/public/favicon-32x32.png
rename to docs/.vitepress/public/favicon-32x32.png
diff --git a/docs/.vitepress/public/img/OpenMQTTGateway-sensors-ble.png b/docs/.vitepress/public/img/OpenMQTTGateway-sensors-ble.png
new file mode 100644
index 0000000..9ae8daf
Binary files /dev/null and b/docs/.vitepress/public/img/OpenMQTTGateway-sensors-ble.png differ
diff --git a/docs/.vitepress/public/img/OpenMQTTGateway.png b/docs/.vitepress/public/img/OpenMQTTGateway.png
new file mode 100644
index 0000000..e8ce218
Binary files /dev/null and b/docs/.vitepress/public/img/OpenMQTTGateway.png differ
diff --git a/docs/.vitepress/public/img/Theengs-Bridge-ble-gateway.png b/docs/.vitepress/public/img/Theengs-Bridge-ble-gateway.png
new file mode 100644
index 0000000..a1b166f
Binary files /dev/null and b/docs/.vitepress/public/img/Theengs-Bridge-ble-gateway.png differ
diff --git a/docs/.vitepress/public/img/Theengs-Plug-OpenMQTTGateway.png b/docs/.vitepress/public/img/Theengs-Plug-OpenMQTTGateway.png
new file mode 100644
index 0000000..96e8bda
Binary files /dev/null and b/docs/.vitepress/public/img/Theengs-Plug-OpenMQTTGateway.png differ
diff --git a/docs/.vitepress/public/img/boards/airm2m.png b/docs/.vitepress/public/img/boards/airm2m.png
new file mode 100644
index 0000000..493118c
Binary files /dev/null and b/docs/.vitepress/public/img/boards/airm2m.png differ
diff --git a/docs/.vitepress/public/img/boards/az-delivery.jpg b/docs/.vitepress/public/img/boards/az-delivery.jpg
new file mode 100644
index 0000000..a781f9a
Binary files /dev/null and b/docs/.vitepress/public/img/boards/az-delivery.jpg differ
diff --git a/docs/.vitepress/public/img/boards/esp32-feather.jpg b/docs/.vitepress/public/img/boards/esp32-feather.jpg
new file mode 100644
index 0000000..9a9ea9b
Binary files /dev/null and b/docs/.vitepress/public/img/boards/esp32-feather.jpg differ
diff --git a/docs/.vitepress/public/img/boards/esp32c3-devkit-c02.png b/docs/.vitepress/public/img/boards/esp32c3-devkit-c02.png
new file mode 100644
index 0000000..f6fc7f4
Binary files /dev/null and b/docs/.vitepress/public/img/boards/esp32c3-devkit-c02.png differ
diff --git a/docs/.vitepress/public/img/boards/esp32c3-devkit-m1.png b/docs/.vitepress/public/img/boards/esp32c3-devkit-m1.png
new file mode 100644
index 0000000..e367e8b
Binary files /dev/null and b/docs/.vitepress/public/img/boards/esp32c3-devkit-m1.png differ
diff --git a/docs/.vitepress/public/img/boards/esp32dev.jpg b/docs/.vitepress/public/img/boards/esp32dev.jpg
new file mode 100644
index 0000000..785e977
Binary files /dev/null and b/docs/.vitepress/public/img/boards/esp32dev.jpg differ
diff --git a/docs/.vitepress/public/img/boards/esp32doitv1.jpg b/docs/.vitepress/public/img/boards/esp32doitv1.jpg
new file mode 100644
index 0000000..9a256ff
Binary files /dev/null and b/docs/.vitepress/public/img/boards/esp32doitv1.jpg differ
diff --git a/docs/.vitepress/public/img/boards/esp32s3-devkit-c1.png b/docs/.vitepress/public/img/boards/esp32s3-devkit-c1.png
new file mode 100644
index 0000000..2a97806
Binary files /dev/null and b/docs/.vitepress/public/img/boards/esp32s3-devkit-c1.png differ
diff --git a/docs/.vitepress/public/img/boards/heltec-wifi-kit-32.png b/docs/.vitepress/public/img/boards/heltec-wifi-kit-32.png
new file mode 100644
index 0000000..3cc771f
Binary files /dev/null and b/docs/.vitepress/public/img/boards/heltec-wifi-kit-32.png differ
diff --git a/docs/.vitepress/public/img/boards/heltec-wifi-lora-32.png b/docs/.vitepress/public/img/boards/heltec-wifi-lora-32.png
new file mode 100644
index 0000000..2444d62
Binary files /dev/null and b/docs/.vitepress/public/img/boards/heltec-wifi-lora-32.png differ
diff --git a/docs/.vitepress/public/img/boards/lilygo-lora32-v21.jpg b/docs/.vitepress/public/img/boards/lilygo-lora32-v21.jpg
new file mode 100644
index 0000000..3cb5928
Binary files /dev/null and b/docs/.vitepress/public/img/boards/lilygo-lora32-v21.jpg differ
diff --git a/docs/.vitepress/public/img/boards/lilygo-t3-s3.jpg b/docs/.vitepress/public/img/boards/lilygo-t3-s3.jpg
new file mode 100644
index 0000000..7e4429b
Binary files /dev/null and b/docs/.vitepress/public/img/boards/lilygo-t3-s3.jpg differ
diff --git a/docs/.vitepress/public/img/boards/lolin-c3-mini.jpg b/docs/.vitepress/public/img/boards/lolin-c3-mini.jpg
new file mode 100644
index 0000000..6c076de
Binary files /dev/null and b/docs/.vitepress/public/img/boards/lolin-c3-mini.jpg differ
diff --git a/docs/.vitepress/public/img/boards/lolin32-lite.jpg b/docs/.vitepress/public/img/boards/lolin32-lite.jpg
new file mode 100644
index 0000000..dff1e4b
Binary files /dev/null and b/docs/.vitepress/public/img/boards/lolin32-lite.jpg differ
diff --git a/docs/.vitepress/public/img/boards/m5atom-lite.webp b/docs/.vitepress/public/img/boards/m5atom-lite.webp
new file mode 100644
index 0000000..330d4ce
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5atom-lite.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5atom-matrix.webp b/docs/.vitepress/public/img/boards/m5atom-matrix.webp
new file mode 100644
index 0000000..e1ac7ab
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5atom-matrix.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5atoms3u.webp b/docs/.vitepress/public/img/boards/m5atoms3u.webp
new file mode 100644
index 0000000..25d21c5
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5atoms3u.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stack-core.webp b/docs/.vitepress/public/img/boards/m5stack-core.webp
new file mode 100644
index 0000000..8903c7e
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stack-core.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stamp-c3.webp b/docs/.vitepress/public/img/boards/m5stamp-c3.webp
new file mode 100644
index 0000000..73c34ff
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stamp-c3.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stamp-c3u.webp b/docs/.vitepress/public/img/boards/m5stamp-c3u.webp
new file mode 100644
index 0000000..84978d8
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stamp-c3u.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stamp-s3.webp b/docs/.vitepress/public/img/boards/m5stamp-s3.webp
new file mode 100644
index 0000000..9896fb6
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stamp-s3.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stick-c-plus.webp b/docs/.vitepress/public/img/boards/m5stick-c-plus.webp
new file mode 100644
index 0000000..1ee901b
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stick-c-plus.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stick-c.webp b/docs/.vitepress/public/img/boards/m5stick-c.webp
new file mode 100644
index 0000000..70c56d9
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stick-c.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5stick.webp b/docs/.vitepress/public/img/boards/m5stick.webp
new file mode 100644
index 0000000..d463bdf
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5stick.webp differ
diff --git a/docs/.vitepress/public/img/boards/m5tough.webp b/docs/.vitepress/public/img/boards/m5tough.webp
new file mode 100644
index 0000000..0dc2d8f
Binary files /dev/null and b/docs/.vitepress/public/img/boards/m5tough.webp differ
diff --git a/docs/.vitepress/public/img/boards/nodemcuv2.jpg b/docs/.vitepress/public/img/boards/nodemcuv2.jpg
new file mode 100644
index 0000000..edd8a25
Binary files /dev/null and b/docs/.vitepress/public/img/boards/nodemcuv2.jpg differ
diff --git a/docs/.vitepress/public/img/boards/olimex-esp32-gateway.jpg b/docs/.vitepress/public/img/boards/olimex-esp32-gateway.jpg
new file mode 100644
index 0000000..39cd3ac
Binary files /dev/null and b/docs/.vitepress/public/img/boards/olimex-esp32-gateway.jpg differ
diff --git a/docs/.vitepress/public/img/boards/olimex-esp32-poe-iso.jpg b/docs/.vitepress/public/img/boards/olimex-esp32-poe-iso.jpg
new file mode 100644
index 0000000..d345775
Binary files /dev/null and b/docs/.vitepress/public/img/boards/olimex-esp32-poe-iso.jpg differ
diff --git a/docs/.vitepress/public/img/boards/olimex-esp32-poe.jpg b/docs/.vitepress/public/img/boards/olimex-esp32-poe.jpg
new file mode 100644
index 0000000..a0e4199
Binary files /dev/null and b/docs/.vitepress/public/img/boards/olimex-esp32-poe.jpg differ
diff --git a/docs/.vitepress/public/img/boards/shelly-plus1.jpg b/docs/.vitepress/public/img/boards/shelly-plus1.jpg
new file mode 100644
index 0000000..4236593
Binary files /dev/null and b/docs/.vitepress/public/img/boards/shelly-plus1.jpg differ
diff --git a/docs/.vitepress/public/img/boards/sonoff-basic.jpg b/docs/.vitepress/public/img/boards/sonoff-basic.jpg
new file mode 100644
index 0000000..855c64d
Binary files /dev/null and b/docs/.vitepress/public/img/boards/sonoff-basic.jpg differ
diff --git a/docs/.vitepress/public/img/boards/sonoff-rf-bridge.jpg b/docs/.vitepress/public/img/boards/sonoff-rf-bridge.jpg
new file mode 100644
index 0000000..6bd6de3
Binary files /dev/null and b/docs/.vitepress/public/img/boards/sonoff-rf-bridge.jpg differ
diff --git a/docs/.vitepress/public/img/boards/sonoff-rfr3.jpg b/docs/.vitepress/public/img/boards/sonoff-rfr3.jpg
new file mode 100644
index 0000000..8bfda39
Binary files /dev/null and b/docs/.vitepress/public/img/boards/sonoff-rfr3.jpg differ
diff --git a/docs/.vitepress/public/img/boards/thingpulse-espgateway.jpg b/docs/.vitepress/public/img/boards/thingpulse-espgateway.jpg
new file mode 100644
index 0000000..b4768c7
Binary files /dev/null and b/docs/.vitepress/public/img/boards/thingpulse-espgateway.jpg differ
diff --git a/docs/.vitepress/public/img/boards/tinypico.jpg b/docs/.vitepress/public/img/boards/tinypico.jpg
new file mode 100644
index 0000000..c440ab6
Binary files /dev/null and b/docs/.vitepress/public/img/boards/tinypico.jpg differ
diff --git a/docs/.vitepress/public/img/boards/ttgo-lora32-v1.jpg b/docs/.vitepress/public/img/boards/ttgo-lora32-v1.jpg
new file mode 100644
index 0000000..b9edca1
Binary files /dev/null and b/docs/.vitepress/public/img/boards/ttgo-lora32-v1.jpg differ
diff --git a/docs/.vitepress/public/img/boards/ttgo-t-beam.jpg b/docs/.vitepress/public/img/boards/ttgo-t-beam.jpg
new file mode 100644
index 0000000..d8efd0f
Binary files /dev/null and b/docs/.vitepress/public/img/boards/ttgo-t-beam.jpg differ
diff --git a/docs/.vitepress/public/img/boards/wt32-eth01.jpg b/docs/.vitepress/public/img/boards/wt32-eth01.jpg
new file mode 100644
index 0000000..c0820f8
Binary files /dev/null and b/docs/.vitepress/public/img/boards/wt32-eth01.jpg differ
diff --git a/docs/.vitepress/public/img/microcontroller.gif b/docs/.vitepress/public/img/microcontroller.gif
new file mode 100644
index 0000000..40a9bc2
Binary files /dev/null and b/docs/.vitepress/public/img/microcontroller.gif differ
diff --git a/docs/.vuepress/public/robots.txt b/docs/.vitepress/public/robots.txt
similarity index 100%
rename from docs/.vuepress/public/robots.txt
rename to docs/.vitepress/public/robots.txt
diff --git a/docs/.vitepress/theme/custom.css b/docs/.vitepress/theme/custom.css
new file mode 100644
index 0000000..9ee5a75
--- /dev/null
+++ b/docs/.vitepress/theme/custom.css
@@ -0,0 +1,123 @@
+/* docs/.vitepress/theme/custom.css */
+
+/* Prevent long site title from overlapping sidebar/nav */
+.VPNavBarTitle .title {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* The shared Theengs nav has seven top-level entries, and the default theme
+   switches from the hamburger to the full nav bar at 768px -- far too early for
+   this menu. Between 768px and ~1180px the entries overflowed: Shop, Sponsor,
+   the appearance switch and the GitHub link ended up clipped or off-screen, and
+   the page picked up a horizontal scrollbar. Keep the compact nav (hamburger +
+   full-screen menu, which already lists every entry plus the appearance switch
+   and social links) until the full menu genuinely fits. */
+@media (min-width: 768px) and (max-width: 1199px) {
+  .VPNav .VPNavBar .VPNavBarMenu.menu,
+  .VPNav .VPNavBar .VPNavBarExtra.extra {
+    display: none;
+  }
+
+  .VPNav .VPNavBar .VPNavBarHamburger.hamburger {
+    display: flex;
+  }
+
+  header.VPNav .VPNavScreen {
+    display: block;
+  }
+}
+
+/* Widen the entire content column on pages without aside (board/flash pages) */
+.VPDoc:not(.has-aside) .content-container,
+.VPDoc:not(.has-aside) .container {
+  max-width: 100% !important;
+}
+
+.VPDoc:not(.has-aside) .vp-doc {
+  max-width: 100% !important;
+}
+
+/* Enlarge the home hero image beyond the theme's ~320px default cap */
+.VPHome .VPHero .image-container {
+  transform: none;
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+}
+
+.VPHome .VPHero .image-bg {
+  display: none;
+}
+
+.VPHome .VPHero .image-src {
+  position: static;
+  transform: none;
+  width: 100%;
+  max-width: 420px;
+  max-height: none;
+}
+
+/* Below the desktop breakpoint the default theme stacks the image on top of the
+   hero text and pulls it with negative margins (-76px -24px -48px), which only
+   works because the image is normally absolutely positioned inside a fixed
+   320px box. Since we let it flow, those margins made it bleed off-screen and
+   collide with the hero title -- reset them. */
+@media (max-width: 959px) {
+  .VPHome .VPHero .image {
+    margin: 0 0 16px;
+  }
+}
+
+/* On phones the stacked image is a wall of unreadable logos that pushes the
+   title, tagline and call-to-action buttons below the fold. Drop it and let the
+   hero lead with the text. */
+@media (max-width: 639px) {
+  .VPHome .VPHero .image {
+    display: none;
+  }
+}
+
+@media (min-width: 960px) {
+  .VPHome .VPHero .image-src {
+    max-width: 520px;
+  }
+}
+
+/* Indented (non-fenced) markdown code blocks render as a bare <pre>; the default
+   theme only makes code scroll inside its language-* wrapper, so long lines such
+   as the esptool.py commands pushed the whole page sideways on phones. */
+.vp-doc pre {
+  overflow-x: auto;
+}
+
+/* Embeds are written as raw HTML in markdown with fixed width/height attributes
+   (e.g. <iframe width="560" height="315"> for YouTube), which pushes the whole
+   page sideways on phones. */
+.vp-doc iframe {
+  max-width: 100%;
+}
+
+.vp-doc iframe[src*="youtube.com/embed"],
+.vp-doc iframe[src*="youtube-nocookie.com/embed"],
+.vp-doc iframe[src*="player.vimeo.com"] {
+  display: block;
+  width: 100%;
+  height: auto;
+  aspect-ratio: 16 / 9;
+}
+
+/* Gray backdrop when ESP Web Tools install dialog is open */
+ewt-install-dialog {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
diff --git a/docs/.vitepress/theme/index.ts b/docs/.vitepress/theme/index.ts
new file mode 100644
index 0000000..7931a9c
--- /dev/null
+++ b/docs/.vitepress/theme/index.ts
@@ -0,0 +1,36 @@
+// docs/.vitepress/theme/index.ts
+import DefaultTheme from 'vitepress/theme'
+import mediumZoom from 'medium-zoom'
+import { onMounted, watch, nextTick } from 'vue'
+import { useRoute } from 'vitepress'
+import './custom.css'
+import BoardEnvironmentTable from '../components/BoardEnvironmentTable.vue'
+import FlashEnvironmentSelector from '../components/FlashEnvironmentSelector.vue'
+import OmgPipeline from '../components/OmgPipeline.vue'
+
+export default {
+  extends: DefaultTheme,
+  enhanceApp({ app }) {
+    app.component('BoardEnvironmentTable', BoardEnvironmentTable)
+    app.component('FlashEnvironmentSelector', FlashEnvironmentSelector)
+    app.component('OmgPipeline', OmgPipeline)
+  },
+  setup() {
+    const route = useRoute()
+
+    const initZoom = () => {
+      mediumZoom('.vp-doc img:not(.no-zoom)', {
+        background: 'var(--vp-c-bg)'
+      })
+    }
+
+    onMounted(() => {
+      initZoom()
+    })
+
+    watch(
+      () => route.path,
+      () => nextTick(() => initZoom())
+    )
+  }
+}
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
deleted file mode 100644
index a4a77a4..0000000
--- a/docs/.vuepress/config.js
+++ /dev/null
@@ -1,117 +0,0 @@
-const commonConfig = require('./public/commonConfig');
-
-module.exports = {
-  ...commonConfig,
-  title: 'Theengs OpenMQTTGateway version_tag',
-  base: '/',
-  description: 'One gateway, many technologies: MQTT gateway for ESP8266, ESP32, Sonoff RF Bridge or Arduino with bidirectional 433mhz/315mhz/868mhz, Infrared communications, BLE, beacons detection, mi flora / mi jia / LYWSD02/ Mi Scale compatibility, SMS & LORA.',
-  head: [
-    ...commonConfig.head,
-    ['script', {type: 'module', src: 'https://unpkg.com/esp-web-tools@9.4.3/dist/web/install-button.js?module'}]
-  ],
-  themeConfig: {
-    repo: '1technophile/OpenMQTTGateway',
-    docsDir: 'docs',
-    ...commonConfig.themeConfig,
-    sidebar: [
-      ['/','0 - What is it for 🏠'],
-      {
-        title: '1 - Prerequisites🧭',   // required
-        //collapsable: true, // optional, defaults to true
-        sidebarDepth: 1,    // optional, defaults to 1
-        children: [
-          'prerequisites/devices',
-          'prerequisites/board',
-          'prerequisites/parts',
-          'prerequisites/broker',
-          'prerequisites/controller']
-      },
-      {
-        title: '2 - Set it up 🔨',   // required
-        sidebarDepth: 1,    // optional, defaults to 1
-        children: [
-          'setitup/rf',
-          'setitup/ble',
-          'setitup/ir',
-          'setitup/lora',
-          'setitup/gsm',
-          'setitup/rs232',
-          'setitup/sensors',
-          'setitup/actuators'
-        ]
-      },
-      {
-        title: '3 - Upload ➡️',   // required
-        sidebarDepth: 1,    // optional, defaults to 1
-        children: [
-          'upload/web-install',
-          'upload/binaries',
-          'upload/builds',
-          'upload/gitpod',
-          'upload/portal',
-          'upload/advanced-configuration',
-          'upload/troubleshoot'
-        ]
-      },
-      {
-        title: '4 - Use ✈️',   // required
-        sidebarDepth: 1,    // optional, defaults to 1
-        children: [
-          'use/rf',
-          'use/ble',
-          'use/ir',
-          'use/lora',
-          'use/gsm',
-          'use/rs232',
-          'use/rfm69',
-          'use/sensors',
-          'use/actuators',
-          'use/boards',
-          'use/displays',
-          'use/gateway',
-          'use/webui'
-        ]
-      },
-      {
-        title: '5 - Integrate 🎉',   // required
-        sidebarDepth: 1,    // optional, defaults to 1
-        children: [
-          'integrate/openhab2',
-          'integrate/openhab3',
-          'integrate/home_assistant',
-          'integrate/node_red',
-          'integrate/aws_iot',
-          'integrate/jeedom'
-        ]
-      },
-      {
-        title: '6 - Participate 💻',   // required
-        sidebarDepth: 1,    // optional, defaults to 1
-        children: [
-          'participate/support',
-          'participate/development',
-          'participate/adding-protocols',
-          'participate/community',
-          ['https://github.com/1technophile/OpenMQTTGateway/blob/development/LICENSE.txt','License']
-        ]
-      }
-  ]
-  },
-  plugins: {
-    'sitemap': {
-      hostname: 'https://docs.openmqttgateway.com',
-      urls: [
-        'https://decoder.theengs.io/devices/devices.html',
-        'https://community.openmqttgateway.com/',
-        'https://shop.theengs.io/',
-        'https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption',
-        'https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna',
-        'https://app.theengs.io/',
-        'https://gateway.theengs.io/',
-        'https://decoder.theengs.io/',
-        'https://parser.theengs.io/',
-        'https://www.theengs.io/'
-      ],
-    },
-  }
-}
diff --git a/docs/.vuepress/styles/index.styl b/docs/.vuepress/styles/index.styl
deleted file mode 100644
index 8c5cc27..0000000
--- a/docs/.vuepress/styles/index.styl
+++ /dev/null
@@ -1,13 +0,0 @@
-div.table-generated-page
-  main
-    div.content__default,
-    footer.page-edit,
-    div.page-nav
-      // Display full with the API pages
-      max-width: 65%
-
-  .sidebar
-    z-index 6
-
-  .navbar
-    z-index 6
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 4ff2eba..0000000
--- a/docs/README.md
+++ /dev/null
@@ -1,113 +0,0 @@
-OpenMQTTGateway aims to unify various technologies and protocols into a single firmware. This reduces the need for multiple physical bridges and streamlines diverse technologies under the widely-used [MQTT](http://mqtt.org/) protocol.
-
-![Overview of the protocols and compatible controllers](./img/OpenMQTTGateway.png)
-
-# What is an MQTT gateway or bridge ?
-
-MQTT, short for Message Queuing Telemetry Transport, is a lightweight messaging protocol ideal for IoT devices.
-
-An MQTT gateway or bridge plays a pivotal role in the MQTT ecosystem:
-* Protocol Translation: It converts non-MQTT protocols (like LoRa or Bluetooth) into MQTT, enabling broader network communication.
-* Data Aggregation: Combines data from multiple devices into single messages, optimizing network use.
-* Security: Incorporates features like SSL/TLS encryption to safeguard data during transmission.
-* Device Management: Handles tasks like firmware updates and remote configuration changes.
-
-In essence, an MQTT gateway ensures smooth communication between devices and MQTT brokers, enhancing the efficiency and security of IoT systems.
-
-# What OpenMQTTGateway can do ?
-
-OpenMQTTGateway integrates with established technologies, such as 433mhz/315mhz protocols and infrared (IR), allowing you to upgrade and repurpose older devices. Additionally, OMG is compatible with modern technologies like Bluetooth Low Energy (BLE) and LoRa.
-
-To have an overview of the supported PIR, door, water, temperature, smoke sensors, sirens, rings, beacons, switches & weather stations you can take a look to the 
-[compatible devices list](https://compatible.openmqttgateway.com/index.php/devices)
-
-You can run OpenMQTTGateway on a wide variety of [boards](https://compatible.openmqttgateway.com/index.php/boards/), ESP32, ESP8266, Arduino MEGA, UNO (with limitation).
-BLE to MQTT gateway can also run on Raspberry Pi, Windows or Unix computers thanks to [Theengs Gateway](https://theengs.github.io/gateway/).
-
-Using MQTT, you can seamlessly integrate with home automation platforms such as OpenHAB, Home Assistant, and others, or with IoT software like Node-Red.
-
-# Use cases
-Leveraging OpenMQTTGateway with a controller allows you to:
-* Monitor a garden with a Mi Flora BLE sensor and control an irrigation valve depending on the soil moisture,
-* Trigger a fan depending on the temperature and humidity thanks to a Mi Jia/LYWSD03MMC BLE sensor,
-* Follow your meat temperature when cooking with an Inkbird IBBQ
-* Alert yourself by a controller notification if the temperature of a fridge or freezer is too high,
-* Detect a beacon/smartwatch so as to trigger a special scenario when you come home,
-* [Lose weight with the help of a complete log system](https://www.youtube.com/watch?v=noUROhtf0E0&t=18s), video from [@Andreas Spiess](https://www.youtube.com/channel/UCu7_D0o48KbfhpEohoP7YSQ)
-* Detect opened door or windows through 433mhz or BLE and alert yourself when leaving
-* Detect water leakage or smoke remotely
-* Actionate a siren if something is going wrong
-* Detect if your far mailbox has been opened by the postman with LoRa
-* Make smart your old TV or AC system through infrared control
-* Monitor vehicle tire pressure
-
-The limit is your imagination 😀
-
-# Functions
-Under the hood, OpenMQTTGateway offers features such as:
-* Deduplication
-* Simple and lite API
-* Strong integrations with libraries used
-* Signal forward/repeat
-* Wifi web portal onboarding
-* Web portal configuration
-* Whitelist & Blacklist management
-* Secure connections
-* Over the air updates
-* Local or cloud, your choice
-
-## Using OpenMQTTGateway ?
-Support open-source development through sponsorship and gain exclusive access to our private forum. Your questions, issues, and feature requests will receive priority attention, plus you'll gain insider access to our roadmap.
-
-<div style="text-align: center;">
-    <iframe src="https://github.com/sponsors/theengs/button" title="Sponsor Theengs" height="32" width="228" style="border: 0; border-radius: 6px;"></iframe>
-</div>
-
-## Products powered by OpenMQTTGateway
-
-### Theengs Bridge, BLE gateway with external antenna
-
-[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [90 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity.
-
-[![Theengs bridge view](./img/Theengs-Bridge-ble-gateway.png)](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna)
-
-### Theengs Plug, BLE gateway and Smart Plug
-
-[Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption) brings the following features:
-* BLE to MQTT gateway, tens of [Bluetooth devices](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/) supported thanks to Theengs Decoder library. The plug uses an ESP32 acting as a BLE to Wifi gateway to scan, decode and forward the data of the nearby sensors,
-* Smart plug that can be controlled remotely,
-* Energy consumption monitoring,
-* Device tracker,
-* Presence detection (beta),
-* Local connectivity first.
-
-[![Theengs plug view](./img/Theengs-Plug-OpenMQTTGateway.png)](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
-
-Support the project by purchasing the [Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) or the [Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
-
-## Media
-
-* [Hackaday - ARDUINO LIBRARY BRINGS RTL_433 TO THE ESP32](https://hackaday.com/2023/01/13/arduino-library-brings-rtl_433-to-the-esp32)
-* [CNX Software - 433 MHz is not dead! Using an ESP32 board with LoRa module to talk to 433 MHz sensors](https://www.cnx-software.com/2023/01/14/esp32-board-with-lora-433-mhz-sensors/)
-* [RTL_433 PORTED TO ESP32 MICROCONTROLLERS WITH CC1101 OR SX127X TRANSCEIVER CHIPS](https://www.rtl-sdr.com/rtl_433-ported-to-esp32-microcontrollers-with-cc1101-or-sx127x-transceiver-chips/)
-* [Using low-cost wireless sensors in the unlicensed bands](https://lwn.net/Articles/921497/)
-* [SMART PLUG ESP32 OPENMQTTGATEWAY SERVING AS AN BLE MQTT GATEWAY AND A POWER METER](https://www.electronics-lab.com/smart-plug-esp32-openmqttgateway-serving-as-an-ble-mqtt-gateway-and-a-power-meter/)
-
-### Theengs Plug
-[![Theengs Plug video ElektroMaker](https://img.youtube.com/vi/nUwMt9p2U7o/0.jpg)](https://www.youtube.com/watch?v=nUwMt9p2U7o&t=427s)
-
-### 433Mhz and BLE
-[![433Mhz and BLE gateway video by Andreas Spiess](https://img.youtube.com/vi/_gdXR1uklaY/0.jpg)](https://www.youtube.com/watch?v=_gdXR1uklaY)
-
-### BLE
-[![BLE gateway video by Andreas Spiess](https://img.youtube.com/vi/noUROhtf0E0/0.jpg)](https://www.youtube.com/watch?v=noUROhtf0E0)
-
-### 433Mhz
-[![RTL_433 video by TECH MIND](https://img.youtube.com/vi/H-JXWbWjJYE/0.jpg)](https://www.youtube.com/watch?v=H-JXWbWjJYE)
-
-### LORA
-[![LORA video by Priceless Toolkit](https://img.youtube.com/vi/6DftaHxDawM/0.jpg)](https://www.youtube.com/watch?v=6DftaHxDawM)
-
-::: warning Note
-The material and information contained in this documentation is for general information purposes only. You should not rely upon the material or information on this documentation as a basis for making any business, legal or any other decisions. There is no warranty given on this documentation content. If you decide to follow the information and materials given it is at your own risk. I will not be liable for any false, inaccurate, inappropriate or incomplete information presented on this website.
-:::
diff --git a/docs/getting-started.md b/docs/getting-started.md
new file mode 100644
index 0000000..c7b9736
--- /dev/null
+++ b/docs/getting-started.md
@@ -0,0 +1,73 @@
+# Getting Started
+
+This guide walks you through the two most popular setups from start to finish, flashed **from your browser** and integrated with **Home Assistant**. No soldering, no development environment, about 15 minutes:
+
+* **Bluetooth sensors** — any ESP32 board reading thermometers, plant sensors, scales...
+* **RF devices (433/315/868/915MHz)** — a LILYGO LoRa32 board receiving weather stations, door sensors, PIR sensors...
+
+Using another controller (OpenHAB, Node-RED...) or another technology (IR, LoRa)? Follow the same steps and take the detours linked along the way.
+
+## How the pieces fit together
+
+OpenMQTTGateway (OMG) is a firmware for your board that translates signals from your devices (Bluetooth sensors, RF remotes, weather stations...) into MQTT messages, and the other way around:
+
+<OmgPipeline />
+
+The **broker** is the message hub; the **controller** is the home automation software where you see and use the data.
+
+## What you need
+
+* **A board** — for **Bluetooth**, any ESP32 development board. For **RF**, a LILYGO® LoRa32 V2.1 or a Heltec LoRa V2 matching your devices' frequency — 433MHz for most European devices, 915MHz in North America (no soldering needed). See the [board guide](prerequisites/board.md) for other cases, or get a pre-flashed [Theengs Bridge](https://shop.theengs.io/) and skip the flashing step.
+* **A data USB cable** — some cables are charge-only and won't work.
+* **An MQTT broker** — see Step 1.
+* **A device to observe** — e.g. a [compatible Bluetooth sensor](https://decoder.theengs.io/devices/devices.html) such as a Mi Flora, LYWSD03MMC, Govee or Inkbird thermometer, or any RF sensor around you (weather station, door or PIR sensor...).
+
+## Step 1 — Set up the MQTT broker
+
+If you use **Home Assistant**, the simplest option is the Mosquitto add-on:
+
+1. In Home Assistant go to **Settings → Add-ons → Add-on store**, install **Mosquitto broker** and start it.
+2. Install the **MQTT integration** (**Settings → Devices & services → Add integration → MQTT**) if it isn't set up already.
+3. Create a dedicated user for the gateway in **Settings → People → Users** (e.g. `omg` — it doesn't need to be an administrator). The gateway will log in with it.
+
+No Home Assistant? Install [Mosquitto](https://mosquitto.org/) on any always-on machine, or see the [broker page](prerequisites/broker.md) for alternatives.
+
+## Step 2 — Flash the firmware from your browser
+
+1. Open the [web installer](upload/web-install.md) in **Chrome, Edge or Opera** (Firefox and Safari don't support web flashing).
+2. Connect the board to your computer with the USB cable.
+3. Pick the firmware matching your board and use case — the two most flashed:
+   * **Bluetooth** on a generic ESP32: <a href="./upload/board-selector.html?env=esp32dev-ble"><strong>esp32dev-ble</strong></a>
+   * **RF** on a LILYGO LoRa32: <a href="./upload/board-selector.html?env=lilygo-rtl_433"><strong>lilygo-rtl_433</strong></a> (the radio frequency is configurable afterwards)
+4. Click **Connect**, select the board's USB port, and let the installer finish.
+
+Prefer a desktop tool, or need a custom configuration? See the other [upload options](upload/index.md).
+
+## Step 3 — Connect the gateway to your WiFi and broker
+
+After flashing, the gateway starts its own WiFi access point:
+
+1. From your phone or computer, connect to the WiFi network named **OpenMQTTGateway** or starting with **OMG_** (no password, except for Theengs devices — see the [portal page](upload/portal.md)).
+2. A configuration page opens (on Android, accept "stay connected without internet"). Click **Configure WiFi**.
+3. Select your WiFi network and enter its password.
+4. Enter your broker's address as MQTT server (for the Home Assistant add-on, `homeassistant.local` or the server IP), keep port `1883`, and fill in the MQTT username and password from Step 1.
+5. Click **Save**. The gateway restarts and joins your network.
+
+The full list of portal fields is described on the [configuration portal page](upload/portal.md).
+
+## Step 4 — Check that it works
+
+* In Home Assistant, go to **Settings → Devices & services → MQTT**: after a minute you should see a device named **OpenMQTTGateway**, created automatically through MQTT discovery.
+* **Bluetooth**: bring a compatible sensor nearby — it appears as its own device with its measurements as entities. Some devices only advertise on an event: press a button or trigger a reading if nothing shows up.
+* **RF**: supported devices appear automatically as soon as they transmit — weather stations send every minute or two, door and PIR sensors on an event, so trigger one to see it arrive.
+* You can also watch the raw messages with [MQTT Explorer](https://mqtt-explorer.com/): connect to your broker and look for `home/OpenMQTTGateway/LWT` = `online` and messages under `home/OpenMQTTGateway/`.
+
+Something not right? Head to the [troubleshooting page](upload/troubleshoot.md) or ask on the [community forum](https://community.openmqttgateway.com).
+
+## Where to go next
+
+* **More RF options** — other <a href="./upload/web-install.html?bridge=rf433">compatible boards and firmwares</a>, transmitting, frequency tuning, and protocol details in [RF hardware setup](setitup/rf.md) and [RF usage](use/rf.md).
+* **Infrared** — wire an IR emitter/receiver following the [IR hardware setup](setitup/ir.md).
+* **Tune the gateway** — the [WebUI](use/webui.md) and [gateway commands](use/gateway.md) let you configure it at runtime over MQTT.
+* **Other controllers** — [OpenHAB](integrate/openhab3.md), [Node-RED](integrate/node_red.md), [Jeedom](integrate/jeedom.md), [AWS IoT](integrate/aws_iot.md).
+* **Full Home Assistant details** — [Home Assistant integration](integrate/home_assistant.md).
diff --git a/docs/img/EMQ.png b/docs/img/EMQ.png
index 669f9be..fcd09d3 100644
Binary files a/docs/img/EMQ.png and b/docs/img/EMQ.png differ
diff --git a/docs/img/HASS-RF-DeviceTrigger.png b/docs/img/HASS-RF-DeviceTrigger.png
new file mode 100644
index 0000000..de349eb
Binary files /dev/null and b/docs/img/HASS-RF-DeviceTrigger.png differ
diff --git a/docs/img/HASS-RF-MQTTSensor.png b/docs/img/HASS-RF-MQTTSensor.png
new file mode 100644
index 0000000..eb1f80c
Binary files /dev/null and b/docs/img/HASS-RF-MQTTSensor.png differ
diff --git a/docs/img/HASS-RF-Sensor-example.png b/docs/img/HASS-RF-Sensor-example.png
new file mode 100644
index 0000000..51a5f00
Binary files /dev/null and b/docs/img/HASS-RF-Sensor-example.png differ
diff --git a/docs/img/HASS-RF-Trigger-example.png b/docs/img/HASS-RF-Trigger-example.png
new file mode 100644
index 0000000..8e97609
Binary files /dev/null and b/docs/img/HASS-RF-Trigger-example.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Attach_Policy.png b/docs/img/Integrate_AWS_IOT_Attach_Policy.png
index a973a75..9c75f40 100644
Binary files a/docs/img/Integrate_AWS_IOT_Attach_Policy.png and b/docs/img/Integrate_AWS_IOT_Attach_Policy.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Attach_Policy2.png b/docs/img/Integrate_AWS_IOT_Attach_Policy2.png
index e932525..9b10625 100644
Binary files a/docs/img/Integrate_AWS_IOT_Attach_Policy2.png and b/docs/img/Integrate_AWS_IOT_Attach_Policy2.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Attach_Thing.png b/docs/img/Integrate_AWS_IOT_Attach_Thing.png
index 3e71cbb..75e9ad5 100644
Binary files a/docs/img/Integrate_AWS_IOT_Attach_Thing.png and b/docs/img/Integrate_AWS_IOT_Attach_Thing.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Attach_Thing2.png b/docs/img/Integrate_AWS_IOT_Attach_Thing2.png
index 0a3a8e3..13d87cd 100644
Binary files a/docs/img/Integrate_AWS_IOT_Attach_Thing2.png and b/docs/img/Integrate_AWS_IOT_Attach_Thing2.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Certificate.png b/docs/img/Integrate_AWS_IOT_Create_Certificate.png
index 6663614..2e50478 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Certificate.png and b/docs/img/Integrate_AWS_IOT_Create_Certificate.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Certificate2.png b/docs/img/Integrate_AWS_IOT_Create_Certificate2.png
index c59a538..ccb8510 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Certificate2.png and b/docs/img/Integrate_AWS_IOT_Create_Certificate2.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Certificate3.png b/docs/img/Integrate_AWS_IOT_Create_Certificate3.png
index 40cfb45..2a1d2df 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Certificate3.png and b/docs/img/Integrate_AWS_IOT_Create_Certificate3.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Policy.png b/docs/img/Integrate_AWS_IOT_Create_Policy.png
index 19e9f81..c0bfc43 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Policy.png and b/docs/img/Integrate_AWS_IOT_Create_Policy.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Policy2.png b/docs/img/Integrate_AWS_IOT_Create_Policy2.png
index fa8b161..f89a5f6 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Policy2.png and b/docs/img/Integrate_AWS_IOT_Create_Policy2.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Policy3.png b/docs/img/Integrate_AWS_IOT_Create_Policy3.png
index 813bc77..04b6624 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Policy3.png and b/docs/img/Integrate_AWS_IOT_Create_Policy3.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Thing.png b/docs/img/Integrate_AWS_IOT_Create_Thing.png
index 8e977e9..ce74d2a 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Thing.png and b/docs/img/Integrate_AWS_IOT_Create_Thing.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Thing2.png b/docs/img/Integrate_AWS_IOT_Create_Thing2.png
index edd5172..3b9af6f 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Thing2.png and b/docs/img/Integrate_AWS_IOT_Create_Thing2.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Thing3.png b/docs/img/Integrate_AWS_IOT_Create_Thing3.png
index 0f890aa..fae243f 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Thing3.png and b/docs/img/Integrate_AWS_IOT_Create_Thing3.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Create_Thing4.png b/docs/img/Integrate_AWS_IOT_Create_Thing4.png
index 5d70be0..a522bc4 100644
Binary files a/docs/img/Integrate_AWS_IOT_Create_Thing4.png and b/docs/img/Integrate_AWS_IOT_Create_Thing4.png differ
diff --git a/docs/img/Integrate_AWS_IOT_Find_Endpoint.png b/docs/img/Integrate_AWS_IOT_Find_Endpoint.png
index 184d17a..1c51388 100644
Binary files a/docs/img/Integrate_AWS_IOT_Find_Endpoint.png and b/docs/img/Integrate_AWS_IOT_Find_Endpoint.png differ
diff --git a/docs/img/Integrate_AWS_IOT_result_MQTT.png b/docs/img/Integrate_AWS_IOT_result_MQTT.png
index b0b1a6a..6f434c1 100644
Binary files a/docs/img/Integrate_AWS_IOT_result_MQTT.png and b/docs/img/Integrate_AWS_IOT_result_MQTT.png differ
diff --git a/docs/img/Integrate_Jeedom_Broker-brkTab.png b/docs/img/Integrate_Jeedom_Broker-brkTab.png
index de153c0..9e6d6fd 100644
Binary files a/docs/img/Integrate_Jeedom_Broker-brkTab.png and b/docs/img/Integrate_Jeedom_Broker-brkTab.png differ
diff --git a/docs/img/Integrate_Jeedom_Broker-eqTab.png b/docs/img/Integrate_Jeedom_Broker-eqTab.png
index 5fcc935..19202dd 100644
Binary files a/docs/img/Integrate_Jeedom_Broker-eqTab.png and b/docs/img/Integrate_Jeedom_Broker-eqTab.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Add.png b/docs/img/Integrate_Jeedom_Eq-Add.png
index 4cf9b83..b13f17e 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Add.png and b/docs/img/Integrate_Jeedom_Eq-Add.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Mijia-Cmds.png b/docs/img/Integrate_Jeedom_Eq-Mijia-Cmds.png
index f613087..ac28f29 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Mijia-Cmds.png and b/docs/img/Integrate_Jeedom_Eq-Mijia-Cmds.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Mijia-Create.png b/docs/img/Integrate_Jeedom_Eq-Mijia-Create.png
index bb5af97..b309f38 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Mijia-Create.png and b/docs/img/Integrate_Jeedom_Eq-Mijia-Create.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard-pimped.png b/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard-pimped.png
index 0aba143..efb4531 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard-pimped.png and b/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard-pimped.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard.png b/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard.png
index ebd4d67..2bae5b3 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard.png and b/docs/img/Integrate_Jeedom_Eq-Mijia-Dashboard.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd-Json.png b/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd-Json.png
index 5f5dfac..71be026 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd-Json.png and b/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd-Json.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd.png b/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd.png
index 228622c..a3335b8 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd.png and b/docs/img/Integrate_Jeedom_Eq-Mijia-tmp-Cmd.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT-mijia.png b/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT-mijia.png
index 772e04f..6fa5a1e 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT-mijia.png and b/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT-mijia.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT.png b/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT.png
index aa83384..33cd391 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT.png and b/docs/img/Integrate_Jeedom_Eq-OMG-BTtoMQTT.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-json.png b/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-json.png
index 786f0ed..02da12c 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-json.png and b/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-json.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-restart.png b/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-restart.png
index 0110592..684ad17 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-restart.png and b/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT-restart.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT.png b/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT.png
index f57f812..b16f152 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT.png and b/docs/img/Integrate_Jeedom_Eq-OMG-SYStoMQTT.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-cmd-added.png b/docs/img/Integrate_Jeedom_Eq-OMG-cmd-added.png
index 45636c2..a662f3a 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-cmd-added.png and b/docs/img/Integrate_Jeedom_Eq-OMG-cmd-added.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-cmds.png b/docs/img/Integrate_Jeedom_Eq-OMG-cmds.png
index 3f8d829..04f50c3 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-cmds.png and b/docs/img/Integrate_Jeedom_Eq-OMG-cmds.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-config.png b/docs/img/Integrate_Jeedom_Eq-OMG-config.png
index 525a722..ef00e26 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-config.png and b/docs/img/Integrate_Jeedom_Eq-OMG-config.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-lwt-formula.png b/docs/img/Integrate_Jeedom_Eq-OMG-lwt-formula.png
index 08d3727..cad2d86 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-lwt-formula.png and b/docs/img/Integrate_Jeedom_Eq-OMG-lwt-formula.png differ
diff --git a/docs/img/Integrate_Jeedom_Eq-OMG-lwt.png b/docs/img/Integrate_Jeedom_Eq-OMG-lwt.png
index 19e2808..3e80446 100644
Binary files a/docs/img/Integrate_Jeedom_Eq-OMG-lwt.png and b/docs/img/Integrate_Jeedom_Eq-OMG-lwt.png differ
diff --git a/docs/img/Integrate_Jeedom_Install-Activate.png b/docs/img/Integrate_Jeedom_Install-Activate.png
index d62667f..09eb433 100644
Binary files a/docs/img/Integrate_Jeedom_Install-Activate.png and b/docs/img/Integrate_Jeedom_Install-Activate.png differ
diff --git a/docs/img/Integrate_Jeedom_Install-Daemon-OK.png b/docs/img/Integrate_Jeedom_Install-Daemon-OK.png
index c277d18..27042a7 100644
Binary files a/docs/img/Integrate_Jeedom_Install-Daemon-OK.png and b/docs/img/Integrate_Jeedom_Install-Daemon-OK.png differ
diff --git a/docs/img/Integrate_Jeedom_Install-Deps-OK.png b/docs/img/Integrate_Jeedom_Install-Deps-OK.png
index aa72410..5b3e549 100644
Binary files a/docs/img/Integrate_Jeedom_Install-Deps-OK.png and b/docs/img/Integrate_Jeedom_Install-Deps-OK.png differ
diff --git a/docs/img/Integrate_Jeedom_Install-Deps.png b/docs/img/Integrate_Jeedom_Install-Deps.png
index c2bdc37..27c3022 100644
Binary files a/docs/img/Integrate_Jeedom_Install-Deps.png and b/docs/img/Integrate_Jeedom_Install-Deps.png differ
diff --git a/docs/img/Integrate_Jeedom_Install-Mosquitto.png b/docs/img/Integrate_Jeedom_Install-Mosquitto.png
index 3d1dcd4..f76bc2b 100644
Binary files a/docs/img/Integrate_Jeedom_Install-Mosquitto.png and b/docs/img/Integrate_Jeedom_Install-Mosquitto.png differ
diff --git a/docs/img/Integrate_Jeedom_Install-jMQTT.png b/docs/img/Integrate_Jeedom_Install-jMQTT.png
index c18d7c8..51c8bb4 100644
Binary files a/docs/img/Integrate_Jeedom_Install-jMQTT.png and b/docs/img/Integrate_Jeedom_Install-jMQTT.png differ
diff --git a/docs/img/KBeacon-app-configuration-moving.jpg b/docs/img/KBeacon-app-configuration-moving.jpg
index 8343c47..56e40a1 100644
Binary files a/docs/img/KBeacon-app-configuration-moving.jpg and b/docs/img/KBeacon-app-configuration-moving.jpg differ
diff --git a/docs/img/KBeacon-app-configuration-moving2.jpg b/docs/img/KBeacon-app-configuration-moving2.jpg
index e6da91d..e125d50 100644
Binary files a/docs/img/KBeacon-app-configuration-moving2.jpg and b/docs/img/KBeacon-app-configuration-moving2.jpg differ
diff --git a/docs/img/OMQTTG_8207.JPG b/docs/img/OMQTTG_8207.JPG
index a4cc953..2e54e33 100644
Binary files a/docs/img/OMQTTG_8207.JPG and b/docs/img/OMQTTG_8207.JPG differ
diff --git a/docs/img/OMQTTG_8211.JPG b/docs/img/OMQTTG_8211.JPG
index 3b3faed..11067c7 100644
Binary files a/docs/img/OMQTTG_8211.JPG and b/docs/img/OMQTTG_8211.JPG differ
diff --git a/docs/img/OMQTTG_8217.JPG b/docs/img/OMQTTG_8217.JPG
index d87b8f6..007e291 100644
Binary files a/docs/img/OMQTTG_8217.JPG and b/docs/img/OMQTTG_8217.JPG differ
diff --git a/docs/img/OpenMQTTGateway-BLE-tracker-Home-Assistant.png b/docs/img/OpenMQTTGateway-BLE-tracker-Home-Assistant.png
index b97125b..840b7d5 100644
Binary files a/docs/img/OpenMQTTGateway-BLE-tracker-Home-Assistant.png and b/docs/img/OpenMQTTGateway-BLE-tracker-Home-Assistant.png differ
diff --git a/docs/img/OpenMQTTGateway-Build-gitpod-env.png b/docs/img/OpenMQTTGateway-Build-gitpod-env.png
deleted file mode 100644
index 5079879..0000000
Binary files a/docs/img/OpenMQTTGateway-Build-gitpod-env.png and /dev/null differ
diff --git a/docs/img/OpenMQTTGateway-Build-gitpod.png b/docs/img/OpenMQTTGateway-Build-gitpod.png
deleted file mode 100644
index 775dc2d..0000000
Binary files a/docs/img/OpenMQTTGateway-Build-gitpod.png and /dev/null differ
diff --git a/docs/img/OpenMQTTGateway-Configuration-Home-Assistant-Discovery-Integration.png b/docs/img/OpenMQTTGateway-Configuration-Home-Assistant-Discovery-Integration.png
index 5a72a38..ae0b6d2 100644
Binary files a/docs/img/OpenMQTTGateway-Configuration-Home-Assistant-Discovery-Integration.png and b/docs/img/OpenMQTTGateway-Configuration-Home-Assistant-Discovery-Integration.png differ
diff --git a/docs/img/OpenMQTTGateway-Configuration-Home-Assistant.png b/docs/img/OpenMQTTGateway-Configuration-Home-Assistant.png
index 1e06506..448cc1e 100644
Binary files a/docs/img/OpenMQTTGateway-Configuration-Home-Assistant.png and b/docs/img/OpenMQTTGateway-Configuration-Home-Assistant.png differ
diff --git a/docs/img/OpenMQTTGateway-OTA-Update-Home-Assistant.png b/docs/img/OpenMQTTGateway-OTA-Update-Home-Assistant.png
index dbf77a0..56fc46f 100644
Binary files a/docs/img/OpenMQTTGateway-OTA-Update-Home-Assistant.png and b/docs/img/OpenMQTTGateway-OTA-Update-Home-Assistant.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding.png
index 11be6a0..293c552 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding2.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding2.png
index 7ae56c0..188d7dd 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding2.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding2.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding3.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding3.png
index 14c8b3f..a3f4b6c 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding3.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding3.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding4.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding4.png
index 5036002..818685a 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding4.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding4.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding5.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding5.png
index 5ae2f37..865fe65 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding5.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding5.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding6.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding6.png
index b46175c..6cc42bf 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding6.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-binding6.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-ip.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-ip.png
index 4d9e75c..7e4a664 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-ip.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-ip.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-jinja.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-jinja.png
index 1908e0a..72b4dba 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-jinja.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-jinja.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things.png
index 45e0712..0c2fa12 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things2.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things2.png
index 0646b34..94f5779 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things2.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things2.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things3.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things3.png
index f3db3cd..4022b6b 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things3.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things3.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things4.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things4.png
index 52caaf2..1dcb16e 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things4.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things4.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things5.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things5.png
index 1c8d176..5439eb7 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things5.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt-things5.png differ
diff --git a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt.png b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt.png
index 3ff5f1f..c6d4bc5 100644
Binary files a/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt.png and b/docs/img/OpenMQTTGateway-OpenHAB-Theengs-mqtt.png differ
diff --git a/docs/img/OpenMQTTGateway-home-assistant-chart.png b/docs/img/OpenMQTTGateway-home-assistant-chart.png
index f2ec402..adc94ea 100644
Binary files a/docs/img/OpenMQTTGateway-home-assistant-chart.png and b/docs/img/OpenMQTTGateway-home-assistant-chart.png differ
diff --git a/docs/img/OpenMQTTGateway-mqtt-explorer-lywsd03mmc-atc.png b/docs/img/OpenMQTTGateway-mqtt-explorer-lywsd03mmc-atc.png
index 373eb72..879acce 100644
Binary files a/docs/img/OpenMQTTGateway-mqtt-explorer-lywsd03mmc-atc.png and b/docs/img/OpenMQTTGateway-mqtt-explorer-lywsd03mmc-atc.png differ
diff --git a/docs/img/OpenMQTTGateway-sensors-ble.png b/docs/img/OpenMQTTGateway-sensors-ble.png
index de03925..c32dd17 100644
Binary files a/docs/img/OpenMQTTGateway-sensors-ble.png and b/docs/img/OpenMQTTGateway-sensors-ble.png differ
diff --git a/docs/img/OpenMQTTGateway.jpg b/docs/img/OpenMQTTGateway.jpg
index c9b41a6..523a5c6 100644
Binary files a/docs/img/OpenMQTTGateway.jpg and b/docs/img/OpenMQTTGateway.jpg differ
diff --git a/docs/img/OpenMQTTGateway.png b/docs/img/OpenMQTTGateway.png
index 937d1a2..e8ce218 100644
Binary files a/docs/img/OpenMQTTGateway.png and b/docs/img/OpenMQTTGateway.png differ
diff --git a/docs/img/OpenMQTTGateway_ESP32_breadboard.jpg b/docs/img/OpenMQTTGateway_ESP32_breadboard.jpg
index 712bf60..50ee257 100644
Binary files a/docs/img/OpenMQTTGateway_ESP32_breadboard.jpg and b/docs/img/OpenMQTTGateway_ESP32_breadboard.jpg differ
diff --git a/docs/img/OpenMQTTGateway_Home_Assistant_MQTT_discovery.png b/docs/img/OpenMQTTGateway_Home_Assistant_MQTT_discovery.png
index 29e4495..850e0a9 100644
Binary files a/docs/img/OpenMQTTGateway_Home_Assistant_MQTT_discovery.png and b/docs/img/OpenMQTTGateway_Home_Assistant_MQTT_discovery.png differ
diff --git a/docs/img/OpenMQTTGateway_IR_AVATTO_TYWE3S.png b/docs/img/OpenMQTTGateway_IR_AVATTO_TYWE3S.png
index abbdcc6..ec453db 100644
Binary files a/docs/img/OpenMQTTGateway_IR_AVATTO_TYWE3S.png and b/docs/img/OpenMQTTGateway_IR_AVATTO_TYWE3S.png differ
diff --git a/docs/img/OpenMQTTGateway_LORA_Configuration.png b/docs/img/OpenMQTTGateway_LORA_Configuration.png
index 03c43e4..be01292 100644
Binary files a/docs/img/OpenMQTTGateway_LORA_Configuration.png and b/docs/img/OpenMQTTGateway_LORA_Configuration.png differ
diff --git a/docs/img/OpenMQTTGateway_Pilight_Digoo-DG-R8S.png b/docs/img/OpenMQTTGateway_Pilight_Digoo-DG-R8S.png
index ae9bbbf..425b8d4 100644
Binary files a/docs/img/OpenMQTTGateway_Pilight_Digoo-DG-R8S.png and b/docs/img/OpenMQTTGateway_Pilight_Digoo-DG-R8S.png differ
diff --git a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_FTDI.jpg b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_FTDI.jpg
index 52b64b5..90d751b 100644
Binary files a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_FTDI.jpg and b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_FTDI.jpg differ
diff --git a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_OTA.png b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_OTA.png
index 96f45ab..b67bc83 100644
Binary files a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_OTA.png and b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_OTA.png differ
diff --git a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_disassembly.jpg b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_disassembly.jpg
index 8be4f40..604d034 100644
Binary files a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_disassembly.jpg and b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_disassembly.jpg differ
diff --git a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_green_led.jpg b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_green_led.jpg
index 8091fad..4cb973a 100644
Binary files a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_green_led.jpg and b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_green_led.jpg differ
diff --git a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_serial_and_broker.png b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_serial_and_broker.png
index 75b7ecf..c56f6a0 100644
Binary files a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_serial_and_broker.png and b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_serial_and_broker.png differ
diff --git a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_user_config.png b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_user_config.png
index 3faa9d4..662f483 100644
Binary files a/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_user_config.png and b/docs/img/OpenMQTTGateway_SONOFF_RF_Bridge_user_config.png differ
diff --git a/docs/img/OpenMQTTGateway_TTGO32_LORA_Receive.jpg b/docs/img/OpenMQTTGateway_TTGO32_LORA_Receive.jpg
index 5d353f6..65d4638 100644
Binary files a/docs/img/OpenMQTTGateway_TTGO32_LORA_Receive.jpg and b/docs/img/OpenMQTTGateway_TTGO32_LORA_Receive.jpg differ
diff --git a/docs/img/OpenMQTTGateway_TTGO32_LORA_Send.jpg b/docs/img/OpenMQTTGateway_TTGO32_LORA_Send.jpg
index b1c92a2..5c2778d 100644
Binary files a/docs/img/OpenMQTTGateway_TTGO32_LORA_Send.jpg and b/docs/img/OpenMQTTGateway_TTGO32_LORA_Send.jpg differ
diff --git a/docs/img/OpenMQTTGateway_Wifi_Manager_enter_parameters.png b/docs/img/OpenMQTTGateway_Wifi_Manager_enter_parameters.png
index 74cf7d7..2e9d978 100644
Binary files a/docs/img/OpenMQTTGateway_Wifi_Manager_enter_parameters.png and b/docs/img/OpenMQTTGateway_Wifi_Manager_enter_parameters.png differ
diff --git a/docs/img/OpenMQTTGateway_Wifi_Manager_menu.png b/docs/img/OpenMQTTGateway_Wifi_Manager_menu.png
index cc0ec33..205f68b 100644
Binary files a/docs/img/OpenMQTTGateway_Wifi_Manager_menu.png and b/docs/img/OpenMQTTGateway_Wifi_Manager_menu.png differ
diff --git a/docs/img/OpenMQTTGateway_Wifi_Manager_save.png b/docs/img/OpenMQTTGateway_Wifi_Manager_save.png
index 6078983..9b9a664 100644
Binary files a/docs/img/OpenMQTTGateway_Wifi_Manager_save.png and b/docs/img/OpenMQTTGateway_Wifi_Manager_save.png differ
diff --git a/docs/img/OpenMQTTGateway_arduino_esp32_sketchbook_folder.png b/docs/img/OpenMQTTGateway_arduino_esp32_sketchbook_folder.png
index 976a008..aa4f262 100644
Binary files a/docs/img/OpenMQTTGateway_arduino_esp32_sketchbook_folder.png and b/docs/img/OpenMQTTGateway_arduino_esp32_sketchbook_folder.png differ
diff --git a/docs/img/OpenMQTTGateway_auto_discovery_BLE_Sensor_Home_Assistant.gif b/docs/img/OpenMQTTGateway_auto_discovery_BLE_Sensor_Home_Assistant.gif
index 1cfe3d2..1851556 100644
Binary files a/docs/img/OpenMQTTGateway_auto_discovery_BLE_Sensor_Home_Assistant.gif and b/docs/img/OpenMQTTGateway_auto_discovery_BLE_Sensor_Home_Assistant.gif differ
diff --git a/docs/img/OpenMQTTGateway_auto_discovery_Gateway_Home_Assistant.gif b/docs/img/OpenMQTTGateway_auto_discovery_Gateway_Home_Assistant.gif
index b2cda02..4b4edba 100644
Binary files a/docs/img/OpenMQTTGateway_auto_discovery_Gateway_Home_Assistant.gif and b/docs/img/OpenMQTTGateway_auto_discovery_Gateway_Home_Assistant.gif differ
diff --git a/docs/img/OpenMQTTGateway_board_wifi_rf_gateway.png b/docs/img/OpenMQTTGateway_board_wifi_rf_gateway.png
index a7e8064..73918ea 100644
Binary files a/docs/img/OpenMQTTGateway_board_wifi_rf_gateway.png and b/docs/img/OpenMQTTGateway_board_wifi_rf_gateway.png differ
diff --git a/docs/img/OpenMQTTGateway_boards-removebg-preview.png b/docs/img/OpenMQTTGateway_boards-removebg-preview.png
index a59c03a..ebc1689 100644
Binary files a/docs/img/OpenMQTTGateway_boards-removebg-preview.png and b/docs/img/OpenMQTTGateway_boards-removebg-preview.png differ
diff --git a/docs/img/OpenMQTTGateway_boards.png b/docs/img/OpenMQTTGateway_boards.png
index ad51fb4..1209d33 100644
Binary files a/docs/img/OpenMQTTGateway_boards.png and b/docs/img/OpenMQTTGateway_boards.png differ
diff --git a/docs/img/OpenMQTTGateway_boards_avatto_s06.png b/docs/img/OpenMQTTGateway_boards_avatto_s06.png
index 3ed2886..20323a0 100644
Binary files a/docs/img/OpenMQTTGateway_boards_avatto_s06.png and b/docs/img/OpenMQTTGateway_boards_avatto_s06.png differ
diff --git a/docs/img/OpenMQTTGateway_boards_sonoff-removebg-preview.png b/docs/img/OpenMQTTGateway_boards_sonoff-removebg-preview.png
index d066ee1..22a6952 100644
Binary files a/docs/img/OpenMQTTGateway_boards_sonoff-removebg-preview.png and b/docs/img/OpenMQTTGateway_boards_sonoff-removebg-preview.png differ
diff --git a/docs/img/OpenMQTTGateway_boards_sonoff.png b/docs/img/OpenMQTTGateway_boards_sonoff.png
index a50e2ac..857def0 100644
Binary files a/docs/img/OpenMQTTGateway_boards_sonoff.png and b/docs/img/OpenMQTTGateway_boards_sonoff.png differ
diff --git a/docs/img/OpenMQTTGateway_boards_sonoff_rfbridge.png b/docs/img/OpenMQTTGateway_boards_sonoff_rfbridge.png
index 5df6e4b..81842ae 100644
Binary files a/docs/img/OpenMQTTGateway_boards_sonoff_rfbridge.png and b/docs/img/OpenMQTTGateway_boards_sonoff_rfbridge.png differ
diff --git a/docs/img/OpenMQTTGateway_boards_sonoff_rfr3.png b/docs/img/OpenMQTTGateway_boards_sonoff_rfr3.png
index c62c33b..921d324 100644
Binary files a/docs/img/OpenMQTTGateway_boards_sonoff_rfr3.png and b/docs/img/OpenMQTTGateway_boards_sonoff_rfr3.png differ
diff --git a/docs/img/OpenMQTTGateway_breadboard.jpg b/docs/img/OpenMQTTGateway_breadboard.jpg
index a16b79d..c128c13 100644
Binary files a/docs/img/OpenMQTTGateway_breadboard.jpg and b/docs/img/OpenMQTTGateway_breadboard.jpg differ
diff --git a/docs/img/OpenMQTTGateway_controllers.png b/docs/img/OpenMQTTGateway_controllers.png
index 81f5d5d..59c08ec 100644
Binary files a/docs/img/OpenMQTTGateway_controllers.png and b/docs/img/OpenMQTTGateway_controllers.png differ
diff --git a/docs/img/OpenMQTTGateway_devices_ble.png b/docs/img/OpenMQTTGateway_devices_ble.png
index 77a5c59..08353fd 100644
Binary files a/docs/img/OpenMQTTGateway_devices_ble.png and b/docs/img/OpenMQTTGateway_devices_ble.png differ
diff --git a/docs/img/OpenMQTTGateway_devices_rf1.png b/docs/img/OpenMQTTGateway_devices_rf1.png
index 4666e0b..f01489f 100644
Binary files a/docs/img/OpenMQTTGateway_devices_rf1.png and b/docs/img/OpenMQTTGateway_devices_rf1.png differ
diff --git a/docs/img/OpenMQTTGateway_devices_rf2.png b/docs/img/OpenMQTTGateway_devices_rf2.png
index 4dae908..c9dad90 100644
Binary files a/docs/img/OpenMQTTGateway_devices_rf2.png and b/docs/img/OpenMQTTGateway_devices_rf2.png differ
diff --git a/docs/img/OpenMQTTGateway_devices_rf3.png b/docs/img/OpenMQTTGateway_devices_rf3.png
index 0e920db..de4b354 100644
Binary files a/docs/img/OpenMQTTGateway_devices_rf3.png and b/docs/img/OpenMQTTGateway_devices_rf3.png differ
diff --git a/docs/img/OpenMQTTGateway_multiple_install.png b/docs/img/OpenMQTTGateway_multiple_install.png
index d4f0903..d557adb 100644
Binary files a/docs/img/OpenMQTTGateway_multiple_install.png and b/docs/img/OpenMQTTGateway_multiple_install.png differ
diff --git a/docs/img/OpenMQTTGateway_serial1.jpg b/docs/img/OpenMQTTGateway_serial1.jpg
index dddd741..4b40218 100644
Binary files a/docs/img/OpenMQTTGateway_serial1.jpg and b/docs/img/OpenMQTTGateway_serial1.jpg differ
diff --git a/docs/img/OpenMQTTGateway_serial2.jpg b/docs/img/OpenMQTTGateway_serial2.jpg
index a333be8..3d9a3dd 100644
Binary files a/docs/img/OpenMQTTGateway_serial2.jpg and b/docs/img/OpenMQTTGateway_serial2.jpg differ
diff --git a/docs/img/OpenMQTTGateway_serial3.jpg b/docs/img/OpenMQTTGateway_serial3.jpg
index a2d9d4d..773f627 100644
Binary files a/docs/img/OpenMQTTGateway_serial3.jpg and b/docs/img/OpenMQTTGateway_serial3.jpg differ
diff --git a/docs/img/OpenMQTTGateway_serial_2G_1.jpg b/docs/img/OpenMQTTGateway_serial_2G_1.jpg
index 01caecd..d997b08 100644
Binary files a/docs/img/OpenMQTTGateway_serial_2G_1.jpg and b/docs/img/OpenMQTTGateway_serial_2G_1.jpg differ
diff --git a/docs/img/OpenMQTTGateway_serial_2G_2.jpg b/docs/img/OpenMQTTGateway_serial_2G_2.jpg
index 05a77af..6c13f07 100644
Binary files a/docs/img/OpenMQTTGateway_serial_2G_2.jpg and b/docs/img/OpenMQTTGateway_serial_2G_2.jpg differ
diff --git a/docs/img/OpenMQTTgateway_Arduino_Addon_BT.png b/docs/img/OpenMQTTgateway_Arduino_Addon_BT.png
index 8b31cc5..ff22249 100644
Binary files a/docs/img/OpenMQTTgateway_Arduino_Addon_BT.png and b/docs/img/OpenMQTTgateway_Arduino_Addon_BT.png differ
diff --git a/docs/img/OpenMQTTgateway_Arduino_Addon_DHT.png b/docs/img/OpenMQTTgateway_Arduino_Addon_DHT.png
index b1efbe7..71c1e42 100644
Binary files a/docs/img/OpenMQTTgateway_Arduino_Addon_DHT.png and b/docs/img/OpenMQTTgateway_Arduino_Addon_DHT.png differ
diff --git a/docs/img/OpenMQTTgateway_Arduino_Addon_IR.png b/docs/img/OpenMQTTgateway_Arduino_Addon_IR.png
index 14eb193..2650dae 100644
Binary files a/docs/img/OpenMQTTgateway_Arduino_Addon_IR.png and b/docs/img/OpenMQTTgateway_Arduino_Addon_IR.png differ
diff --git a/docs/img/OpenMQTTgateway_Arduino_Addon_RF.png b/docs/img/OpenMQTTgateway_Arduino_Addon_RF.png
index e8e7dc9..0b852ed 100644
Binary files a/docs/img/OpenMQTTgateway_Arduino_Addon_RF.png and b/docs/img/OpenMQTTgateway_Arduino_Addon_RF.png differ
diff --git a/docs/img/OpenMQTTgateway_Arduino_Addon_RS232.png b/docs/img/OpenMQTTgateway_Arduino_Addon_RS232.png
index 64765d1..be426b5 100644
Binary files a/docs/img/OpenMQTTgateway_Arduino_Addon_RS232.png and b/docs/img/OpenMQTTgateway_Arduino_Addon_RS232.png differ
diff --git a/docs/img/OpenMQTTgateway_Arduino_AllInOne_IR-RF-BT-DHT.png b/docs/img/OpenMQTTgateway_Arduino_AllInOne_IR-RF-BT-DHT.png
index c1fad43..8418fb6 100644
Binary files a/docs/img/OpenMQTTgateway_Arduino_AllInOne_IR-RF-BT-DHT.png and b/docs/img/OpenMQTTgateway_Arduino_AllInOne_IR-RF-BT-DHT.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP32_Addon_IR.png b/docs/img/OpenMQTTgateway_ESP32_Addon_IR.png
index 9d94465..20c07c0 100644
Binary files a/docs/img/OpenMQTTgateway_ESP32_Addon_IR.png and b/docs/img/OpenMQTTgateway_ESP32_Addon_IR.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP32_Addon_RF.png b/docs/img/OpenMQTTgateway_ESP32_Addon_RF.png
index f27052e..929a16c 100644
Binary files a/docs/img/OpenMQTTgateway_ESP32_Addon_RF.png and b/docs/img/OpenMQTTgateway_ESP32_Addon_RF.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP32_Addon_RS232.png b/docs/img/OpenMQTTgateway_ESP32_Addon_RS232.png
index 345e94f..8d46477 100644
Binary files a/docs/img/OpenMQTTgateway_ESP32_Addon_RS232.png and b/docs/img/OpenMQTTgateway_ESP32_Addon_RS232.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP32_LORA_MSG.png b/docs/img/OpenMQTTgateway_ESP32_LORA_MSG.png
index 0eb0865..3fd309f 100644
Binary files a/docs/img/OpenMQTTgateway_ESP32_LORA_MSG.png and b/docs/img/OpenMQTTgateway_ESP32_LORA_MSG.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP32_binary_flash.png b/docs/img/OpenMQTTgateway_ESP32_binary_flash.png
index a3288a0..ab36cc1 100644
Binary files a/docs/img/OpenMQTTgateway_ESP32_binary_flash.png and b/docs/img/OpenMQTTgateway_ESP32_binary_flash.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP32_binary_flash2.png b/docs/img/OpenMQTTgateway_ESP32_binary_flash2.png
index 83ab713..abeb7ad 100644
Binary files a/docs/img/OpenMQTTgateway_ESP32_binary_flash2.png and b/docs/img/OpenMQTTgateway_ESP32_binary_flash2.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_2G.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_2G.png
index f324209..616bff8 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_2G.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_2G.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_DHT.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_DHT.png
index 6b86d58..7b35028 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_DHT.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_DHT.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_I2C.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_I2C.png
index 5d53b0d..7992ddd 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_I2C.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_I2C.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_IR.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_IR.png
index 2870ed8..9d17c81 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_IR.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_IR.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_RF.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_RF.png
index 38e09d9..23eb774 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_RF.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_RF.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_RFM69.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_RFM69.png
index cf9c5c1..ac3a088 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_RFM69.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_RFM69.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8266_Addon_RS232.png b/docs/img/OpenMQTTgateway_ESP8266_Addon_RS232.png
index 84c95b3..99985cd 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8266_Addon_RS232.png and b/docs/img/OpenMQTTgateway_ESP8266_Addon_RS232.png differ
diff --git a/docs/img/OpenMQTTgateway_ESP8285_Addon_IR.png b/docs/img/OpenMQTTgateway_ESP8285_Addon_IR.png
index 061ed9a..72e182d 100644
Binary files a/docs/img/OpenMQTTgateway_ESP8285_Addon_IR.png and b/docs/img/OpenMQTTgateway_ESP8285_Addon_IR.png differ
diff --git a/docs/img/OpenMQTTgateway_M5_Atom_Board.png b/docs/img/OpenMQTTgateway_M5_Atom_Board.png
index cea6bea..b982388 100644
Binary files a/docs/img/OpenMQTTgateway_M5_Atom_Board.png and b/docs/img/OpenMQTTgateway_M5_Atom_Board.png differ
diff --git a/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Logo.png b/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Logo.png
index 0a82ee1..56d8f0f 100644
Binary files a/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Logo.png and b/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Logo.png differ
diff --git a/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Text.png b/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Text.png
index ba8bc50..ee575db 100644
Binary files a/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Text.png and b/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Text.png differ
diff --git a/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Warning.png b/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Warning.png
index 4324c9e..7cec62f 100644
Binary files a/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Warning.png and b/docs/img/OpenMQTTgateway_M5_Stack_Board_Display_Warning.png differ
diff --git a/docs/img/OpenMQTTgateway_M5_StickC_Board_Display_Text.png b/docs/img/OpenMQTTgateway_M5_StickC_Board_Display_Text.png
index 349b661..cdd8f74 100644
Binary files a/docs/img/OpenMQTTgateway_M5_StickC_Board_Display_Text.png and b/docs/img/OpenMQTTgateway_M5_StickC_Board_Display_Text.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-chart-dashboard.png b/docs/img/OpenMQTTgateway_NODERED-chart-dashboard.png
index d7aa864..cb7caf7 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-chart-dashboard.png and b/docs/img/OpenMQTTgateway_NODERED-chart-dashboard.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-chart.png b/docs/img/OpenMQTTgateway_NODERED-chart.png
index 0d6df20..9fa8d42 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-chart.png and b/docs/img/OpenMQTTgateway_NODERED-chart.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-flow-BLE-temperature.png b/docs/img/OpenMQTTgateway_NODERED-flow-BLE-temperature.png
index c3cb2fa..f3564cd 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-flow-BLE-temperature.png and b/docs/img/OpenMQTTgateway_NODERED-flow-BLE-temperature.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-gauge-dashboard.png b/docs/img/OpenMQTTgateway_NODERED-gauge-dashboard.png
index 22b519b..856c370 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-gauge-dashboard.png and b/docs/img/OpenMQTTgateway_NODERED-gauge-dashboard.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-gauge.png b/docs/img/OpenMQTTgateway_NODERED-gauge.png
index 2cf0b53..b8e98a2 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-gauge.png and b/docs/img/OpenMQTTgateway_NODERED-gauge.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-integration-debug.png b/docs/img/OpenMQTTgateway_NODERED-integration-debug.png
index c1df1c9..5e2099e 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-integration-debug.png and b/docs/img/OpenMQTTgateway_NODERED-integration-debug.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-integration-debug2.png b/docs/img/OpenMQTTgateway_NODERED-integration-debug2.png
index 43cc447..fd00572 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-integration-debug2.png and b/docs/img/OpenMQTTgateway_NODERED-integration-debug2.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-integration-debug3.png b/docs/img/OpenMQTTgateway_NODERED-integration-debug3.png
index 5e235a0..62da36c 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-integration-debug3.png and b/docs/img/OpenMQTTgateway_NODERED-integration-debug3.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-integration-process.png b/docs/img/OpenMQTTgateway_NODERED-integration-process.png
index e96bae4..8bf6f09 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-integration-process.png and b/docs/img/OpenMQTTgateway_NODERED-integration-process.png differ
diff --git a/docs/img/OpenMQTTgateway_NODERED-integration.png b/docs/img/OpenMQTTgateway_NODERED-integration.png
index 4cae338..03c0be3 100644
Binary files a/docs/img/OpenMQTTgateway_NODERED-integration.png and b/docs/img/OpenMQTTgateway_NODERED-integration.png differ
diff --git a/docs/img/OpenMQTTgateway_NodeMCU_PyFlasher.png b/docs/img/OpenMQTTgateway_NodeMCU_PyFlasher.png
index 9029c36..483b5f9 100644
Binary files a/docs/img/OpenMQTTgateway_NodeMCU_PyFlasher.png and b/docs/img/OpenMQTTgateway_NodeMCU_PyFlasher.png differ
diff --git a/docs/img/OpenMQTTgateway_OpenHAB_Control.png b/docs/img/OpenMQTTgateway_OpenHAB_Control.png
index 50a2a79..b24f223 100644
Binary files a/docs/img/OpenMQTTgateway_OpenHAB_Control.png and b/docs/img/OpenMQTTgateway_OpenHAB_Control.png differ
diff --git a/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_Upload_Parameters.png b/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_Upload_Parameters.png
index b466a9c..5aa636e 100644
Binary files a/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_Upload_Parameters.png and b/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_Upload_Parameters.png differ
diff --git a/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_results.png b/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_results.png
index be6f4c8..9e12b6b 100644
Binary files a/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_results.png and b/docs/img/OpenMQTTgateway_SONOFF_RFBRIDGE_results.png differ
diff --git a/docs/img/OpenMQTTgateway_miflora_results.png b/docs/img/OpenMQTTgateway_miflora_results.png
index 16952a7..7713e8d 100644
Binary files a/docs/img/OpenMQTTgateway_miflora_results.png and b/docs/img/OpenMQTTgateway_miflora_results.png differ
diff --git a/docs/img/Openmqttgateway_logo.png b/docs/img/Openmqttgateway_logo.png
index c4b043a..ad145be 100644
Binary files a/docs/img/Openmqttgateway_logo.png and b/docs/img/Openmqttgateway_logo.png differ
diff --git a/docs/img/Openmqttgateway_logo_micro.png b/docs/img/Openmqttgateway_logo_micro.png
index 0fd082c..71c6cd0 100644
Binary files a/docs/img/Openmqttgateway_logo_micro.png and b/docs/img/Openmqttgateway_logo_micro.png differ
diff --git a/docs/img/Openmqttgateway_logo_mini.png b/docs/img/Openmqttgateway_logo_mini.png
index 9674455..88d62c8 100644
Binary files a/docs/img/Openmqttgateway_logo_mini.png and b/docs/img/Openmqttgateway_logo_mini.png differ
diff --git a/docs/img/Openmqttgateway_logo_mini_512.png b/docs/img/Openmqttgateway_logo_mini_512.png
index 7a3a182..b788e96 100644
Binary files a/docs/img/Openmqttgateway_logo_mini_512.png and b/docs/img/Openmqttgateway_logo_mini_512.png differ
diff --git a/docs/img/Openmqttgateway_logo_mini_margins.png b/docs/img/Openmqttgateway_logo_mini_margins.png
index 6b8a761..6412d8a 100644
Binary files a/docs/img/Openmqttgateway_logo_mini_margins.png and b/docs/img/Openmqttgateway_logo_mini_margins.png differ
diff --git a/docs/img/Theengs-Bridge-ble-gateway.png b/docs/img/Theengs-Bridge-ble-gateway.png
index a1b166f..681f58b 100644
Binary files a/docs/img/Theengs-Bridge-ble-gateway.png and b/docs/img/Theengs-Bridge-ble-gateway.png differ
diff --git a/docs/img/Theengs-Plug-OpenMQTTGateway.png b/docs/img/Theengs-Plug-OpenMQTTGateway.png
index 96e8bda..cb6f3bc 100644
Binary files a/docs/img/Theengs-Plug-OpenMQTTGateway.png and b/docs/img/Theengs-Plug-OpenMQTTGateway.png differ
diff --git a/docs/img/Wiki_module_BT.png b/docs/img/Wiki_module_BT.png
index 9f5b473..fece17b 100644
Binary files a/docs/img/Wiki_module_BT.png and b/docs/img/Wiki_module_BT.png differ
diff --git a/docs/img/Wiki_module_DHT.png b/docs/img/Wiki_module_DHT.png
index 2c6c0e2..38b1c69 100644
Binary files a/docs/img/Wiki_module_DHT.png and b/docs/img/Wiki_module_DHT.png differ
diff --git a/docs/img/Wiki_module_I2C.png b/docs/img/Wiki_module_I2C.png
index f81f68b..9c72489 100644
Binary files a/docs/img/Wiki_module_I2C.png and b/docs/img/Wiki_module_I2C.png differ
diff --git a/docs/img/Wiki_module_IR.png b/docs/img/Wiki_module_IR.png
index 860fdd2..638a7b7 100644
Binary files a/docs/img/Wiki_module_IR.png and b/docs/img/Wiki_module_IR.png differ
diff --git a/docs/img/Wiki_module_RF.png b/docs/img/Wiki_module_RF.png
index fc3b1b8..2ce546d 100644
Binary files a/docs/img/Wiki_module_RF.png and b/docs/img/Wiki_module_RF.png differ
diff --git a/docs/img/Wiki_module_RFM69.png b/docs/img/Wiki_module_RFM69.png
index 7e010a5..be05750 100644
Binary files a/docs/img/Wiki_module_RFM69.png and b/docs/img/Wiki_module_RFM69.png differ
diff --git a/docs/img/arduino-esp32-sketchbook.png b/docs/img/arduino-esp32-sketchbook.png
index c7f982f..2cce5e7 100644
Binary files a/docs/img/arduino-esp32-sketchbook.png and b/docs/img/arduino-esp32-sketchbook.png differ
diff --git a/docs/img/digoo-pir-DG-HOSA.png b/docs/img/digoo-pir-DG-HOSA.png
new file mode 100644
index 0000000..f168713
Binary files /dev/null and b/docs/img/digoo-pir-DG-HOSA.png differ
diff --git a/docs/img/domoticz-logo.jpg b/docs/img/domoticz-logo.jpg
index 1607411..8fc9d28 100644
Binary files a/docs/img/domoticz-logo.jpg and b/docs/img/domoticz-logo.jpg differ
diff --git a/docs/img/fhem_logo.png b/docs/img/fhem_logo.png
index e9ba39d..8e9e64c 100644
Binary files a/docs/img/fhem_logo.png and b/docs/img/fhem_logo.png differ
diff --git a/docs/img/home-assistant-logo.png b/docs/img/home-assistant-logo.png
index ba31199..2e6e621 100644
Binary files a/docs/img/home-assistant-logo.png and b/docs/img/home-assistant-logo.png differ
diff --git a/docs/img/jeedom-logo.png b/docs/img/jeedom-logo.png
index dcb9720..c0f601a 100644
Binary files a/docs/img/jeedom-logo.png and b/docs/img/jeedom-logo.png differ
diff --git a/docs/img/node-red-logo.png b/docs/img/node-red-logo.png
index 898c242..9d9123d 100644
Binary files a/docs/img/node-red-logo.png and b/docs/img/node-red-logo.png differ
diff --git a/docs/img/openhab-logo.png b/docs/img/openhab-logo.png
index cd63463..c661d99 100644
Binary files a/docs/img/openhab-logo.png and b/docs/img/openhab-logo.png differ
diff --git a/docs/img/upload.png b/docs/img/upload.png
new file mode 100644
index 0000000..9ea6616
Binary files /dev/null and b/docs/img/upload.png differ
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..5562b2f
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,286 @@
+---
+layout: home
+
+hero:
+  name: OpenMQTTGateway
+  text: One gateway, many technologies
+  tagline: Bridge RF, Infrared, Bluetooth LE, LoRa and more to MQTT, and to your home automation platform.
+  image:
+    src: /img/OpenMQTTGateway.png
+    alt: Overview of the protocols and compatible controllers
+  actions:
+    - theme: brand
+      text: Get started
+      link: /getting-started
+    - theme: alt
+      text: Flash from your browser
+      link: /upload/web-install
+    - theme: alt
+      text: Supported BLE devices
+      link: https://decoder.theengs.io/devices/devices.html
+
+features:
+  - icon: 📶
+    title: Bluetooth Low Energy
+    details: Decodes more than 100 BLE sensors out of the box thanks to Theengs Decoder — Mi Flora, Xiaomi, Govee, Inkbird, SwitchBot and more.
+  - icon: 📡
+    title: RF 433/315/868/915MHz
+    details: Receive and transmit RF signals with RTL_433, RCSwitch, KaKu or Pilight — weather stations, door sensors, remotes, PIR sensors.
+  - icon: 🔴
+    title: Infrared & LoRa
+    details: Make your old TV or AC smart through IR, or reach far-away sensors with LoRa.
+  - icon: 🏠
+    title: Home automation ready
+    details: Home Assistant MQTT auto-discovery enabled by default. Works with OpenHAB, Domoticz, Jeedom, Node-RED, FHEM and any MQTT-capable software.
+  - icon: ⚡
+    title: Easy to install
+    details: Flash an ESP32 or ESP8266 directly from your browser, then configure WiFi and MQTT through a web portal. No development tools required.
+  - icon: 🔧
+    title: Extensible
+    details: Add sensors (BME280, DHT, INA226...) and actuators (relays, PWM, LED), secure connections with TLS, and update over the air.
+---
+
+<script setup>
+import { useData } from 'vitepress'
+import { computed } from 'vue'
+const { theme } = useData()
+const isDev = theme.value.mode === 'dev'
+const version = theme.value.version
+const commitUrl = computed(() =>
+  theme.value.repo && version
+    ? `https://github.com/${theme.value.repo}/commit/${version}`
+    : null
+)
+
+const useCases = [
+  { icon: '🌱', text: 'Water the garden when a Mi Flora sensor says the soil is dry' },
+  { icon: '🚪', text: 'Detect opened doors and windows through 433MHz or BLE' },
+  { icon: '🧊', text: 'Get alerted when the fridge or freezer gets too warm' },
+  { icon: '📺', text: 'Make your old TV or AC smart through infrared control' },
+  { icon: '⌚', text: 'Run a welcome scenario when your smartwatch comes home' },
+  { icon: '🥩', text: 'Follow your meat temperature while cooking with an Inkbird IBBQ' },
+  { icon: '💧', text: 'Detect water leakage or smoke remotely' },
+  { icon: '📬', text: 'Know when a distant mailbox is opened, over LoRa' },
+  { icon: '🌡️', text: 'Trigger a fan from a Mi Jia temperature and humidity sensor' },
+  { icon: '🚨', text: 'Sound a siren if something is going wrong' },
+  { icon: '⚖️', text: 'Log your weight automatically from a BLE scale' },
+  { icon: '🛞', text: 'Monitor your vehicle tire pressure' }
+]
+
+const functions = [
+  'Home Assistant auto-discovery', 'Message deduplication', 'Simple MQTT API',
+  'Signal forward & repeat', 'WiFi onboarding portal', 'Web UI configuration',
+  'Whitelist & blacklist', 'TLS secure connections', 'Over-the-air updates',
+  'Local first, cloud optional'
+]
+
+const videos = [
+  { id: '_gdXR1uklaY', title: '433MHz and BLE gateway', author: 'Andreas Spiess' },
+  { id: 'noUROhtf0E0', title: 'BLE gateway', author: 'Andreas Spiess' },
+  { id: 'H-JXWbWjJYE', title: 'RTL_433 on ESP32', author: 'Tech Mind' },
+  { id: '6DftaHxDawM', title: 'LoRa gateway', author: 'PricelessToolkit' }
+]
+
+const press = [
+  { name: 'ESPHome vs OMG', url: 'https://medium.com/@zediot/esphome-vs-openmqttgateway-choosing-the-right-esp32-bridge-model-7126379e36be' },
+  { name: 'ZedIoT', url: 'https://zediot.com/blog/what-is-openmqttgateway/' },
+  { name: 'HomeTechHacker', url: 'https://hometechhacker.com/theengs-bridge-ble-mqtt-gateway-review/' },
+  { name: 'Squix', url: 'https://blog.squix.org/2023/04/esp32-cheap-sensor-network-with-openmqttgateway.html' },
+  { name: 'Hackaday', url: 'https://hackaday.com/2023/01/13/arduino-library-brings-rtl_433-to-the-esp32' },
+  { name: 'CNX Software', url: 'https://www.cnx-software.com/2023/01/14/esp32-board-with-lora-433-mhz-sensors/' },
+  { name: 'RTL-SDR', url: 'https://www.rtl-sdr.com/rtl_433-ported-to-esp32-microcontrollers-with-cc1101-or-sx127x-transceiver-chips/' },
+  { name: 'LWN.net', url: 'https://lwn.net/Articles/921497/' }
+]
+</script>
+
+<div v-if="isDev" class="warning custom-block omg-section">
+<p class="custom-block-title">Development Version</p>
+<p>This is the edge version of the documentation, built from commit <a v-if="commitUrl" :href="commitUrl"><code>{{ version }}</code></a><code v-else>{{ version }}</code>. It is under active development and may contain bugs, incomplete features, or breaking changes. Use it at your own risk.</p>
+</div>
+
+<div class="omg-section">
+  <h2>How it works</h2>
+  <p class="omg-lead">OpenMQTTGateway is a firmware for ESP32 and ESP8266 boards that translates your devices' signals into <a href="http://mqtt.org/">MQTT</a> messages — and back. One board replaces a drawer full of proprietary bridges.</p>
+  <OmgPipeline />
+  <p class="omg-caption">Decodes <a href="https://decoder.theengs.io/devices/devices.html">more than 100 BLE devices</a> and many RF protocols (433/315/868/915MHz) through <a href="./use/rf.html#supported-decoders">RTL_433 decoders</a> — and the BLE decoding also runs on Raspberry Pi, Windows or Linux with <a href="https://theengs.github.io/gateway/">Theengs Gateway</a>.</p>
+</div>
+
+<div class="omg-section">
+  <h2>What will you automate?</h2>
+  <div class="omg-grid">
+    <div v-for="uc in useCases" :key="uc.text" class="omg-card">
+      <span class="omg-card-icon">{{ uc.icon }}</span>
+      <span>{{ uc.text }}</span>
+    </div>
+  </div>
+  <p class="omg-caption">The limit is your imagination 😀</p>
+</div>
+
+<div class="omg-section">
+  <h2>See it in action</h2>
+  <div class="omg-videos">
+    <a v-for="v in videos" :key="v.id" class="omg-video" :href="`https://www.youtube.com/watch?v=${v.id}`" target="_blank" rel="noopener noreferrer">
+      <img class="no-zoom" :src="`https://img.youtube.com/vi/${v.id}/mqdefault.jpg`" :alt="`${v.title} video by ${v.author}`" loading="lazy" />
+      <span class="omg-video-title">{{ v.title }}</span>
+      <span class="omg-video-author">by {{ v.author }}</span>
+    </a>
+  </div>
+  <p class="omg-caption">In the press:
+    <template v-for="(p, i) in press" :key="p.url"><a :href="p.url" target="_blank" rel="noopener noreferrer">{{ p.name }}</a><span v-if="i < press.length - 1"> · </span></template>
+  </p>
+</div>
+
+<div class="omg-section">
+  <h2>Under the hood</h2>
+  <div class="omg-pills">
+    <span v-for="f in functions" :key="f" class="omg-pill">{{ f }}</span>
+  </div>
+</div>
+
+<div class="omg-section">
+  <h2>Support the project</h2>
+  <div class="omg-product">
+    <a href="https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna" target="_blank" rel="noopener noreferrer">
+      <img src="./img/Theengs-Bridge-ble-gateway.png" alt="Theengs Bridge, BLE to MQTT gateway with Ethernet and external antenna" />
+    </a>
+    <div>
+      <h3>Theengs Bridge — ready-to-use BLE gateway</h3>
+      <p>Pre-flashed with OpenMQTTGateway, with an Ethernet port and an external antenna for enhanced BLE range. Every purchase directly funds the project.</p>
+      <a class="omg-cta" href="https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna" target="_blank" rel="noopener noreferrer">Get the Theengs Bridge</a>
+    </div>
+  </div>
+  <p style="margin-top: 24px;">You can also sponsor the development to help keep the project healthy and evolving.</p>
+  <div style="text-align: center;">
+    <iframe src="https://github.com/sponsors/1technophile/button" title="Sponsor 1technophile" height="32" width="228" style="border: 0; border-radius: 6px;"></iframe>
+  </div>
+</div>
+
+<div class="omg-section">
+  <p class="omg-disclaimer">The material and information contained in this documentation is for general information purposes only. You should not rely upon it as a basis for making any business, legal or any other decisions. There is no warranty given on this documentation content; if you decide to follow the information and materials given it is at your own risk.</p>
+</div>
+
+<style scoped>
+.omg-section {
+  max-width: 1152px;
+  margin: 0 auto;
+  padding: 24px 24px 0;
+}
+.omg-section h2 {
+  border-top: 1px solid var(--vp-c-divider);
+  padding-top: 24px;
+  margin-bottom: 16px;
+  font-size: 24px;
+  font-weight: 600;
+  letter-spacing: -0.02em;
+}
+.omg-lead {
+  color: var(--vp-c-text-1);
+  max-width: 720px;
+  margin: 0 0 8px;
+}
+.omg-caption {
+  color: var(--vp-c-text-2);
+  font-size: 14px;
+  margin-top: 16px;
+}
+.omg-caption a { color: var(--vp-c-brand-1); }
+.omg-lead a { color: var(--vp-c-brand-1); }
+
+/* Use cases grid */
+.omg-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+  gap: 12px;
+}
+.omg-card {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  background: var(--vp-c-bg-soft);
+  border-radius: 12px;
+  padding: 14px 16px;
+  font-size: 14px;
+  line-height: 1.5;
+  transition: transform 0.2s ease, box-shadow 0.2s ease;
+}
+.omg-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.12);
+}
+.omg-card-icon { font-size: 24px; flex-shrink: 0; }
+
+/* Videos */
+.omg-videos {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+  gap: 20px;
+}
+.omg-video {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  text-decoration: none;
+  color: var(--vp-c-text-1);
+}
+.omg-video img {
+  width: 100%;
+  border-radius: 12px;
+  aspect-ratio: 16 / 9;
+  object-fit: cover;
+  transition: transform 0.2s ease;
+}
+.omg-video:hover img { transform: scale(1.03); }
+.omg-video-title { font-size: 14px; font-weight: 600; margin-top: 8px; }
+.omg-video-author { font-size: 13px; color: var(--vp-c-text-2); }
+
+/* Function pills */
+.omg-pills {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+.omg-pill {
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 999px;
+  padding: 6px 14px;
+  font-size: 13px;
+  color: var(--vp-c-text-1);
+}
+
+/* Product card */
+.omg-product {
+  display: flex;
+  align-items: center;
+  gap: 32px;
+  background: var(--vp-c-bg-soft);
+  border-radius: 12px;
+  padding: 24px;
+  flex-wrap: wrap;
+}
+.omg-product > a { flex: 0 1 280px; min-width: 200px; }
+.omg-product img { width: 100%; border-radius: 8px; }
+.omg-product > div { flex: 1 1 300px; }
+.omg-product h3 { margin: 0 0 8px; font-size: 18px; font-weight: 600; }
+.omg-product p { color: var(--vp-c-text-2); margin: 0 0 16px; }
+.omg-cta {
+  display: inline-block;
+  background: var(--vp-c-brand-1);
+  color: var(--vp-c-white, #fff);
+  border-radius: 20px;
+  padding: 8px 20px;
+  font-size: 14px;
+  font-weight: 600;
+  text-decoration: none;
+  transition: background 0.2s ease;
+}
+.omg-cta:hover { background: var(--vp-c-brand-2); }
+
+.omg-disclaimer {
+  border-top: 1px solid var(--vp-c-divider);
+  padding: 24px 0 32px;
+  color: var(--vp-c-text-3);
+  font-size: 12px;
+  line-height: 1.6;
+}
+</style>
diff --git a/docs/integrate/aws_iot.md b/docs/integrate/aws_iot.md
index 0885cda..b77c318 100644
--- a/docs/integrate/aws_iot.md
+++ b/docs/integrate/aws_iot.md
@@ -78,18 +78,7 @@ Now you should have the following information for the OpenMQTTGateway configurat
 
 ## Modify OpenMQTTGateway configuration
 
-With Arduino IDE, you can update the following field into User_config.h with the information gathered:
-* Gateway_Name
-* `MQTT_SERVER "xxxxxx.iot-eu-amazonaws.com"`
-* `MQTT_PORT "8883"`
-* `AWS_IOT true`
-* ss_server_cert with the root certificate
-* ss_client_cert with the client certificate
-* ss_client_key with the Client key
-* `MQTT_SECURE_SELF_SIGNED 1`
-* `MQTT_SECURE_DEFAULT true`
-
-With PlatformIO you can directly leverage the environment `esp32dev-ble-aws`
+With PlatformIO you can directly leverage the environment `esp32dev-ble-aws` as an example and modify it following your needs.
 
 ## Build and upload
 
diff --git a/docs/integrate/home_assistant.md b/docs/integrate/home_assistant.md
index 2ea7993..29deb8f 100644
--- a/docs/integrate/home_assistant.md
+++ b/docs/integrate/home_assistant.md
@@ -5,13 +5,13 @@ Home Assistant provide the [MQTT integration](https://www.home-assistant.io/inte
 Once this integration on home assistant is configured with the same MQTT broker, it is possible to create devices manually or through the autodiscovery function.
 
 
-## Auto discovery
+## Automatic integration with Auto discovery 
 
 From Home Assistant site 
 
 > The discovery of MQTT devices will enable one to use MQTT devices with only minimal configuration effort on the side of Home Assistant. The configuration is done on the device itself and the topic used by the device.
 
-On OpenMQTTGateway the Home Assistant discovery is enabled by default on all binaries and platformio configurations except for UNO. With Arduino IDE please read the [advanced configuration section](../upload/advanced-configuration#auto-discovery) of the documentation. Here are a few tips for activating discovery on Home Assistant, but for detailed configuration please refer to the Home Assistant website. 
+On OpenMQTTGateway the Home Assistant discovery is enabled by default on all binaries and platformio configurations. Here are a few tips for activating discovery on Home Assistant, but for detailed configuration please refer to the Home Assistant website. 
 
 Enable discovery on your MQTT integration in HASS (activated per default).
 
@@ -37,12 +37,12 @@ OMG will use the auto discovery functionality of home assistant to create gatewa
 The Bluetooth and the RTL_433 gateway will automatically create devices and entities, the RF gateway will create DeviceTrigger.
 The OpenMQTTGateway will also be available as a device to monitor its parameters and control it. The sensors (DHT for example) and actuators (relays) are attached to the gateway.
 
-On first and subsequent startups, auto discovery will start. If you want to prevent this from happening, be sure to manually turn off auto discovery, either by using the UI in Home Assistant, or by publishing to the home/<gatewayname>/commands/MQTTtoSYS/config topic.
+On first and subsequent startups, auto discovery will start. If you want to prevent this from happening, be sure to manually turn off auto discovery, either by using the UI in Home Assistant, or by publishing to the `home/<gatewayname>/commands/MQTTtoSYS/config` topic.
 30 minutes after its activation the auto discovery will be automatically deactivated, you can reactivate it from the gateway controls. 
 Some devices may require a button push or motion/contact event to trigger a message and generate the auto discovery.
 :::
 
-## RTL_433 auto discovery specificity
+### RTL_433 auto discovery specificity
 
 Even if the RTL_433 gateway will create automatically the devices and entities, you may lose the link to them when you change the batteries. This is proper to the RF devices. In this case new device and entities will be created. You may bypass this by creating entities through manual configuration that filter following the device model and other parameters and don't take into account the id.
 Example:
@@ -74,16 +74,119 @@ mqtt:
 
 Alternatively the rssi signal could be used also.
 
-## MQTT Device Trigger and RF
+### RF (RCSwitch based gateway) Auto discovery specificity
+With OpenMQTTGateway [configured to receive RF signals](../setitup/rf.html) messages are transmitted accordingly.
 
-With OpenMQTTGateway [configured to receive RF signals](../setitup/rf.html) the messages are transmitted as indicated by [RCSwitch based gateway](../use/rf.html#rcswitch-based-gateway), so it is possible to receive a pulse every time the sensor discover a signal. 
+As indicated in the [RCSwitch based gateway](../use/rf.html#rcswitch-based-gateway), it is possible to receive a pulse each time the sensor detects a signal. With auto-discovery enabled, you can configure two types of entities in Home Assistant to handle RF signals:
 
-With autodiscovery enabled, HomeAssistant will discover a [MQTT Device Trigger](https://www.home-assistant.io/integrations/device_trigger.mqtt/) identified by the value field given in the mqtt argument. 
 
-## Manual integration examples
-From @123, @finity, @denniz03, @jrockstad, @anarchking, @dkluivingh
+1. An  [MQTT Device Trigger](https://www.home-assistant.io/integrations/device_trigger.mqtt/) which allows actions to be triggered when a specific RF signal is received. 
+2. An  [MQTT Sensor](https://www.home-assistant.io/integrations/sensor.mqtt/) 
+which stores the received RF data as a sensor value.
+
+Below are some examples of both configurations.
+
+#### Example A - RF as MQTT Device Trigger
+If the following parameters are enabled in OpenMQTTGateway:
+- ZgatewayRF="RF"
+- valueAsATopic=true
+- HADiscovery=true
+- RF_on_HAS_as_DeviceTrigger=true
+- RF_on_HAS_as_MQTTSensor=false
+
+Then, each time an RF signal is received by OpenMQTTGateway, two messages are sent to the MQTT broker:
+
+1. A device trigger announcement (used by Home Assistant to recognize the trigger).
+2. The RF signal data on the corresponding MQTT topic.
+
+```
+...
+N: [ OMG->MQTT ] topic: homeassistant/device_automation/246F287AF0C4/15524904/config msg: {"automation_type":"trigger","platform ":"device_automation","type":"Received","subtype":"RF-15524904","device":{"configuration_url":"http://192.168.2.150/","connections":[["mac","246F287AF0C4"]],"identifiers":["246F287AF0C4"],"mf":"OMG_community","mdl":"[\"WebUI\",\"RF\"]","name":"OMG_DEVELOPMENT","sw":"1.8.0-o"},"value_template":"{{trigger.value.raw}}","topic":"home/OMG_DEVELOPMENT/433toMQTT/15524904"}
+T: Dequeue JSON
+N: [ OMG->MQTT ] topic: home/OMG_DEVELOPMENT/433toMQTT/15524904 msg: {"value":15524904,"protocol":1,"length":24,"delay":368,"tre_state":"-","binary":"111011001110010000101000","raw":"11427,1042,407,1039,417,1027,430,302,1148,1019,438,1015,440,295,1152,301,1153,1014,442,1012,441,1008,445,291,1160,293,1158,1011,444,292,1156,296,1157,296,1157,298,1154,1011,442,295,1153,1013,443,293,1157,295,1154,300"}
+...
+```
+
+These messages allow Home Assistant to recognize and integrate the RF signal as a device trigger.
+![MQTTExplorer Show Topic](../img/HASS-RF-DeviceTrigger.png)
+*Example of a detected RF device trigger in Home Assistant: Green shows the real message, Yellow shows the device trigger configuration*
+
+Once this process is completed, Home Assistant detects a new trigger associated with the OpenMQTTGateway device and linked to the received RF signal value.
+This means that Home Assistant can now react to the received RF signal as an automation trigger.
+
+Example of a detected RF trigger in Home Assistant:
+
+![MQTTExplorer Show Topic](../img/HASS-RF-Trigger-example.png)
+*Example of a detected RF trigger in Home Assistant*
+
+
+
+#### Example B - RF As MQTT Sensor
+If the following parameters are enabled in OpenMQTTGateway:
+- ZgatewayRF="RF"
+- HADiscovery=true
+- RF_on_HAS_as_DeviceTrigger=false
+- RF_on_HAS_as_MQTTSensor=true
+
+During any discovery round, a SYS message is sent, setting the MQTT Sensor as a sensor of the OpenMQTTGateway device.
+
+```
+...
+N: [ OMG->MQTT ] topic: homeassistant/sensor/246F287AF0C4-gatewayRF/config msg: {"stat_t":"home/OMG_DEVELOPMENT/433toMQTT/#","avty_t":"home/OMG_DEVELOPMENT/LWT","name":"gatewayRF","uniq_id":"246F287AF0C4-gatewayRF","val_tpl":"{{ value_json.value | is_defined }}","pl_avail":"online","pl_not_avail":"offline","device":{"ids":["246F287AF0C4"],"name":"OMG_DEVELOPMENT","mdl":"[\"WebUI\",\"RF\"]","mf":"OMG_community","cu":"http://192.168.2.150/","sw":"1.8.0-o"}}
+T: Dequeue JSON
+```
+
+Then, each time an RF signal is received by OpenMQTTGateway, the content of messages are sent to the MQTT broker on classic topic:
+
+```
+T: Dequeue JSON
+N: [ OMG->MQTT ] topic: home/OMG_DEVELOPMENT/433toMQTT/15524904 msg: {"value":15524904,"protocol":1,"length":24,"delay":368,"tre_state":"-","binary":"111011001110010000101000","raw":"11404,1045,414,1034,424,1024,430,305,1146,1022,431,1019,436,299,1150,304,1145,1021,432,1017,438,1013,441,295,1156,299,1149,1018,436,300,1149,304,1146,307,1143,310,1141,1025,430,306,1143,1021,432,305,1145,310,1140,309"} 
+
+```
+
+These messages enable Home Assistant to recognize and integrate the RF signal as a sensor.
+
+![MQTTExplorer Show Topic](../img/HASS-RF-MQTTSensor.png)
+*Example of a detected RF sensor in Home Assistant: Yellow the configuration of sensor, Green the real message*
+
+Once this process is completed, Home Assistant detects a device with the new sensor and linked to the received RF signal value.
+This means that Home Assistant can now react to the received RF signal as an sensor event.
+
+Example of a detected RF trigger in Home Assistant:
+
+![MQTTExplorer Show Topic](../img/HASS-RF-Sensor-example.png)
+*Example of a detected RF sensor in Home Assistant: Yellow the real message*
+
+
+
+## Manual integration 
+If you prefer not to use MQTT auto-discovery, you can manually configure Home Assistant to manage MQTT topics. This approach gives you full control over the structure and behavior of your MQTT entities. Below are some examples of how to define your devices, sensors, and switches manually using YAML configuration.
+
+From @123, @finity, @denniz03, @jrockstad, @anarchking, @dkluivingh, @Odyno
+
+
+### Pir Sensor
+This is an example of how to configure a PIR (Passive Infrared) sensor in Home Assistant using MQTT. 
+
+![Pir Sensor](../img/digoo-pir-DG-HOSA.png)
+
+The configuration below sets up a binary sensor that detects motion and sends the state to Home Assistant.
+
+```yaml
+mqtt:
+  binary_sensor:
+    - unique_id: pir.15484294
+      name: "Pir.Mansarda"
+      device_class: motion
+      state_topic: "home/+/433toMQTT/15484294"
+      value_template: "{{ value_json.value }}"
+      payload_on: "15484294"
+      off_delay: 3
+```
+
 
 ### Door sensor
+
 ```yaml
 mqtt:
   binary_sensor:
@@ -166,6 +269,45 @@ mqtt:
       qos: "0"
       retain: true
 ```
+### RF gateway mode - Pilight, RF, kaku
+insert an include statement in HA configuration.yaml
+```bash
+grep homed ./configuration.yaml 
+mqtt: !include homed-mqtt.yaml
+```
+In the example, the included file is homed-mqtt.yaml. It provides an mqtt select entity with the ability to show and also change via dropdown - the desired mode of the RF receiver gateway. In the homed-mqtt.yaml snippet, the device section (as it is optional) is ommited,
+```yaml
+select:
+  - name: 'RF: Mode receive'
+    unique_id: espdevcho-rf-mode
+    #platform: mqtt
+    availability_topic: home/espdevcho/LWT # espdevcho is a particular name of the gateway, instead of the default OpenMQTTGateway
+    payload_available: online
+    payload_not_available: offline
+    options: 
+      - "Pilight"
+      - "RF classic"
+      - "RF2 kaku"
+    state_topic: home/espdevcho/RFtoMQTT # espdevcho is a particular name of the gateway, instead of the default OpenMQTTGateway
+    value_template: >
+      {% if value_json.active == 1 %} Pilight
+      {% elif value_json.active == 2 %} RF classic
+      {% elif value_json.active == 4 %} RF2 kaku
+      {% endif %}
+    #unit_of_measurement: s
+    command_topic: home/espdevcho/commands/MQTTtoRF/config # espdevcho is a particular name of the gateway, instead of the default OpenMQTTGateway
+    command_template: >
+      {% set value_map = {
+             "Pilight": 1,
+             "RF classic": 2,
+             "RF2 kaku": 4,
+         }
+      %}
+      {"active":{{ value_map[value] }}}
+    device:
+      configuration_url: http://192.168.1.11/ # device section is optional. It is almost ommited in this example. Values here will update the corresponding device, if it already exist
+
+```
 
 ### Mijia Thermometer BLE
 
diff --git a/docs/integrate/openhab3.md b/docs/integrate/openhab3.md
index 1bc5f1b..af6949a 100644
--- a/docs/integrate/openhab3.md
+++ b/docs/integrate/openhab3.md
@@ -76,13 +76,6 @@ Or use another upload method from the Upload section that requires credentials b
 
 You should see the gateway connected to your broker by checking with an MQTT client like MQTT Explorer.
 
-To make the auto discovery compatible with OpenHAB you have to send the following command with a retain flag.
-
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"ohdisc":true}'`
-
-You can also activate OpenHAB auto discovery by adding the gateway as a Thing, Model, and switching the button to ON. The name of the channel to add is "SYS: OpenHAB discovery".
-Once activated restart OpenMQTTGateway.
-
 ## Adding the things
 1. From the Administration click on "Things" under "Settings", you should see a number in the INBOX button
 
diff --git a/docs/participate/adding-protocols.md b/docs/participate/adding-protocols.md
index 88b174c..5a19e99 100644
--- a/docs/participate/adding-protocols.md
+++ b/docs/participate/adding-protocols.md
@@ -1,12 +1,22 @@
 # Adding protocols
 
-Adding your device protocol to OpenMQTTGateway enables it to increase interoperability and to create new use cases with your device. Below you will find some guidance to do that. 
+Adding your device protocol to OpenMQTTGateway increases interoperability and creates new use cases. Use the steps below to pick the right path and upstream your changes.
+
+::: tip Before you open a PR
+Read the [Development contributions guide](./development.md) for naming rules, QA, and PR steps. It keeps your protocol addition reviewable.
+:::
 
 ## RF or IR
-For adding RF and IR protocols to OpenMQTTGateway the best way is to do a pull request to [RCSwitch](https://github.com/1technophile/rc-switch), [Pilight](https://github.com/pilight/pilight) for RF, and [IRRemoteESP8266](https://github.com/crankyoldgit/IRremoteESP8266) for IR.
+1. Implement or extend the protocol in the upstream libs first: [RCSwitch](https://github.com/1technophile/rc-switch) or [Pilight](https://github.com/pilight/pilight) for RF, and [IRRemoteESP8266](https://github.com/crankyoldgit/IRremoteESP8266) for IR.
+2. Once merged (or while your PR is pending), wire it in OMG as a new decoder/mapping.
+3. Add a short test sniff/build locally with the relevant environment (for example `esp32dev-all-test`).
 
 ## BLE
-For BLE message decoding OpenMQTTGateway uses the [Theengs Decoder](https://decoder.theengs.io/) library. New device decoder pull requests can be submitted directly to the [GitHub repository](https://github.com/theengs/decoder).
+1. For BLE message decoding, OpenMQTTGateway uses [Theengs Decoder](https://decoder.theengs.io/). Submit new device decoders directly to the [GitHub repository](https://github.com/theengs/decoder).
+2. After the decoder exists, ensure the device is reported correctly through OMG (advertising devices are supported without connection).
+3. Build locally for a BLE-enabled environment and validate the payload.
 
-Currently we support the reading of advertizing BLE devices, advertizing means that the BLE device broadcasts regularly its sensor data without the need of a BLE connection.
+Notes:
+- We support reading **advertising** BLE devices (they broadcast regularly without a connection).
+- Keep payloads compact and follow existing JSON fields for consistency.
 
diff --git a/docs/participate/community.md b/docs/participate/community.md
index d8494b6..ded39a8 100644
--- a/docs/participate/community.md
+++ b/docs/participate/community.md
@@ -1,4 +1,9 @@
 # Community participation
-The first entry step for participating to OMG is sharing and discussing with the [community](https://community.openmqttgateway.com), by sharing your experiences and answering to other questions you are giving back what the others gave to you.
+The first entry step for participating to OMG is sharing and discussing with the [community](https://community.openmqttgateway.com). By sharing your experiences and answering questions you give back what others gave to you.
 
-You can use the forum to ask questions, post answers, suggest features and discuss about home automation or Internet of things in a more general way. 
\ No newline at end of file
+Use the forum to:
+- Ask questions about hardware, builds, MQTT, BLE/RF/IR, or docs.
+- Share projects, logs, and payload samples that help others.
+- Suggest features or confirm if something already exists.
+
+When you have a change to contribute, follow the [Development contributions guide](./development.md) for the PR flow.
\ No newline at end of file
diff --git a/docs/participate/development.md b/docs/participate/development.md
index 471a811..f67a235 100644
--- a/docs/participate/development.md
+++ b/docs/participate/development.md
@@ -1,30 +1,37 @@
 # Development contributions
 
-We like pull requests from everyone. By participating in this project, you
-agree to follow the code of conduct below
+We like pull requests from everyone and ask you to follow the code of conduct below.
 
-[code of conduct](https://github.com/1technophile/OpenMQTTGateway/blob/master/CODE_OF_CONDUCT.md)
+* [Code of conduct](https://github.com/1technophile/OpenMQTTGateway/blob/master/CODE_OF_CONDUCT.md)
 
-[code style guide](https://google.github.io/styleguide/cppguide.html#Formatting)
+* [Code style guide](https://google.github.io/styleguide/cppguide.html#Formatting)
 
-So as to format automatically your document you have to add the "clang-Format" extension to VSCode, once done, you can format the code by doing a right click into the code file window and clicking "Format document".
+If you need a step-by-step install and build guide, read the [Quick Start to Develop OpenMQTTGateway](./quick_start.md). It explains the tools, PlatformIO, and docs workflow. Use this page as a fast checklist once you know the flow.
 
-Fork the [development branch](https://github.com/1technophile/OpenMQTTGateway/tree/development), then clone the repo
+**Quick checklist**
+1. Fork the [development branch](https://github.com/1technophile/OpenMQTTGateway/tree/development) and clone the repo.
+2. Make your changes and follow the naming rules:
+    * New gateway: `ZgatewayXXX` where `XXX` is the protocol name.
+    * New sensor: `ZsensorYYY` where `YYY` is the sensor type.
+    * New actuator: `ZactuatorZZZ` where `ZZZ` is the actuator type.
+3. Review your code and compile for ESP32 and ESP8266.
+4. Test on your hardware.
+5. Open a pull request, verify the GitHub Actions CI build, and request a review.
 
-Make your modification,
-* If you want to add a new gateway, name it `ZgatewayXXX`, `XXX` replaced by your gateway communication type, can be more than three letters
-* If you want to add a new sensor, name it `ZsensorYYY`, `YYY` replaced by your sensor type, can be more than three letters
-* If you want to add a new actuator, name it `ZactuatorZZZ`, `ZZZ` replaced by your actuator type, can be more than three letters
+## Automated Testing and CI
 
-Review your code, compile it for Arduino Uno, ESP32 and ESP8266
+Your pull request will be automatically tested by GitHub Actions. If you want to run the same checks locally before pushing, you can use the `ci.sh` script in the scripts folder.
 
-Test it locally on your hardware config
+**Need help with the ci.sh commands?** See [section 5 in Quick Start](./quick_start.md#5-firmware-development-from-the-terminal-with-cish) for detailed examples of running QA checks and builds from the terminal.
 
-Emit a pull request
+For more details on how CI works and available scripts, see the [CI documentation](https://github.com/1technophile/OpenMQTTGateway/blob/development/scripts) in the scripts folder.
 
-Verify the GitHub Actions CI compilation results
+For a comprehensive overview of all GitHub Actions workflows used in this project, check the [Workflows README](https://github.com/1technophile/OpenMQTTGateway/tree/development/.github/workflows).
+
+## Code Quality
+
+To format your code automatically, add the "clang-Format" extension to VSCode, then right click in the file and choose "Format document".
 
-Request for review
 
 We may suggest some changes, improvements or alternatives.
 
@@ -73,3 +80,5 @@ This Developer Certificate Of Origin (DCO) was adopted on June 7, 2021.
 The text of this license is available under the [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/).  It is based on the Linux [Developer Certificate Of Origin](http://elinux.org/Developer_Certificate_Of_Origin).
 
 To accept the DCO it is required to put a x between [ ] on `[ ] I accept the DCO` in the PR template when submitting it. The [ ] is an opt-in box, so you have to manually accept it.
+
+
diff --git a/docs/participate/index.md b/docs/participate/index.md
new file mode 100644
index 0000000..34618ee
--- /dev/null
+++ b/docs/participate/index.md
@@ -0,0 +1,46 @@
+# Participate in OpenMQTTGateway
+
+OpenMQTTGateway is community-driven: every feature, bug fix, and doc improvement comes from contributors like you. Whether you want to add support for a new sensor, fix a bug, improve documentation, or just help others—there's a place for you here.
+
+## Choose your path
+
+### 🚀 New to the project? Start here
+[**Quick Start Guide**](./quick_start.md) walks you through setting up your development environment, building firmware, and previewing the docs. It covers PlatformIO, VS Code, terminal workflows, and troubleshooting. Perfect if you're new to ESP32/ESP8266 development or just want to get your hands dirty quickly.
+
+**What you'll learn:** Installing tools · Building firmware · Flashing boards · Running tests · Working with the docs
+
+---
+
+### 💻 Ready to contribute code?
+[**Development Contributions**](./development.md) covers the contribution workflow: naming conventions, code quality checks, testing on multiple boards, and opening pull requests. This is your checklist before submitting code.
+
+**What you'll find:** PR workflow · Naming rules (ZgatewayXXX, ZsensorYYY) · QA automation · DCO · CI/CD integration
+
+---
+
+### 🔌 Adding a new protocol or device?
+[**Adding Protocols**](./adding-protocols.md) explains how to integrate RF, IR, or BLE devices. Most protocol work happens upstream (RCSwitch, Pilight, IRRemoteESP8266, Theengs Decoder), and this guide shows you how to wire it into OMG.
+
+**What you'll learn:** Upstream contribution · Protocol integration · Testing decoders · Payload validation
+
+---
+
+### 💬 Join the community
+[**Community Participation**](./community.md) is where you ask questions, share your projects, and help others. The forum is the first stop for feature requests, debugging help, and general IoT/home automation discussion.
+
+**What you can do:** Ask questions · Share builds · Propose features · Help newcomers
+
+---
+
+### ❤️ Support the project
+[**Supporting the Project**](./support.md) lists all the ways you can help beyond code: answering forum questions, improving docs, purchasing Theengs products, sponsoring developers, or creating content about your OMG setup.
+
+**How you can help:** Forum support · Documentation · Sponsorship · Content creation
+
+---
+
+::: tip Not sure where to start?
+- **First time here?** → [Quick Start](./quick_start.md)
+- **Have a fix or feature ready?** → [Development contributions](./development.md)
+- **Need help or want to discuss?** → [Community](./community.md)
+:::
diff --git a/docs/participate/quick_start.md b/docs/participate/quick_start.md
new file mode 100644
index 0000000..ea96b94
--- /dev/null
+++ b/docs/participate/quick_start.md
@@ -0,0 +1,842 @@
+---
+title: Contributor Quick Start
+permalink: /participate/quick_start.html
+sidebarDepth: 2
+lang: en-US
+---
+
+# Contributor Quick Start
+
+Looking to **use** OpenMQTTGateway rather than develop it? Head to the [Getting Started guide](../getting-started.md) instead.
+
+This document helps a new contributor. Maybe this is your first time with:
+
+- Git
+- PlatformIO
+- ESP32 or ESP8266
+
+It is normal to feel a bit lost at the beginning. This guide walks with you, step by step.
+
+::: tip Already experienced?
+If you only need the contribution rules and PR flow, jump to [Development contributions](./development.md). For community help or non-code support, see [Community participation](./community.md) and [Supporting the project](./support.md).
+:::
+
+
+
+In this document you will learn how to:
+
+- Prepare the development environment on Windows or Linux.
+- Build and flash the firmware (ESP32 / ESP8266 and other boards).
+- Build and preview the documentation website in the docs folder.
+
+At the end of each step you see a **Check**. Use it to confirm that the previous step is correct before you go to the next one. If a check fails, do not worry: read the step again, fix it, and try one more time.
+
+
+
+## 1. Understand this project
+
+OpenMQTTGateway is a firmware project. It runs on ESP32, ESP8266 and other boards. It connects many protocols (Bluetooth, RF, IR, LoRa, sensors) to MQTT.
+
+The repository also contains the documentation website. The docs use VuePress and live in the docs folder.
+
+Very simple view of the repository:
+
+- main: C++ source code for the firmware.
+- lib: reusable libraries.
+- scripts: helper scripts for build, test, CI.
+- docs: documentation website.
+
+You will mainly work on:
+
+- Firmware code: files under main and sometimes lib.
+- Docs site: files under docs and docs/.vuepress.
+
+**Check:** open the repository in a file explorer and confirm you see at least main, lib, scripts and docs folders. If not, read section 3 again.
+
+
+
+## 2. Prepare your computer
+
+You can use Windows or Linux. The steps are very similar. The examples use a terminal. On Windows you can use **Git Bash** or **WSL**; on Linux you can use your normal shell.
+
+Not everybody needs to install the same tools. It depends on what you want to do:
+
+- **Only firmware (with VS Code or terminal):** you mainly need Git, PlatformIO, VS Code (if you like GUI) and a bash shell.
+- **Only documentation website:** you mainly need Git, Node.js and npm.
+- **Both firmware and docs:** you need everything.
+
+The next subsections explain this.
+
+### 2.1 Common tools (for everyone)
+
+Install these tools first. They are useful for **all** types of work:
+
+- Git
+- Visual Studio Code (recommended, but you can also use another editor)
+- A bash shell
+   - On Windows: Git Bash or WSL (Ubuntu is a good choice).
+
+On Windows you can download:
+
+- Git from the official site: https://git-scm.com/downloads
+- Visual Studio Code from https://code.visualstudio.com/
+- Git Bash comes with "Git for Windows".
+
+On Linux you can install these with your package manager (for example apt on Ubuntu). For more help you can read the Git book: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git.
+
+**Check (common tools):** open a terminal (Git Bash, WSL, or Linux shell) and run:
+
+```bash
+git --version
+```
+
+If this command fails, install Git again and then close and reopen the terminal.
+
+### 2.2 Tools for firmware development
+
+For firmware builds you need **PlatformIO**. PlatformIO itself will install the right compiler and frameworks for your boards.
+
+You have two main options:
+
+1. Use **PlatformIO inside VS Code** (recommended for most users).
+2. Use **PlatformIO CLI in the terminal** (good for advanced or CI usage).
+
+#### 2.2.1 PlatformIO inside VS Code (recommended)
+
+If you only plan to build firmware from VS Code, you usually do **not** need to install Python or PlatformIO CLI manually. The PlatformIO extension will download what it needs.
+
+- Just install VS Code and the PlatformIO extension (see section 2.3).
+- When you first open the project, PlatformIO will set up its own tools.
+
+**Check:** after installing the extension and opening the project, the VS Code status bar shows something like "PlatformIO: Ready".
+
+#### 2.2.2 PlatformIO command line (CLI) with Python (for terminal builds)
+
+If you want to use the bash scripts (ci.sh, ci_build_firmware.sh, etc.) or build from a plain terminal, you need Python and PlatformIO CLI.
+
+Install these extra tools:
+
+- Python 3.10 or newer
+- PlatformIO CLI (pip package)
+
+PlatformIO is the main build system for this project. We will use it from VS Code and from the terminal. If you want to read more, the official docs are here: https://docs.platformio.org/.
+
+On Windows you can download Python from: https://www.python.org/downloads/
+
+On Linux you can install Python with your package manager.
+
+Then install PlatformIO CLI globally with Python:
+
+```bash
+python3 -m pip install -U platformio
+```
+
+**Check (firmware tools):**
+
+```bash
+python3 --version
+platformio --version
+```
+
+If you see version numbers, the install is good. If the platformio command is not found, check that Python added the scripts folder (for example ~/.local/bin on Linux) to your PATH, then open a new terminal and try again.
+
+### 2.3 Tools for documentation website (Node.js and npm)
+::: warning Note
+This section is **only needed** if you want to **build or preview the site on your own computer**.  
+:::
+
+If you want to build or edit the **documentation website**, you also need Node.js and npm. You do **not** need these tools just to build firmware.
+
+Install:
+
+- Node.js 18 or newer
+- npm (usually comes with Node.js)
+
+On Windows you can get Node.js from: https://nodejs.org/en/download
+
+On Linux you can install Node.js with your package manager or by following the docs: https://nodejs.org/en/download/package-manager.
+
+**Check (docs tools):**
+
+```bash
+node --version
+npm --version
+```
+
+If one of these commands fails, reinstall Node.js, close the terminal, and try again.
+
+### 2.4 PlatformIO extension in Visual Studio Code
+Now add PlatformIO inside VS Code. You can also see pictures of these steps in many ESP32 + PlatformIO tutorials, for example on the PlatformIO site: https://platformio.org/install/ide?install=vscode.
+
+Steps (based on common PlatformIO + VS Code ESP32 guides, adapted for this project):
+
+1. Open Visual Studio Code.
+2. Click the Extensions icon on the left.
+3. In the search box, type "PlatformIO IDE".
+4. Click **Install** on the "PlatformIO IDE" extension.
+
+When the install finishes, a new icon appears on the left sidebar. It looks like an ant or an alien head. This opens the PlatformIO view.
+
+**Check:**
+
+- In VS Code, you see the PlatformIO icon on the left.
+- If you click it, PlatformIO opens without errors.
+
+If you do not see the icon, restart VS Code and wait a few seconds.
+
+**Friendly tip:** the first install can take several minutes because PlatformIO downloads tools for many boards. It happens only once. You can get a coffee while it works.
+
+
+
+## 3. Get the source code
+
+Now download this repository to your computer from GitHub.
+
+1. Open a terminal (Git Bash, WSL or Linux shell).
+2. Choose a parent folder where you want to keep your projects.
+3. Run:
+
+```bash
+git clone https://github.com/1technophile/OpenMQTTGateway.git
+cd OpenMQTTGateway
+```
+
+**Check:**
+
+- Run:
+
+   ```bash
+   git status
+   ```
+
+- The output should say "On branch" and "nothing to commit".
+- In your file explorer or with:
+
+   ```bash
+   ls
+   ```
+
+   you should see main, lib, scripts, docs and other files.
+
+If the clone fails, check your internet connection or a possible proxy. Then try again. If you are new to Git, the GitHub "Hello World" guide can also help: https://docs.github.com/en/get-started/start-your-journey/hello-world.
+
+
+
+## 4. Firmware development with Visual Studio Code and PlatformIO
+
+This section explains how to build and flash the firmware using Visual Studio Code with the PlatformIO extension.
+
+If you know the classic Arduino IDE, you can think of PlatformIO as a more powerful alternative. It manages many boards, libraries, and environments for you. The official introduction is here: https://docs.platformio.org/en/latest/what-is-platformio.html.
+
+You do **not** create a new PlatformIO project. This repository is already a PlatformIO project. You just open it.
+
+### 4.1 Open the project in VS Code
+
+1. Start Visual Studio Code.
+2. Click **File → Open Folder…**.
+3. Select the OpenMQTTGateway folder you cloned in section 3.
+4. Click **Open**.
+
+VS Code will load the folder. PlatformIO will detect the platformio.ini file and start to prepare its toolchain (compiler, libraries, board support). You do not need to install these by hand.
+
+**Check:**
+
+- In the bottom status bar you see messages like "PlatformIO: Installing" and then "PlatformIO: Ready".
+- You can also open a terminal inside VS Code (View → Terminal) and run:
+
+   ```bash
+   pio --version
+   ```
+
+   You should see the PlatformIO version.
+
+If PlatformIO stays stuck on "Installing" for a long time, close VS Code, reopen it and wait again. Check that your internet connection is working.
+
+### 4.2 Look at the PlatformIO project structure
+
+PlatformIO projects usually have folders like (you will see similar names in many tutorials):
+
+- src: main source code.
+- lib: libraries.
+- include: headers.
+- platformio.ini: configuration for boards and environments.
+
+In OpenMQTTGateway the structure is a bit different, because it is a large project:
+
+- main: main C++ files for the firmware.
+- lib: libraries used by the firmware.
+- platformio.ini and environments.ini: list many PlatformIO environments.
+- test: tests for PlatformIO unit test framework.
+
+**Check:** open platformio.ini in VS Code and scroll. You should see several [env:...] sections. This means PlatformIO understands the project.
+
+If you want to know more about this file, see the PlatformIO docs about configuration: https://docs.platformio.org/en/latest/projectconf/index.html.
+
+### 4.3 Choose a PlatformIO environment
+
+An "environment" in PlatformIO is a build target. It defines the board, framework and options. You can think of it as a named profile for a specific device.
+
+To select the environment for your board:
+
+1. Press Ctrl+Shift+P (on macOS use Cmd+Shift+P).
+2. Type "PlatformIO: Switch Project Environment" and press Enter.
+3. A list of environments appears (for example esp32dev-all-test, theengs-bridge and many others).
+4. Choose an environment that matches your board. For a generic ESP32 DevKit you can start with **esp32dev-all-test**.
+
+**Check:**
+
+- Look at the bottom blue bar. You should see the selected environment name.
+
+If you chose the wrong environment, repeat the steps and pick another one.
+
+### 4.4 Build the firmware in VS Code
+
+Now compile the firmware.
+
+1. In VS Code, open the PlatformIO view (left sidebar icon).
+2. In the PlatformIO toolbar (bottom of the window), click the **check** (✓) icon. This runs the "Build" task.
+
+PlatformIO now compiles the code for the selected environment. This can take several minutes the first time.
+
+**Check:**
+
+- In the Terminal panel, the build ends with the word "SUCCESS".
+- On disk, a file like:
+
+   ```
+   .pio/build/<your-env-name>/firmware.bin
+   ```
+
+   exists.
+
+If the build fails, read the error at the end of the log. Take your time; errors are part of the normal developer life.
+
+Common problems:
+
+- Missing tools: check that platformio works from the terminal (section 2.2).
+- Wrong environment: try with esp32dev-all-test first.
+
+Fix the problem, then run the build again.
+
+### 4.5 Upload the firmware to the board
+
+After a successful build you can flash the firmware (upload the program to the board).
+
+1. Connect your ESP board to the computer with a good USB cable.
+2. In the PlatformIO toolbar click the **right arrow** (→) icon. This runs the "Upload" task.
+
+PlatformIO selects a serial port automatically in many cases.
+
+**Check:**
+
+- The upload log ends with success, and no "Failed to connect" error.
+- The board reboots after upload.
+
+If the upload fails:
+
+- Check the USB cable (some cables are power-only and do not carry data).
+- On some boards you must press and hold the BOOT button during upload.
+- Make sure no other program is using the same serial port (for example another serial monitor).
+- You can set the serial port manually in platformio.ini with the upload_port option.
+
+### 4.6 Open the Serial Monitor
+
+The Serial Monitor lets you see log messages from the firmware.
+
+1. In the PlatformIO toolbar click the **plug** icon. This opens the Serial Monitor.
+2. Set the baud rate to 115200 if it is not already set.
+
+**Check:**
+
+- After reset, you see text from the board, for example boot messages and MQTT logs.
+
+If the text is unreadable, check that the baud rate matches the value in platformio.ini (monitor_speed). In this project the default is usually 115200.
+
+If you want to learn more about Serial Monitor problems, the PlatformIO docs have a short page: https://docs.platformio.org/en/latest/core/userguide/device/cmd_monitor.html.
+
+### 4.7 Run PlatformIO tests (optional)
+
+You can run unit tests for the project.
+
+1. Open a terminal inside VS Code (View → Terminal).
+2. In the project root, run:
+
+```bash
+pio test -e test
+```
+
+**Check:**
+
+- The output ends with "SUCCESS". If tests fail, read which test failed and open the file under test to understand why.
+
+
+## 5. Firmware development from the terminal with ci.sh
+
+You can also work only from the terminal. This is useful if you prefer command line, use remote development, or want to reproduce the same steps as the CI (Continuous Integration, the automatic build that runs on GitHub).
+
+All helper scripts live in the scripts folder. The main entry point is:
+
+- scripts/ci.sh
+
+This script calls other scripts:
+
+- scripts/ci_build.sh
+- scripts/ci_build_firmware.sh
+- scripts/ci_prepare_artifacts.sh
+- scripts/ci_site.sh
+- scripts/ci_qa.sh
+- scripts/ci_list-env.sh
+
+The scripts are written for bash. On Windows always use **Git Bash** or **WSL** for them, not plain PowerShell or cmd.
+
+If you are new to bash, a gentle introduction is here: https://ubuntu.com/tutorials/command-line-for-beginners.
+
+### 5.1 Check that you are in the right place
+
+1. Open a bash terminal.
+2. Go to your clone:
+
+```bash
+cd path/to/OpenMQTTGateway
+```
+
+**Check:** run:
+
+```bash
+ls scripts main docs
+```
+
+You should see these folders listed. If not, you are in the wrong directory.
+
+### 5.2 List available firmware environments
+
+You can ask the helper scripts which PlatformIO environments exist.
+
+```bash
+./scripts/ci.sh list-env
+```
+
+**Check:**
+
+- The command prints many names in columns (for example esp32dev-all-test, theengs-bridge, rfbridge-direct, and so on).
+
+If the command fails with "command not found" or similar, confirm that bash is used and that the file has execute permission (on Linux you may need chmod +x scripts/ci.sh).
+
+### 5.3 Quick build of one firmware (simple mode)
+
+Use ci.sh with the build command to build one firmware from the terminal.
+
+Example for a development build on esp32dev-all-test:
+
+```bash
+./scripts/ci.sh build esp32dev-all-test --mode dev --verbose
+```
+
+What this does:
+
+- Checks that Python, PlatformIO and git are installed.
+- Calls ci_build_firmware.sh to run platformio run -e esp32dev-all-test.
+- Optionally prepares artifacts if you add deployment options.
+
+Useful flags:
+
+- --mode dev or --mode prod: choose development or production mode. For local work, **dev** is usually enough.
+- --clean: remove old build files before building.
+- --verbose: show more logs from PlatformIO.
+
+**Check:**
+
+- The command ends with a "Build Summary" block and "Status: SUCCESS".
+- The folder .pio/build/esp32dev-all-test contains firmware.bin.
+
+If the build fails, read the error line near the bottom. Fix missing tools (see section 2) or wrong environment name, then run the command again.
+
+### 5.4 Use ci_build_firmware.sh directly (advanced control)
+
+Sometimes you want to work closer to PlatformIO.
+
+You can call scripts/ci_build.sh directly when you want more control or when you debug a CI issue:
+
+```bash
+./scripts/ci_build.sh esp32dev-all-test --dev-ota --clean --verbose
+```
+
+This script:
+
+- Validates the environment name.
+- Sets environment variables for the build (for example OMG_VERSION, OTA flags).
+- Runs platformio run for the chosen environment.
+- Verifies that firmware.bin and other files exist.
+
+**Check:**
+
+- At the end you see a "Build Summary" for that environment.
+- The directory .pio/build/esp32dev-all-test contains .bin and .elf files.
+
+If there are no artifacts, check that PlatformIO is installed and that the environment name matches one from ci_list-env.sh.
+
+### 5.5 Prepare artifacts for sharing or flashing tools
+
+After a successful build, you can create a clean set of files ready for release or for use with external flashing tools (for example esptool.py or web uploaders).
+
+Use scripts/ci_prepare_artifacts.sh through ci_build.sh, or call it directly.
+
+Example (after a build) with ci_build.sh wrapper:
+
+```bash
+./scripts/ci_build.sh esp32dev-all-test --mode prod --deploy-ready
+```
+
+Example direct call to ci_prepare_artifacts.sh:
+
+```bash
+./scripts/ci_prepare_artifacts.sh esp32dev-all-test --clean
+```
+
+This script:
+
+- Copies firmware.bin, partitions.bin, bootloader.bin and other files from `.pio/build/<env>` into the output folder.
+- Renames them with the environment name, for example esp32dev-all-test-firmware.bin.
+- Creates archives for the libraries used by that environment.
+
+**Check:**
+
+- The folder generated/toDeploy (or your custom output) exists.
+- It contains files like `<env>-firmware.bin` and one or more `*-libraries.tgz` archives.
+
+If the script says the build directory is missing, run a firmware build first (section 5.3 or 5.4).
+
+### 5.6 Run QA checks from the terminal
+
+Before you send a pull request, it is good to check the code style.
+
+Run:
+
+```bash
+./scripts/ci.sh qa --check
+```
+
+This uses scripts/ci_qa.sh to run clang-format checks on files under main by default.
+
+**Check:**
+
+- The summary says "Status: SUCCESS".
+
+If there are formatting problems, you can auto-fix them:
+
+```bash
+./scripts/ci.sh qa --fix
+```
+
+After this, review the changes with git diff, then commit them.
+
+### 5.7 Run the full pipeline (QA + firmware build + docs)
+
+For a full local run, similar to CI, use:
+
+```bash
+./scripts/ci.sh all esp32dev-all-test --mode prod
+```
+
+This will:
+
+- Run QA checks.
+- Build the firmware.
+- Build the documentation site in production mode (unless you add --no-site).
+
+**Check:**
+
+- At the end you see a "Complete Pipeline Summary" with "Status: SUCCESS".
+
+If QA fails, fix style issues first. If the build fails, fix code or environment problems, then run again.
+
+::: tip Next Steps
+Once your code builds successfully, check the [Development contributions guide](./development.md) for:
+- Code naming rules (ZgatewayXXX, ZsensorYYY, etc.)
+- Code style and quality requirements
+- How to open a pull request
+- Contributing workflow
+:::
+
+
+
+## 6. Work on the documentation website (from the terminal)
+
+The documentation website uses VuePress and Node.js. The site source is in the docs folder.
+
+::: warning Note
+This section is **only needed** if you want to **build or preview the site on your own computer**.  
+If you make a **very small change** in a markdown (.md) file (for example fix a typo or add one sentence), you can:
+
+- Edit the file in VS Code.
+- Push your change and open a pull request.
+
+In that case it is **not mandatory** to install Node.js, npm, or to run `./scripts/ci.sh site`. The CI on GitHub will build the site for you and show problems if there are any.
+
+If you want to see your doc changes locally before you push (recommended for bigger edits), then follow the steps below.
+:::
+
+### 6.1 Install Node dependencies
+
+From the project root:
+
+```bash
+cd OpenMQTTGateway   # only if you are not already inside
+npm install
+```
+
+This command reads package.json and installs all Node modules needed for the docs.
+
+**Check:**
+
+- The command finishes without error.
+- A node_modules folder exists in the project root.
+
+If install is slow, your internet may be the reason. If it fails, try again later or clear the npm cache with:
+
+```bash
+npm cache clean --force
+```
+
+### 6.2 Build the docs site with ci.sh
+
+If you want to check that everything still builds well after bigger doc changes, you can build the site locally.
+
+The recommended way is:
+
+```bash
+./scripts/ci.sh site --mode prod --url-prefix / --version 1.8.0
+```
+
+Important options:
+
+- `--mode dev` or `--mode prod`: development or production build (default: dev).
+- `--url-prefix PATH`: base URL path for links, e.g. `/` for root or `/dev/` for dev (default: /dev/).
+- `--version TAG`: version string written into docs/.vuepress/meta.json (default: edge).
+- `--preview`: if added, starts a local HTTPS preview server after build.
+- `--clean`: remove generated/site folder before build.
+- `--insecure-curl`: allow curl to skip TLS verification if needed.
+
+The script (scripts/ci_site.sh) will:
+
+- Check that node, npm and openssl are available.
+- Download a shared configuration file for the site.
+- Create docs/.vuepress/meta.json with site info.
+- Run npm run docs:build to build the site.
+
+**Check:**
+
+- The summary at the end says "Site Build Summary" and "Status: SUCCESS".
+- The folder docs/.vuepress/dist exists and contains HTML files.
+
+If openssl or node is missing, go back to section 2 and install them.
+
+### 6.3 Preview the docs site locally
+
+To preview the site in your browser:
+
+```bash
+./scripts/ci.sh site --mode dev --url-prefix /dev/ --version edge --preview
+```
+
+The script will start a local HTTPS server.
+
+**Check:**
+
+- The log prints a line similar to: "Preview server running at https://localhost:8443/dev/".
+- Open that URL in your browser. You should see the OpenMQTTGateway documentation.
+
+To stop the preview, go back to the terminal and press Ctrl+C.
+
+### 6.4 Work on docs with plain npm commands
+
+If you prefer not to use the ci.sh wrapper, you can work directly with npm and VuePress.
+
+From the project root:
+
+```bash
+npm run docs:dev
+```
+
+This runs VuePress in development mode with hot reload. When you change a .md file under docs, the browser reloads.
+
+For a production build:
+
+```bash
+npm run docs:build
+```
+
+**Check:**
+
+- For docs:dev, the terminal prints a local URL like http://localhost:8080. Open it in the browser and see the docs.
+- For docs:build, the folder docs/.vuepress/dist is created.
+
+If docs:build fails with an OpenSSL error on new Node versions, set:
+
+```bash
+export NODE_OPTIONS="--openssl-legacy-provider"
+```
+
+then run the command again. The ci_site.sh script already does this for you.
+
+### 6.5 Where to edit docs
+
+- All documentation pages are markdown (.md) files under docs.
+- This file itself is in docs/participate/quick_start.md.
+
+To add or edit docs:
+
+1. Open the docs folder in VS Code.
+2. Change or create markdown files.
+3. Run npm run docs:dev to check how the page looks.
+
+**Check:** after a change and a page refresh, your new text appears on the site.
+
+
+
+## 7. Typical workflows for contributors
+
+This section gives some example "day to day" flows.
+
+### 7.1 Quick firmware change with VS Code
+
+1. Open the project folder in VS Code.
+2. Choose the right environment (section 4.3).
+3. Edit code in main or lib.
+4. Build (section 4.4).
+5. Upload (section 4.5).
+6. Watch logs in Serial Monitor (section 4.6).
+
+**Check:** your change has the expected effect on the real device.
+
+### 7.2 Firmware change using terminal only
+
+1. Open a bash terminal.
+2. Go to the project root.
+3. Build firmware with:
+
+    ```bash
+    ./scripts/ci.sh build <env> --mode dev --verbose
+    ```
+
+4. Flash firmware using PlatformIO CLI or another flash tool with the generated firmware file.
+
+**Check:** the device boots with your new firmware and behaves as expected.
+
+### 7.3 Change documentation and preview
+
+1. Edit markdown files under docs.
+2. In a terminal, run npm run docs:dev or ./scripts/ci.sh site --mode dev --preview.
+3. Open the local URL in your browser.
+
+**Check:** your text appears on the page and looks correct.
+
+
+
+## 8. Troubleshooting
+
+This list gives quick help for common problems.
+
+- **Problem:** platformio command not found.
+   - **Fix:** install it with python3 -m pip install -U platformio and open a new terminal.
+
+- **Problem:** Build fails for all environments.
+   - **Fix:** run ./scripts/ci.sh list-env to confirm you use a valid env. Check that you did not change platformio.ini or environments.ini in a wrong way.
+
+- **Problem:** Build fails with missing libraries.
+   - **Fix:** run a clean build (add --clean). If you work only with VS Code, press the trash icon or use the clean target from PlatformIO.
+
+- **Problem:** Upload fails ("Failed to connect to ESP32").
+   - **Fix:** choose the right serial port, check the cable, try holding BOOT during upload.
+
+- **Problem:** Serial output is garbled.
+   - **Fix:** set Serial Monitor baud to 115200 and confirm monitor_speed in platformio.ini is the same.
+
+- **Problem:** npm install is very slow or fails.
+   - **Fix:** check your internet connection. If needed run npm cache clean --force and try again.
+
+- **Problem:** Site build fails with an OpenSSL error.
+   - **Fix:** export NODE_OPTIONS="--openssl-legacy-provider" before running npm run docs:build, or use ./scripts/ci.sh site which already sets this.
+
+If you still have problems after these steps, you can open an issue on the project GitHub page. Include:
+
+- Your operating system (Windows or Linux, version).
+- What you tried to do.
+- The exact command you ran.
+- The error message from the end of the log.
+
+This information helps maintainers reproduce and fix the problem.
+
+
+
+## 9. Glossary (simple words)
+
+This glossary explains some words used in this guide.
+
+- **Firmware**: the program that runs inside your ESP32 or ESP8266 board.
+- **Repository (repo)**: the project folder stored on GitHub and on your computer.
+- **Commit**: a saved set of changes in Git, with a message.
+- **Branch**: a line of development in Git, like a separate copy where you work.
+- **Pull Request (PR)**: a request to merge your branch into the main project on GitHub.
+- **Environment (env)**: a PlatformIO configuration for a specific board and options.
+- **CI (Continuous Integration)**: automatic scripts that build and test the project on every change.
+- **Serial Monitor**: a window that shows text messages sent by your board over USB.
+- **MQTT**: a lightweight network protocol used to send messages between devices.
+- **VuePress**: a static site generator used to build this documentation.
+
+If any word in this guide is not clear, you can search it on the web or ask in the project community. Many people had the same question before you.
+
+
+
+## 10. External links and further reading
+
+Here is a list of useful links related to tools used in this project:
+
+- **OpenMQTTGateway project**: https://github.com/1technophile/OpenMQTTGateway
+- **PlatformIO main site**: https://platformio.org/
+- **PlatformIO installation for VS Code**: https://platformio.org/install/ide?install=vscode
+- **PlatformIO documentation**: https://docs.platformio.org/
+- **Visual Studio Code documentation**: https://code.visualstudio.com/docs
+- **Git official site**: https://git-scm.com/
+- **Pro Git book (free)**: https://git-scm.com/book/en/v2
+- **GitHub getting started**: https://docs.github.com/en/get-started
+- **Node.js documentation**: https://nodejs.org/en/docs
+- **npm documentation**: https://docs.npmjs.com/
+- **VuePress documentation** (v1, similar to what this project uses): https://v1.vuepress.vuejs.org/
+- **MQTT introduction (HiveMQ)**: https://www.hivemq.com/mqtt-essentials/
+
+You do **not** need to read all of them now. Keep this list as a bookmark and come back when you are curious or stuck.
+
+
+## 11. Final words and friendly advice
+
+Contributing to an open source project is a journey. The first steps (install tools, learn Git, learn PlatformIO) can feel slow. This is normal.
+
+Some final tips:
+
+- Change one thing at a time and test often.
+- Keep your changes small; they are easier to review.
+- Write clear commit messages.
+- When something breaks, read the last 10–20 lines of the log first.
+- Do not be afraid to ask questions; everyone started as a beginner.
+
+You are now ready to work on both firmware and documentation for OpenMQTTGateway. Take your time, follow the checks after each step, and you will build confidence with the toolchain and the project. Step by step, you will become faster and more comfortable.
+
+
+If you are new and want to "play" a bit before you change real logic, here are some safe exercises:
+
+1. **Practice the build chain only.**  
+   - Clone the repo, open it in VS Code, select `esp32dev-all-test`, build, and upload to your board.  
+   - Check that you can see logs in the Serial Monitor.
+2. **Make a tiny log change.**  
+   - Find a `LOG` or `Serial` message in a gateway or sensor file under `main`.  
+   - Change the text slightly (for example add a word), rebuild, upload, and verify you see the new message.
+3. **Edit a small doc page.**  
+   - Fix a typo or add one sentence of clarification in a markdown file under `docs`.  
+   - Run `./scripts/ci.sh site --mode prod --preview` and confirm your change appears in the browser.
+4. **Run QA locally.**  
+   - Run `./scripts/ci.sh qa --check`. If there are issues, run `./scripts/ci.sh qa --fix` and see how files are changed.
+5. **Open a small PR.**  
+   - For example, only the doc change or a very small code improvement. This lets you learn the review process without much stress.
+
+These small steps build confidence. After that you can move to bigger things: adding new sensors, improving MQTT payloads, or extending the web documentation.
diff --git a/docs/participate/support.md b/docs/participate/support.md
index 16c718b..f6501f6 100644
--- a/docs/participate/support.md
+++ b/docs/participate/support.md
@@ -1,16 +1,22 @@
 # Supporting the project
 
-If you like the project and/or used it please consider supporting it! It can be done in different ways:
-* Purchase the [Theengs mobile application](https://app.theengs.io)
-* Purchase the [Theengs plug](https://shop.theengs.io)
-* Helping other users in the [community](https://community.openmqttgateway.com)
-* [Contribute](development) to the [code](https://github.com/1technophile/OpenMQTTGateway) or the [documentation](https://docs.openmqttgateway.com)
-* Buy devices, boards or parts from the [compatible web site](https://compatible.openmqttgateway.com), the devices and parts linked use affiliated links.
-* Donate or sponsor the project [developers](https://github.com/1technophile/OpenMQTTGateway/graphs/contributors)
-* Make a video or a blog article about what you have done with [OpenMQTTGateway](https://docs.openmqttgateway.com) and share it.
+If you like the project, you can help in different ways. Choose what fits you best.
 
-Support open-source development through sponsorship and gain exclusive access to our private forum. Your questions, issues, and feature requests will receive priority attention, plus you'll gain insider access to our roadmap.
+## Give time and knowledge
+- Help other users in the [community](https://community.openmqttgateway.com).
+- Share logs, payload samples, or how-to posts that unblock others.
+
+## Contribute code or docs
+- Follow the [Development contributions guide](./development.md) to open a PR.
+- Improve docs or examples if you spot unclear steps.
+
+## Financial support
+- Purchase the [Theengs mobile application](https://app.theengs.io) or the [Theengs Bridge](https://shop.theengs.io).
+- Sponsor the project [developers](https://github.com/1technophile/OpenMQTTGateway/graphs/contributors).
+- Make a video or blog article about what you built with [OpenMQTTGateway](https://docs.openmqttgateway.com) and share it.
+
+Support open-source development through sponsorship, it helps keep the project healthy and evolving.
 
 <div style="text-align: center;">
-    <iframe src="https://github.com/sponsors/theengs/button" title="Sponsor Theengs" height="32" width="228" style="border: 0; border-radius: 6px;"></iframe>
+    <iframe src="https://github.com/sponsors/1technophile/button" title="Sponsor 1technophile" height="32" width="228" style="border: 0; border-radius: 6px;"></iframe>
 </div>
diff --git a/docs/prerequisites/board.md b/docs/prerequisites/board.md
index 874fbca..9fa7305 100644
--- a/docs/prerequisites/board.md
+++ b/docs/prerequisites/board.md
@@ -1,38 +1,37 @@
+---
+aside: false
+---
+
 # Boards
 
-OpenMQTTGateway is not closed to one board or type of board, by using the power of the Arduino framework and libraries that are cross compatibles it let you many choice of hardware, from an Arduino UNO to an ESP32.
+OpenMQTTGateway is not closed to one board or type of board, by using the power of the Arduino framework and libraries that are cross compatibles it let you many choice of hardware, from an ESP8266 to an ESP32.
 
-You can take a look to the [OpenMQTTGateway compatible website](https://compatible.openmqttgateway.com) to have a view of the [supported boards](https://compatible.openmqttgateway.com/index.php/boards/).
+## Which board do I need?
+
+For the most common use cases, the choice is simple:
+
+|I want to...|Recommended board|Extra hardware|
+|-|-|:-:|
+|Bring Bluetooth sensors into my home automation|Any ESP32 development board|None|
+|Receive RF devices — 433/315/868/915MHz (weather stations, door/PIR sensors...)|LILYGO® LoRa32 V2.1 or Heltec LoRa V2, matching your devices' frequency|None|
+|Send and receive RF remotes and switches (433/315MHz)|ESP32 + SRX882/STX882 or CC1101 modules|[Wiring](../setitup/rf.md)|
+|Control my TV or AC through infrared|ESP32 + IR emitter/receiver|[Wiring](../setitup/ir.md)|
+|Reach far-away sensors with LoRa|LILYGO® LoRa32 or Heltec LoRa board|None|
+|Skip flashing and wiring entirely|[Theengs Bridge](https://shop.theengs.io/), a pre-flashed BLE gateway|None|
+
+::: tip Running on a computer
+If you want to use the BLE decoding capabilities of OpenMQTTGateway with a Raspberry Pi, Windows or Unix PC you can use [Theengs Gateway](https://gateway.theengs.io/), and on a tablet or smartphone the [Theengs App](https://app.theengs.io/).
+:::
+
+## Exploring further
 
 Moreover the gateways capacities can be extended with sensors; DHT, HC SR501, ADC, I2C bus, INA226, MQ2, TEMT6000, TSL2561, BME280/BMP280, HTU21D, AHTx0, DS1820
 or actuators; LED, relays, PWM.
 
-::: tip Running on a computer
-If you want to use the BLE decoding capabilities of OpenMQTTGateway with a Raspberry Pi, Windows or Unix PC you can use [Theengs Gateway](https://gateway.theengs.io/).
-:::
-
-::: tip Running on a tablet or phone
-If you want to use the BLE decoding capabilities of OpenMQTTGateway with a tablet or smartphone you can use [Theengs App](https://app.theengs.io/).
-:::
-
-[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerful BLE to MQTT gateway for over [90 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity.
-
-[![Theengs bridge view](../img/Theengs-Bridge-ble-gateway.png)](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna)
-
-[Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption) is available flashed with OpenMQTTGateway, and brings the functions below:
-* BLE to MQTT gateway, tens of Bluetooth devices supported thanks to Theengs Decoder library. The plug uses an ESP32 acting as a BLE to Wifi gateway to scan, decode and forward the data of the nearby sensors,
-* Smart plug that can be controlled remotely,
-* Energy consumption monitoring,
-* Device tracker,
-* Presence detection (beta),
-* Local connectivity first.
-
-[![Theengs plug view](../img/Theengs-Plug-OpenMQTTGateway.png)](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
-
-Support the project by purchasing the [Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) or the [Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
-The plug is available in North America only, other regions are planned.
-
 Choosing your board depends heavily on the technologies you want to use with it.
-To have a good overview of the compatibilities per board you can refer to the compatible modules attributes of each [board](https://compatible.openmqttgateway.com/index.php/boards/).
+The choice between these boards will depend on your knowledge and your requirements in terms of reliability, situation, modules wanted and devices you already have. Use the table below to explore the latest environments.
 
-The choice between these boards will depend on your knowledge and your requirements in terms of reliability, situation, modules wanted and devices you already have. The table below present those (auto-generated)
+<BoardEnvironmentTable 
+      boardsUrl="/boards-info.json"
+      selectorPath="/upload/board-selector.html"
+/>
diff --git a/docs/prerequisites/boards/.gitignore b/docs/prerequisites/boards/.gitignore
deleted file mode 100644
index 86d0cb2..0000000
--- a/docs/prerequisites/boards/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/docs/prerequisites/broker.md b/docs/prerequisites/broker.md
index 3d10d9b..3f8c9d9 100644
--- a/docs/prerequisites/broker.md
+++ b/docs/prerequisites/broker.md
@@ -3,6 +3,11 @@ The broker will act as an intermediary between OpenMQTTGateway and your [control
 
 All the events or commands could pass by the broker.
 
+::: tip Recommended setup
+* **You use Home Assistant**: install the **Mosquitto broker add-on** (Settings → Add-ons → Add-on store), enable the MQTT integration, and create a dedicated user for the gateway. This is the path followed by the [Getting Started guide](../getting-started.md).
+* **You don't**: install [Mosquitto](https://mosquitto.org/) on any always-on machine (Raspberry Pi, NAS, server), it is lightweight, open source and well documented.
+:::
+
 There are many choices of brokers, here are some of the most popular:
 * [Mosquitto](https://mosquitto.org/) (Open source)
 * [Moquette](https://moquette-io.github.io/moquette/) (Open source)
diff --git a/docs/prerequisites/devices.md b/docs/prerequisites/devices.md
index f1dbbbe..222ccb9 100644
--- a/docs/prerequisites/devices.md
+++ b/docs/prerequisites/devices.md
@@ -1,129 +1,24 @@
 # Devices
 
-You can take a look to the [OpenMQTTGateway compatible website](https://compatible.openmqttgateway.com) to have a view of the [supported devices](https://compatible.openmqttgateway.com/index.php/devices/).
-
-Added to that is an overview of devices supported by OpenMQTTGateway:
+For Bluetooth, the maintained list of supported devices is the [Theengs Decoder compatible devices list](https://decoder.theengs.io/devices/devices.html). For the other technologies, the sections below give an overview of what is supported:
 
 ## For radio frequency devices 
 OpenMQTTGateway can support a wide range of 433mhz/315mhz devices, all the ones with SC5262 / SC5272, HX2262 / HX2272, PT2262 / PT2272, EV1527, RT1527, FP1527, HS1527 chipsets are supported by the RF gateway. Added to that RF2 support Kaku and Pilight an [huge list](https://wiki.pilight.org/devices). 
 Note that for the moment RF, RF2 and Pilight can not be activated on the same boards together.
 
-![boards](../img/OpenMQTTGateway_devices_rf1.png ':size=250%')
-![boards](../img/OpenMQTTGateway_devices_rf2.png ':size=250%')
-![boards](../img/OpenMQTTGateway_devices_rf3.png ':size=250%')
+
 
 ## For BLE devices 
 OpenMQTTGateway is able to scan all the BLE devices that advertise their data so as to do presence detection. 
-Added to that it retrieves the measures from the devices below. By default the data are read from the advertisements (no impact on device battery life). When a (c) is present after the model name, this means that the gateway connects to it so as to retrieve data or control the device. For some devices we may connect only to retrieve one or several parameters (the rest being advertised), in this case the (c) is placed with the parameter.
+Added to that it retrieves the measures from the devices mentioned and linked to below. By default the data are read from the advertisements (no or very little impact on device battery life). For some devices we may connect briefly only to retrieve one or several parameters.
 
-|Devices|Model|Measurements|
-|-|:-:|:-:|
-| Amazfit|Smart Watch, Band|steps, activity heart rate (when activated in the Zepp Life settings)|
-| April Brother|ABTemp|uuid, mfid, major, txpower @ 1 m, temperature, battery|
-| April Brother|N03|temperature, humidity, luminance, battery|
-| April Brother|N07|temperature, humidity, battery, packet ID|
-| ATorch Battery Capacity Monitor (c)|DT24|voltage, amp, watt|
-| BLE watches with fixed MAC||rssi for presence detection|
-| BLE beacons keychains||rssi for presence detection|
-| BlueCharm|BC08|acceleration x, y, z-axis, voltage, temperature|
-| BlueCharm|BC04P|acceleration x, y, z-axis, voltage, temperature|
-| BlueCharm|BC021|acceleration x, y, z-axis, voltage, temperature|
-| BlueMaestro|TempoDisc 1 in 1|temperature, battery|
-| BlueMaestro|TempoDisc 3 in 1|temperature, humidity, dew point, battery|
-| BlueMaestro|TempoDisc 4 in 1|temperature, humidity, pressure, battery|
-| BM2 Battery Monitor|BM2|battery, volt(c)|
-| BM6 Battery Monitor|BM6|battery|
-| ClearGrass|CGG1|temperature, humidity, battery, voltage (depending on which CGG1 firmware is installed)|
-| ClearGrass alarm clock|CGD1|temperature, humidity, battery|
-| ClearGrass alarm clock|CGC1|temperature, humidity, battery|
-| ClearGrass with atmospheric pressure|CGP1W|temperature, humidity, air pressure|
-| ClearGrass Clock|LYWSD02|temperature, humidity, battery|
-| GOVEE|H5055|temperature1, temperature2, temperature3, temperature4, temperature5, temperature6, battery|
-| GOVEE|H5074|temperature, humidity, battery|
-| GOVEE|H5075|temperature, humidity, battery|
-| GOVEE|H5072|temperature, humidity, battery|
-| GOVEE|H5100|temperature, humidity, battery|
-| GOVEE|H5101|temperature, humidity, battery|
-| GOVEE|H5102|temperature, humidity, battery|
-| GOVEE|H5104|temperature, humidity, battery|
-| GOVEE|H5106|PM2.5, temperature, humidity, battery|
-| GOVEE|H5174|temperature, humidity, battery|
-| GOVEE|H5177|temperature, humidity, battery|
-| GOVEE|H5179|temperature, humidity, battery|
-| HONEYWELL|JQJCY01YM|formaldehyde, temperature, humidity, battery|
-| Hydractiva Digital | Amphiro, Oras|sessions, time, litres, temperature, energy|
-| iBeacon|protocol|uuid, mfid, major, minor, txpower @ 1 m, voltage|
-| Jaalee|JHT F525|temperature, humidity, battery|
-| INKBIRD|IBS-TH1|temperature, humidity, battery|
-| INKBIRD|IBS-TH12S|temperature, humidity, battery|
-| INKBIRD|IBS-TH2, P01B|temperature, battery|
-| INKBIRD|IBT-2X|temperature1, temperature2|
-| INKBIRD|IBT-4X(S, C)|temperature1, temperature2, temperature3, temperature4|
-| INKBIRD|IBT-6XS|temperature1, temperature2, temperature3, temperature4, temperature5, temperature6|
-| iNode|Energy Meter|Current average and aggregate kW(h), m³, battery|
-| KKM |K6P|temperature, humidity, voltage|
-| KKM |K9|temperature, humidity, voltage, acceleration x, y, z-axis (optional - without recognised as K6P)|
-| Oral B| Toothbrush| state, mode, sector, pressure, time|
-| Oria, Brifit, SigmaWit, SensorPro|TH Sensor T201|temperature, humidity, battery|
-| Oria, Brifit, SigmaWit, SensorPro|TH Sensor T301|temperature, humidity, battery|
-| Mokosmart|M1|acceleration x, y, z-axis, battery|
-| Mokosmart|H4|temperature, humidity, voltage|
-| Mopeka|Pro|temperature, level, sync status, voltage, battery, reading quality, acceleration x, y-axis|
-| Lippert|BottleCheck|temperature, level, sync status, voltage, battery, reading quality, acceleration x, y-axis|
-| Otio, BeeWi|Door & Window Sensor|contact, battery|
-| Polar|H10 Chest strap|activity heart rate|
-| Qingping|CGDK2|temperature, humidity|
-| Qingping|CGH1|open|
-| Qingping|CGPR1|presence, luminance, battery|
-| Qingping|CGDN1|temperature, humidity, PM2.5, PM10, carbon dioxide|
-| RDL52832||mfid, uuid, minor, major, txpower @ 1 m, temperature, humidity, acceleration x, y, z-axis|
-| RBaron|b-parasite|moisture, temperature, humidity, luminance (v1.1.0+), voltage|
-| RuuviTag Raw V1|RuuviTag|temperature, humidity, pressure, acceleration x, y, z-axis, voltage|
-| RuuviTag Raw V2|RuuviTag|temperature, humidity, pressure, acceleration x, y, z-axis, voltage, TX power, movement, counter, sequence number|
-| SmartDry|Laundry Sensor|temperature, humidity, shake, voltage, wake|
-| Sensirion|MyCO₂, CO₂ Gadget|temperature, humidity, carbon dioxide|
-| Sensirion|SHT4X TH sensor|temperature, humidity|
-| ShellyBlu|Button1|button press type, battery, packet ID|
-| ShellyBlu|Door, Window|contact, rotation, battery, packet ID|
-| ShellyBlu|Motion|motion, illuminance, battery, packet ID|
-| Switchbot|Bot (c)|mode, state, battery|
-| Switchbot|Motion Sensor|movement, light level, sensing distance, led, scope tested, battery|
-| Switchbot|Contact Sensor|contact, movement, scope tested, light level, in count, out count, push count, battery|
-| Switchbot|Curtain|motion state, position, light level, battery, calibration state|
-| Switchbot|Meter (Plus)|temperature, humidity, battery|
-| Switchbot|Outdoor Meter|temperature, humidity, battery|
-| Thermobeacon|WS02|temperature, humidity, voltage, timestamp, maximum temperature, maximum temperature timestamp, minimum temperature, minimum temperature timestamp|
-| Thermobeacon|WS08|temperature, humidity, voltage, timestamp, maximum temperature, maximum temperature timestamp, minimum temperature, minimum temperature timestamp|
-| ThermoPro|TP357|temperature, humidity|
-| ThermoPro|TP357s|temperature, humidity|
-| ThermoPro|TP358|temperature, humidity|
-| ThermoPro|TP359|temperature, humidity|
-| ThermoPro|TP393|temperature, humidity|
-| TPMS|TPMS|temperature, pressure, battery, alarm, count|
-| Vegtrug||temperature, moisture, luminance, fertility|
-| XIAOMI Mi Flora|HHCCJCY01HHCC|temperature, moisture, luminance, fertility, battery(c) firmware >3.1.8|
-| XIAOMI Ropot|HHCCPOT002|temperature, moisture, fertility|
-| XIAOMI Mi Jia|LYWSDCGO|temperature, humidity, battery|
-| XIAOMI Mi Jia|LYWSD02|temperature, humidity, battery|
-| XIAOMI Mi Jia 2(c)|LYWSD03MMC|temperature, humidity, battery, voltage|
-| XIAOMI Mi Jia 2 custom firmware (2)|LYWSD03MMC ATC|temperature, humidity, battery, voltage|
-| XIAOMI Mi Jia 2 custom firmware (3)|LYWSD03MMC PVVX (encrypted or not)|temperature, humidity, battery, voltage|
-| XIAOMI Mi Lamp|MUE4094RT|presence|
-| XIAOMI Mi Smart Scale|XMTZC01HM, XMTZC04HM|weighing mode, unit, weight|
-| XIAOMI Mi Body Composition Scale|XMTZC02HM, XMTZC05HM|weighing mode, unit, weight, impedance|
-| XIAOMI Mi Temp, Humidity v1(c)|MHO-C401|temperature, humidity, battery, voltage|
-| XIAOMI Mi Temp, Humidity v2(c)|XMWSDJ04MMC|temperature, humidity, battery, voltage|
-| XIAOMI|Mi band|steps, activity heart rate (when activated in the Zepp Life settings)|
-
-Exhaustive list [here](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/)
+OpenMQTTGateway currently supports the decoding of [more than 100 Bluetooth devices](https://decoder.theengs.io/devices/devices.html), which include popular devices like Mi Flora, Xiaomi scales, Inkbird, Govee and ThermoPro thermo-hygrometers and BBQ thermometers, SwitchBot devices status and many more.
 
 ::: tip
 - (2) See https://github.com/atc1441/ATC_MiThermometer
 - (3) See https://github.com/pvvx/ATC_MiThermometer
 :::
 
-![devices](../img/OpenMQTTGateway_devices_ble.png ':size=250%')
-
 ## For infrared IR devices 
 The list of supported devices for ESP is [here](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/SupportedProtocols.md), and [here](https://github.com/1technophile/OpenMQTTGateway/blob/6f73160d1421bebf2c1bbc9b8017978ff5b16520/main/config_IR.h#L123) for Arduino boards, as there is also the possibility of using raw and global cache (ESP) sending possibilities of this gateway is huge!
 
diff --git a/docs/prerequisites/parts.md b/docs/prerequisites/parts.md
index ecfafd4..354bb21 100644
--- a/docs/prerequisites/parts.md
+++ b/docs/prerequisites/parts.md
@@ -1,8 +1,6 @@
 # Parts
 Depending on the gateway you would like to setup and your board, you may need extra parts/module to add.
 
-You can take a look to the [OpenMQTTGateway compatible website](https://compatible.openmqttgateway.com) to have a view of the [supported parts](https://compatible.openmqttgateway.com/index.php/parts/).
-
 Here is below the main parts reference.
 
 ## Main parts 
@@ -15,5 +13,5 @@ Here is below the main parts reference.
 |A6/A7|-|-|-|-|X|
 
 ::: tip
-There is a wide range of parts available that may be compatible with OpenMQTTGateway, the ones [listed](https://compatible.openmqttgateway.com/index.php/parts/) are the ones tested and for which you can ask for support. Indeed for other parts we may not have it so as to reproduce the issue, or in the worst case they may not be compatible.
+There is a wide range of parts available that may be compatible with OpenMQTTGateway, the ones listed above are the ones tested and for which you can ask for support. Indeed for other parts we may not have it so as to reproduce the issue, or in the worst case they may not be compatible.
 :::
diff --git a/docs/setitup/actuators.md b/docs/setitup/actuators.md
index f4e47fb..87a33a5 100644
--- a/docs/setitup/actuators.md
+++ b/docs/setitup/actuators.md
@@ -1,11 +1,11 @@
 # Actuators
 ## Compatible parts 
-|Module|Purpose|Where to Buy|
-|-|-|-|
-|LED|Basic led|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|FASTLED|RGB Leds management|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|BUZZER|-|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|RELAY|Switch power circuit|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
+|Module|Purpose|
+|-|-|
+|LED|Basic led|
+|FASTLED|RGB Leds management|
+|BUZZER|-|
+|RELAY|Switch power circuit|
 
 ## Pinout
 |Module| Boards|
diff --git a/docs/setitup/gsm.md b/docs/setitup/gsm.md
index 67676bf..f472fed 100644
--- a/docs/setitup/gsm.md
+++ b/docs/setitup/gsm.md
@@ -1,10 +1,10 @@
 # GSM 2G gateway
 ## Compatible parts
 
-|Module|Purpose|Where to Buy|
-|-|-|-|
-|A6|GSM GPRS module|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|A7|GSM GPRS module with GPS|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
+|Module|Purpose|
+|-|-|
+|A6|GSM GPRS module|
+|A7|GSM GPRS module with GPS|
 
 ## Hardware setup
 
diff --git a/docs/setitup/ir.md b/docs/setitup/ir.md
index 3f7ecca..ee9f865 100644
--- a/docs/setitup/ir.md
+++ b/docs/setitup/ir.md
@@ -1,27 +1,23 @@
 # IR gateway
 ## Compatible parts
-|Module|Purpose|Where to Buy|
-|-|-|-|
-|IR diode|Emitting|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|IR receiver|Receiving|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|transistor 2N2222|Amplify uC signal for the IR diode|-|
-|330 ohms resistor|-|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|220 ohms resistor|limit current to LED|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
+|Module|Purpose|
+|-|-|
+|IR diode|Emitting|
+|IR receiver|Receiving|
+|transistor 2N2222|Amplify uC signal for the IR diode|
+|330 ohms resistor|-|
+|220 ohms resistor|limit current to LED|
 
 The IR setup can work with bc547 and a 4x3 LED-Matrix.
 
 ## Pinout
 |Board| Receiver Pin| Emitter Pin|
 |-|:-:|:-:|
-|Arduino UNO|D2|D9|
 |ESP8266|D4|D0|
 |ESP32|27/**26**|14|
 
 Connect the Emitter and Receiver to a 5V supply source, and the ground of your supply source to the ground of your board.
 
-## Arduino Hardware setup
-![IR](../img/OpenMQTTgateway_Arduino_Addon_IR.png)
-
 ## ESP8266 Hardware setup
 ![IR](../img/OpenMQTTgateway_ESP8266_Addon_IR.png)
 
diff --git a/docs/setitup/lora.md b/docs/setitup/lora.md
index ac1d6a3..f67b146 100644
--- a/docs/setitup/lora.md
+++ b/docs/setitup/lora.md
@@ -1,6 +1,6 @@
 # LoRa gateway
 ## Compatible parts
 An ESP32 board with a LoRa module.
-Ideally a TTGO board with LoRa module included see [compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)
+Ideally a TTGO board with LoRa module included.
 
 With this kind of board there is no hardware modification needed.
diff --git a/docs/setitup/rf.md b/docs/setitup/rf.md
index 18bdb70..e4f41b3 100644
--- a/docs/setitup/rf.md
+++ b/docs/setitup/rf.md
@@ -1,4 +1,4 @@
-# RF gateway (433mhz/315mhz)
+# RF gateway (433/315/868/915MHz)
 
 ## Protocols, modules and library
 
@@ -21,19 +21,18 @@ If you want to try the RTL_433 module with a combination or a board outside of t
 Heltec LORA V3 is not compatible with RTL_433 library as it is based on an SX1262 module.
 
 ## Assembly/soldering required parts
-|Module|Purpose|Compatible modules|Receiver Switching|Where to Buy|
-|-|-|-|-|-|
-|SRX882 or SRX882S (recommended)|433Mhz Receiver|RF(RCSwitch), RF2(KaKu), Pilight|Supported|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|STX882 (recommended)|433Mhz Transmitter|RF(RCSwitch), RF2(KaKu), Pilight|Supported|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|CC1101|433Mhz Transceiver|[RTL_433](../use/rf#supported-decoders), RF(RCSwitch), RF2(KaKu), Pilight|Supported|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|SX1276/SX1278|433Mhz Transceiver|[RTL_433](../use/rf#supported-decoders)|Not Supported|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|LilyGo/Heltec|433Mhz Transceiver|[RTL_433](../use/rf#supported-decoders)|Not Supported|[compatible parts list](https://compatible.openmqttgateway.com/index.php/parts)|
+|Module|Purpose|Compatible modules|Receiver Switching|
+|-|-|-|-|
+|SRX882 or SRX882S (recommended)|433Mhz Receiver|RF(RCSwitch), RF2(KaKu), Pilight|Supported|
+|STX882 (recommended)|433Mhz Transmitter|RF(RCSwitch), RF2(KaKu), Pilight|Supported|
+|CC1101|433Mhz Transceiver|[RTL_433](../use/rf#supported-decoders), RF(RCSwitch), RF2(KaKu), Pilight|Supported|
+|SX1276/SX1278|433Mhz Transceiver|[RTL_433](../use/rf#supported-decoders)|Not Supported|
+|LilyGo/Heltec|433Mhz Transceiver|[RTL_433](../use/rf#supported-decoders)|Not Supported|
 
 ### SRX STX Pinout
 |Board| Receiver Pin| Emitter Pin|
 |-|:-:|:-:|
-|Arduino UNO|D3|D4|
-|ESP8266|D2/**D3**/D1/D8|**RX**/D2|
+|ESP8266|**D2**/D1/D8|**RX**/D2|
 |ESP32|**27**/26|12|
 |RF BRIDGE|-|-|
 |RF BRIDGE [DIRECT HACK](https://github.com/xoseperez/espurna/wiki/Hardware-Itead-Sonoff-RF-Bridge---Direct-Hack)|4|5|
@@ -49,11 +48,25 @@ With SRX882S receiver connect the CS pin to 3.3V
 ### CC1101 Pinout
 |Board|Receiver Pin(GDO2)|Emitter Pin(GDO0)|SCK|VCC|MOSI|MISO|CSN|GND
 |-|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-|ESP8266|D2/**D3**/D1/D8|**RX**/D2|D5|**3V3**|D7|D6|D8|GND
+|ESP8266|**D2**/D1/D8|**RX**/D2|D5|**3V3**|D7|D6|D8|GND
 |ESP32|**D27**|D12|D18|**3V3**|D23|D19|D5|GND
 
-To use the CC1101 module, `ZradioCC1101` must be uncomment in the `User_config.h` or added to the `build_flags`.
-More information about the [CC1101 wiring](https://github.com/LSatan/SmartRC-CC1101-Driver-Lib#wiring). ( Please note that with OMG we are recommending CC1101 GDO2 to be connected to ESP32 D27 and GDO0 to be connected to D12, this is different than the LSatan diagram. This is due to the ESP32 using D2 as part of the boot process. )
+To use the CC1101 module, `ZradioCC1101` must be uncomment in the `User_config.h` or added to the `build_flags`. 
+
+More information about the [CC1101 wiring](https://github.com/LSatan/SmartRC-CC1101-Driver-Lib#wiring). 
+
+
+:::tip Please note that with OMG we are recommending CC1101 GDO2 to be connected to ESP32 D27 and GDO0 to be connected to D12, this is different than the LSatan diagram. This is due to the ESP32 using D2 as part of the boot process.
+
+If you want to use custom SPI pins for the CC1101 module, you can define the following variables in your `User_config.h` or as `build_flags` in `platformio.ini`:
+ - `RF_CC1101_SCK`: SPI clock pin (SCK)
+ - `RF_CC1101_SCK`: SPI clock pin (SCK)
+ - `RF_CC1101_MISO`: SPI MISO pin (Master In Slave Out)
+ - `RF_CC1101_MOSI`: SPI MOSI pin (Master Out Slave In)
+ - `RF_CC1101_CS`: SPI chip select pin (CSN)
+
+When **all** these variables are defined, OpenMQTTGateway will use your custom pinout for the CC1101 connection. This is useful if your board does not use the default pins or if you want to avoid conflicts with other devices.
+:::
 
 ## ESP32 Hardware setup
 ![Addon_RF](../img/OpenMQTTgateway_ESP32_Addon_RF.png)
@@ -65,9 +78,6 @@ With SRX882 some users reported that D3 is not working use D1 instead in this ca
 
 ![Addon_RF](../img/OpenMQTTgateway_ESP8266_Addon_RF.png)
 
-## Arduino Hardware setup
-![RF](../img/OpenMQTTgateway_Arduino_Addon_RF.png)
-
 ## SONOFF RF Bridge Hardware setup
 Per default there is no need on modifying the RF Bridge hardware, unless you don't want to use the provided RF controller (EFM8BB1). Indeed if you want to extend the protocols supported by the bridge you can [bypass this controller](https://github.com/xoseperez/espurna/wiki/Hardware-Itead-Sonoff-RF-Bridge---Direct-Hack) and use the ESP8255 capacities to decode RF Signal.
 The RF processing can be achieved after the modification by either RF, RF2 or Pilight gateways.
@@ -77,3 +87,5 @@ The RF processing can be achieved after the modification by either RF, RF2 or Pi
 
 ## WIFI RF GATEWAY Hardware setup
 This board doesn't require any hardware modifications.
+
+
diff --git a/docs/setitup/sensors.md b/docs/setitup/sensors.md
index 12548cc..3fc55d0 100644
--- a/docs/setitup/sensors.md
+++ b/docs/setitup/sensors.md
@@ -1,21 +1,21 @@
 # Sensors
 ## Compatible sensors
-|Module|Purpose|Where to Buy|
-|-|-|-|
-|DHT11|Temperature, Humidity|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|DHT22|Temperature, Humidity|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|HCSR501|PIR|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|BH1750|Digital light|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|BME280|Temperature, Humidity, Pressure|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|BMP280|Temperature, Pressure|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|C-37, YL-83, HM-RD|Leak, Water|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|HTU21|Temperature, Humidity|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|GPIO Input|Inputs|-|
-|GPIO KeyCode|Keycode|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|INA226|Current, Voltage|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|MQ2|Gas (flammable)|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|TEMT6000|Luminosity|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
-|TSL2561|Luminosity|[parts list](https://compatible.openmqttgateway.com/index.php/parts)|
+|Module|Purpose|
+|-|-|
+|DHT11|Temperature, Humidity|
+|DHT22|Temperature, Humidity|
+|HCSR501|PIR|
+|BH1750|Digital light|
+|BME280|Temperature, Humidity, Pressure|
+|BMP280|Temperature, Pressure|
+|C-37, YL-83, HM-RD|Leak, Water|
+|HTU21|Temperature, Humidity|
+|GPIO Input|Inputs|
+|GPIO KeyCode|Keycode|
+|INA226|Current, Voltage|
+|MQ2|Gas (flammable)|
+|TEMT6000|Luminosity|
+|TSL2561|Luminosity|
 
 ## Pinout
 |Module|Arduino Pin| ESP8266 Pin|ESP32 Pin|
diff --git a/docs/setitup/rs232.md b/docs/setitup/serial.md
similarity index 86%
rename from docs/setitup/rs232.md
rename to docs/setitup/serial.md
index 5206662..4a88127 100644
--- a/docs/setitup/rs232.md
+++ b/docs/setitup/serial.md
@@ -1,4 +1,4 @@
-# RS232 gateway
+# Serial/RS232 gateway
 ## Compatible parts
 |Module|Purpose|Where to Buy|
 |-|-|-|
@@ -10,15 +10,11 @@ Any module using a MAX232 chip will work. Don't pay extra to get all the signals
 ## Pinout
 |Board| Receiver Pin| Emitter Pin|
 |-|:-:|:-:|
-|Arduino UNO|D2|D9|
 |ESP8266|D2|D4|
 |ESP32|27/**26**|14|
 
 Connect VCC on the module to 5V of your board, and the ground on the module to the ground of your board. your Transmit pin goes to TX and your Receive pin goes to RX. This may seem backwards, but the module is labeled as where it will be connected on the RS232 side of the module.
 
-## Arduino Hardware setup
-![RS232](../img/OpenMQTTgateway_Arduino_Addon_RS232.png)
-
 ## ESP8266 Hardware setup
 ![RS232](../img/OpenMQTTgateway_ESP8266_Addon_RS232.png)
 
diff --git a/docs/upload/advanced-configuration.md b/docs/upload/advanced-configuration.md
index 2368d6c..fee36a7 100644
--- a/docs/upload/advanced-configuration.md
+++ b/docs/upload/advanced-configuration.md
@@ -10,16 +10,17 @@ The configuration of the broker is not covered here, you should look into the do
 
 ### Prerequisites
 The MQTT broker is configured for TLS and you have access to the CA certificate which was used to sign the MQTT broker certificate.
-You are using ESP8266 or ESP32, for other boards TLS is not supported.
+You are using ESP8266 or ESP32.
 
 ### Configure secure connection in the gateway
-To enable the secure connection and use TLS set the `#define MQTT_DEFAULT_SECURE` to true.
+To enable the secure connection and use TLS set the `#define MQTT_DEFAULT_SECURE` to true at build time, or the `mqtt secure` parameter with WiFi Manager or `mqtt_secure` with MQTT.
 Set `MQTT_SERVER` to the Common Name (CN) of the certificate of the broker.
-This can be the hostname or the IP of the broker.
+
+The server identity can be verified against a certificate or not, if you don't want to use a certicate to verify the server you can uncheck the option `validate cert` with WiFi Manager or set `mqtt_validate` to `false` with MQTT
 
 The CA certificate should be in PEM ascii format.
 If your CA certificate is not in the correct format or you don't know the format, use `openssl` to convert the certificate to the correct format.
-In `User_config.h` replace the `...` with the content of your certificate which is between the `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----` lines:
+At build time, in `main/certs/default_server_cert.h` replace the `...` with the content of your certificate which is between the `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----` lines:
 ```cpp
 const char* certificate CERT_ATTRIBUTE = R"EOF("
 -----BEGIN CERTIFICATE-----
@@ -28,7 +29,14 @@ const char* certificate CERT_ATTRIBUTE = R"EOF("
 ")EOF";
 ```
 
-You can know compile and upload to your board and the gateway should connect with TLS to your broker.
+With WiFi Manager copy your certificate from `-----BEGIN CERTIFICATE-----` to  `-----END CERTIFICATE-----` (included) and paste it into the input field:
+```
+-----BEGIN CERTIFICATE-----
+...
+-----END CERTIFICATE-----
+```
+
+This process can also be used for the other certificates, OTA, client key, client certificate if necessary.
 
 ## Add the received "value" at the end of the topic
 For the gateways that publish a "value" parameter on the json (RF, IR...), it is possible to concatenate this parameter at the end of the topic.
@@ -53,7 +61,7 @@ home/OpenMQTTGateway/SRFBtoMQTT/59365 {"raw":"2B660186042E00E7E5","value":"59365
 It can be useful to avoid warning or errors on certain controllers.
 
 ## Auto discovery
-Home Assistant discovery is enabled by default on all binaries and platformio configurations except for UNO. With Arduino IDE you have to uncomment [ZmqttDiscovery](https://github.com/1technophile/OpenMQTTGateway/blob/0180a0dbd55ed8e0799e30ee84f68070a6f478fa/User_config.h#L99) in User_config.h. 
+Home Assistant discovery is enabled by default on all binaries and platformio configurations.
 
 To have a working discovery setup you need to enable it on your MQTT integration definition in HASS.
 
diff --git a/docs/upload/binaries.md b/docs/upload/binaries.md
index 2348ff7..182f43b 100644
--- a/docs/upload/binaries.md
+++ b/docs/upload/binaries.md
@@ -15,7 +15,6 @@ https://www.espressif.com/en/products/hardware/esp32/resources
 * Choose ESP32 DownloadTool
 * Set the files and the address as below:
 ![Flash download tool](../img/OpenMQTTgateway_ESP32_binary_flash.png)
-And set the parameters used by Arduino IDE, we are able to upload to ESP32 a binary file containing OpenMQTTGateway.
 * Set the config as above
 * Connect your ESP32 board and select the COM port 
 * Click on erase if it is your first upload
@@ -68,6 +67,19 @@ If you want to upload the ready-to-go binary from Linux (or any other OS where y
       Hard resetting via RTS pin...
 * The board resets after the upload and boots the gateway firmware
 
+### Mac - esptool.py
+The approach for Mac is similiar to Linux. You need to install [Brew](https://brew.sh) for Mac to use [pip](https://docs.brew.sh/Homebrew-and-Python).
+The esptool.py tool needs to be adressed explicitly with .py at the end.
+If you do fail with the command, run `esptool.py chip_id` to let your Mac check for the ESP32 on your serial ports. A common failure for this looks like this:
+      
+      A fatal error occurred: Unable to verify flash chip connection (Invalid head of packet (0xE0): Possible serial noise or corruption.).
+
+If you receive this error
+
+      A fatal error occurred: Unable to verify flash chip connection (Packet content transfer stopped (received 7 bytes)).
+
+while flashing, try to reduce the baud rate to `--baud 115200`, as this seems to help in most cases.
+
 ## ESP8266
 * Download the NodeMCU Py Flasher tool :
 https://github.com/marcelstoer/nodemcu-pyflasher/releases
diff --git a/docs/upload/board-selector.md b/docs/upload/board-selector.md
new file mode 100644
index 0000000..e31a913
--- /dev/null
+++ b/docs/upload/board-selector.md
@@ -0,0 +1,5 @@
+<FlashEnvironmentSelector
+  boardsUrl="/boards-info.json"
+  firmwareBaseUrl="firmware_build/" />
+
+<small style="color: var(--vp-c-text-3);">Board photos courtesy of their manufacturers. ESP32 Feather photo © <a href="https://www.adafruit.com/product/3405">Adafruit Industries</a>, <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a>.</small>
diff --git a/docs/upload/builds.md b/docs/upload/builds.md
index e2c9f64..8d2ffa7 100644
--- a/docs/upload/builds.md
+++ b/docs/upload/builds.md
@@ -2,16 +2,10 @@
 
 ## Introduction
 
-This section is useful if you want to do advanced configuration of your project or if you choose an Arduino. Indeed the ESP hardware family can be loaded directly without any configuration from your desktop.
+This section is useful if you want to make an advanced project configuration not supported by the pre-built binaries.
 
 Advanced configuration means changing the default pins, the MQTT topics, and all the expert parameters that you can find in [`User_config.h`](https://github.com/1technophile/OpenMQTTGateway/blob/development/main/User_config.h) and in all [`config_XX.h`](https://github.com/1technophile/OpenMQTTGateway/tree/development/main) files. If you don't have to change the default parameters except Wi-Fi and MQTT broker settings, you don't need advanced configuration; you can go directly to the [Upload Binaries](binaries.md) section instead.
 
-To make advanced configurations to OpenMQTTGateway, you have the choice between two development environments:
-* [PlatformIO](https://platformio.org/)
-* [Arduino IDE](https://www.arduino.cc/en/Main/Software)
-
-I recommend using PlatformIO; this way you will not have to search for all the necessary libraries and adequate forks/revisions. If you really want to use Arduino IDE, you need to download the libraries listed [here](https://github.com/1technophile/OpenMQTTGateway/blob/d2dd6138558909b71cc44f69665340247bd5f356/platformio.ini#L55) at the version or revision specified.
-
 ## Configure & Upload with PlatformIO
 
 * Download the [CODE](https://github.com/1technophile/OpenMQTTGateway/releases) from github.
@@ -24,7 +18,7 @@ PlatformIO config files work on the concept of overriding. At first, a very simp
 [env]
 framework = arduino
 lib_deps =
-  ${libraries.pubsubclient}
+  ${libraries.picomqtt}
   ${libraries.arduinojson}
   ${libraries.arduinolog}
 build_flags =
@@ -157,6 +151,7 @@ Example to add IR to `esp32dev-rf` add the `build_flags` below to the env defini
 ``` ini
 [env:esp32dev-rf]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 lib_deps =
   ${com-esp.lib_deps}
@@ -193,6 +188,7 @@ With PIO you can also upload the firmware through Over the Air, so as to do that
 ``` ini
 [env:esp32-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -209,38 +205,6 @@ upload_flags =
   --port=8266
 ```
 
-## Configure & Upload with Arduino IDE
-
-* Download the [CODE](https://github.com/1technophile/OpenMQTTGateway/releases) from github
-* First download the last version of the Arduino IDE from the Arduino [website](https://www.arduino.cc/en/Main/Software)
-* Add ESP32 boards by following this [tutorial](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html#installing-using-arduino-ide)
-* Add ESP8266 boards by following this [tutorial](https://github.com/esp8266/Arduino#installing-with-boards-manager)
-* Download the libraries package corresponding to your board and module wished into the same page (example esp32-m5stick-c-ble-libraries.zip)
-* Unzip the libraries into your Arduino libraries folder (example D:/Users/XXXX/Documents/Arduino/libraries)
-* If necessary replace the spaces into each library folder by _: example rename “ESP32 BLE Arduino” folder to “ESP32_BLE_Arduino”
-* Open the file main.ino from OpenMQTTGateway/main folder with the Arduino IDE
-* Change the settings and the desired gateways into `User_config.h` (uncomment the modules you want)
-
-*Example for the use of RF gateway:*
-
-```cpp
-#define ZgatewayRF "RF" //ESP8266, Arduino, ESP32
-//#define ZgatewayIR "IR" //ESP8266, Arduino, Sonoff RF Bridge
-//#define ZgatewayLORA "LORA" //ESP8266, Arduino, ESP32
-//#define ZgatewayPilight "Pilight" //ESP8266, Arduino, ESP32
-//#define ZgatewayBT "BT" //ESP8266, ESP32
-```
-
-* Change the pins or parameters corresponding to the modules chosen, for RF you can change the pins in config_RF.h
-* Choose the board on the Arduino IDE
-* Select the port corresponding to the board
-* Note that for using BLE on ESP32 you will need to select *Minimal SPIFFS* into Tools->Partition Scheme
-* Open the serial monitor and set 115200 baud
-* Upload ➡️
-* You should see the logs in the serial monitor
-
-With an ESP if you did not set your network and MQTT parameters manually you can now open the [web portal configuration](portal.md).
-
 ## API
 With the V0.9 we added the support of json for receiving and publishing.
 Per default Json reception and Json publication is activated, the previous simple reception mode is also activated to avoid regression on commands.
diff --git a/docs/upload/gitpod.md b/docs/upload/gitpod.md
deleted file mode 100644
index 4cc9a8a..0000000
--- a/docs/upload/gitpod.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# (Option 4) Build from the web
-
-To build OpenMQTTGateway from the web and download the binary, follow these steps:
-
-1. Use Gitpod by clicking on the link below:
-[https://gitpod.io#https://github.com/1technophile/OpenMQTTGateway/tree/development](https://gitpod.io#https://github.com/1technophile/OpenMQTTGateway/tree/development)
-
-2. This will generate a development environment in your browser and install [platformio](https://platformio.org/) as a build environment.
-
-3. A first build for `esp32dev-ble` will be launched automatically. To modify the environment configuration, go to the environments.ini file in the root folder and launch the command like the one shown at the bottom of the image below:
-`platformio run -e <environment name>`
-
-![Gitpod build success](../img/OpenMQTTGateway-Build-gitpod-env.png)
-
-4. Wait for the server to build the binary. Once you see [SUCCESS], you can go to `.pio/build/<environment name>` and download `firmware.bin` and `partitions.bin` by right-clicking on each and selecting "Download."
-![Gitpod build download](../img/OpenMQTTGateway-Build-gitpod.png)
-
-5. Finally, follow [Option 2](binaries.md) to upload the binary.
diff --git a/docs/upload/index.md b/docs/upload/index.md
new file mode 100644
index 0000000..f7b0586
--- /dev/null
+++ b/docs/upload/index.md
@@ -0,0 +1,159 @@
+# Upload
+
+Getting OpenMQTTGateway onto your board takes three steps, whichever method you pick:
+
+<div class="omg-journey">
+  <div class="omg-step">
+    <span class="omg-step-num">1</span>
+    <strong>Flash the firmware</strong>
+    <span class="omg-step-sub">pick a method below</span>
+  </div>
+  <span class="omg-step-arrow">→</span>
+  <div class="omg-step">
+    <span class="omg-step-num">2</span>
+    <strong>Configure WiFi &amp; MQTT</strong>
+    <span class="omg-step-sub">through the <a href="./portal.html">portal</a></span>
+  </div>
+  <span class="omg-step-arrow">→</span>
+  <div class="omg-step">
+    <span class="omg-step-num">3</span>
+    <strong>Verify</strong>
+    <span class="omg-step-sub">gateway appears on your <a href="../getting-started.html#step-4-check-that-it-works">broker &amp; controller</a></span>
+  </div>
+</div>
+
+## Choose your installation method
+
+<div class="omg-methods">
+  <a class="omg-method" href="./web-install.html">
+    <span class="omg-method-badge">Easiest</span>
+    <h3>1. Web installer</h3>
+    <p><strong>Choose this if</strong> you want the fastest path: flash directly from your browser, nothing to install.</p>
+    <p class="omg-method-req">Needs Chrome, Edge or Opera and a data USB cable. Standard configurations only.</p>
+  </a>
+  <a class="omg-method" href="./binaries.html">
+    <h3>2. Ready-to-go binaries</h3>
+    <p><strong>Choose this if</strong> you prefer a desktop flashing tool (esptool.py, Espressif Flash Download Tool), or web flashing doesn't work for you.</p>
+    <p class="omg-method-req">Same pre-built firmware as the web installer, flashed from your computer.</p>
+  </a>
+  <a class="omg-method" href="./builds.html">
+    <h3>3. Build from source</h3>
+    <p><strong>Choose this if</strong> you need custom pin assignments, module combinations, or credentials embedded at build time.</p>
+    <p class="omg-method-req">Needs <a href="https://platformio.org/">PlatformIO</a>. Full control over the configuration.</p>
+  </a>
+</div>
+
+|                          | Web installer | Binaries | From source |
+|--------------------------|:---:|:---:|:---:|
+| No software to install   | ✅ | ❌ | ❌ |
+| Custom configuration     | ❌ | ❌ | ✅ |
+| Difficulty               | Easiest | Easy | Advanced |
+
+## After flashing: configure your gateway
+
+However you flashed, a freshly installed gateway starts its own WiFi access point (named `OpenMQTTGateway` or starting with `OMG_`). Connect to it and the [configuration portal](portal.md) lets you set your WiFi network, MQTT broker, and optional security settings — no rebuild needed.
+
+If you build from source you can alternatively [embed the network and MQTT settings at build time](builds.md), so the gateway connects automatically on first boot.
+
+## Going further
+
+* [Advanced configuration](advanced-configuration.md) — TLS-secured MQTT connections, certificates, OTA updates.
+* [Home Assistant integration](../integrate/home_assistant.md) — auto-discovery is enabled by default; your gateway and sensors appear automatically.
+* [Gateway configuration](../use/gateway.md) — MQTT topic structure and runtime commands per module.
+
+Stuck? Check the [troubleshooting page](troubleshoot.md), or ask on the [community forum](https://community.openmqttgateway.com).
+
+<style scoped>
+.omg-journey {
+  display: flex;
+  align-items: stretch;
+  gap: 8px;
+  margin: 24px 0;
+  flex-wrap: wrap;
+}
+.omg-step {
+  flex: 1 1 150px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  gap: 4px;
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 12px;
+  padding: 16px 12px;
+}
+.omg-step-num {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  background: var(--vp-c-brand-1);
+  color: var(--vp-c-white, #fff);
+  font-weight: 700;
+  font-size: 14px;
+}
+.omg-step-sub {
+  color: var(--vp-c-text-2);
+  font-size: 13px;
+}
+.omg-step-arrow {
+  align-self: center;
+  color: var(--vp-c-brand-1);
+  font-size: 20px;
+  font-weight: 700;
+}
+.omg-methods {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+  gap: 16px;
+  margin: 16px 0 24px;
+}
+.omg-method {
+  position: relative;
+  display: block;
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 12px;
+  padding: 20px;
+  text-decoration: none !important;
+  color: var(--vp-c-text-1);
+  transition: border-color 0.2s ease, transform 0.2s ease;
+}
+.omg-method:hover {
+  border-color: var(--vp-c-brand-1);
+  transform: translateY(-2px);
+}
+.omg-method h3 {
+  margin: 0 0 8px;
+  font-size: 16px;
+  font-weight: 600;
+  color: var(--vp-c-brand-1);
+}
+.omg-method p {
+  margin: 0 0 8px;
+  font-size: 14px;
+  line-height: 1.5;
+}
+.omg-method-req {
+  color: var(--vp-c-text-2);
+  font-size: 13px !important;
+}
+.omg-method-badge {
+  position: absolute;
+  top: -10px;
+  right: 12px;
+  background: var(--vp-c-brand-1);
+  color: var(--vp-c-white, #fff);
+  border-radius: 10px;
+  padding: 2px 10px;
+  font-size: 12px;
+  font-weight: 600;
+}
+@media (max-width: 640px) {
+  .omg-journey { flex-direction: column; }
+  .omg-step-arrow { transform: rotate(90deg); }
+}
+</style>
diff --git a/docs/upload/portal-api.md b/docs/upload/portal-api.md
new file mode 100644
index 0000000..5a27fb5
--- /dev/null
+++ b/docs/upload/portal-api.md
@@ -0,0 +1,61 @@
+# Configuration portal HTTP API
+
+This page documents the HTTP form fields accepted by the on-device WiFi configuration portal so that companion apps, provisioning scripts, and Home Assistant flows can integrate without reading firmware source.
+
+The portal is implemented on top of [h2zero's WiFiManager fork](https://github.com/h2zero/WiFiManager) and the field declarations live in `main/main.cpp` (see `setup_wifimanager`).
+
+## Endpoint
+
+```
+POST http://<portal-ip>/wifisave
+Content-Type: application/x-www-form-urlencoded
+```
+
+When the portal is active (no saved credentials, or trigger pressed at boot) the device exposes a soft-AP — see [Portal](portal.md) for SSID/password rules.
+
+## Form fields
+
+| Field        | Type             | Source declaration              | Persisted? |
+|--------------|------------------|---------------------------------|------------|
+| `s`          | SSID             | WiFiManager built-in            | yes        |
+| `p`          | WiFi PSK         | WiFiManager built-in            | yes        |
+| `server`     | MQTT host (≤ 64) | `custom_mqtt_server`            | yes, if non-empty |
+| `port`       | MQTT port        | `custom_mqtt_port`              | yes, if non-empty |
+| `user`       | MQTT username    | `custom_mqtt_user`              | yes, if non-empty |
+| `pass`       | MQTT password    | `custom_mqtt_pass`              | yes, if non-empty *and* value differs from the compile-time `MQTT_PASS` sentinel |
+| `secure`     | `0` / `1`        | `custom_mqtt_secure`            | yes (always) |
+| `validate`   | `0` / `1`        | `custom_validate_cert`          | yes (always) |
+| `cert`       | PEM (≤ 4096 B)   | `custom_mqtt_cert`              | yes, if length > `MIN_CERT_LENGTH` |
+| `ota_cert`   | PEM (≤ 4096 B)   | `custom_ota_server_cert`        | yes, if length > `MIN_CERT_LENGTH` |
+| `client_cert`| PEM              | `custom_client_cert` (signed-client builds only) | yes, if length > `MIN_CERT_LENGTH` |
+| `client_key` | PEM              | `custom_client_key`  (signed-client builds only) | yes, if length > `MIN_CERT_LENGTH` |
+| `topic`      | MQTT base topic  | `custom_mqtt_topic`             | yes, if non-empty (trailing `/` added if missing) |
+| `name`       | Gateway name     | `custom_gateway_name`           | yes, if non-empty |
+| `ota`        | OTA / WebUI password | `custom_ota_pass`           | yes, if non-empty |
+
+## Empty-field semantics
+
+Empty `server` / `port` / `user` / `topic` / `name` / `ota` values are **ignored** rather than persisted. This means a partial POST (e.g. WiFi-only) preserves any pre-flashed defaults instead of clearing them. To intentionally clear a field, this portal API does not currently support it — re-flash with new build defaults or use the WebUI.
+
+The `pass` field combines the empty-check with a sentinel guard: the firmware persists the form value only when it is non-empty *and* differs from the compile-time `MQTT_PASS` sentinel. The sentinel branch prevents an unmodified form (which echoes back the default) from overwriting a stored password; the non-empty branch prevents a partial POST from wiping it.
+
+## Response and AP teardown
+
+After processing the POST, WiFiManager returns a small success page and then tears down the soft-AP to attempt joining the configured station network. The teardown happens quickly enough that the TCP socket may be reset before the HTTP response is fully flushed to the client. Companion apps should:
+
+- Treat a connection reset immediately after the POST as a likely-success signal, not a failure.
+- Verify provisioning by checking for the device on the target network or for its first MQTT LWT message rather than relying on the HTTP response.
+
+## Example
+
+```bash
+curl -X POST \
+  --data-urlencode 's=my-ssid' \
+  --data-urlencode 'p=my-psk' \
+  --data-urlencode 'server=192.168.1.10' \
+  --data-urlencode 'port=1883' \
+  --data-urlencode 'name=kitchen-omg' \
+  --data-urlencode 'ota=mySecret123' \
+  --data-urlencode 'topic=home/' \
+  http://192.168.4.1/wifisave
+```
diff --git a/docs/upload/portal.md b/docs/upload/portal.md
index 2e20d6c..d9b3100 100644
--- a/docs/upload/portal.md
+++ b/docs/upload/portal.md
@@ -29,8 +29,6 @@ If the board is connected by ethernet, the Wifi and password can be empty. If yo
 
 * Set your MQTT Server IP or domain name (for Home Assistant you can enter `homeassistant.local` if your server is configured with mDNS)
 * Set your MQTT Server Port (default: 1883)
-* Set the MQTT secure connection box to select whether or not the connection should be secure
-* Copy/paste the MQTT server certificate in the MQTT server cert box (only required if using a secure connection), be sure to include the `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----` markers  
 * Set your MQTT Server username (optional, 64 characters maximum)
 * Set your MQTT Server password (optional, 64 characters maximum)
 * Set your MQTT base topic if you need to change it (you must keep the / at the end) (default: home/, 64 characters maximum)
@@ -39,6 +37,10 @@ If the board is connected by ethernet, the Wifi and password can be empty. If yo
   * Local and remote OTA
   * WebUI login (login:"admin", password: "")
   * WiFi Manager Access Point password after initial config
+* Set the MQTT secure connection box to select whether or not the connection should be secure
+* Set the certificate validation to select wether or not you want to validate the server identity with a certificate
+* Copy/paste the MQTT server certificate in the MQTT server cert box (only required if using a secure connection), be sure to include the `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----` markers  
+* Add your certificates
 * Click on save
 
 ![WiFi manager save](../img/OpenMQTTGateway_Wifi_Manager_save.png)
@@ -59,6 +61,7 @@ You can configure your MQTT server credentials and network configuration before
 ``` ini
 [env:esp32-olimex-gtw-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-gateway
 board_build.partitions = min_spiffs.csv
 lib_deps =
diff --git a/docs/upload/troubleshoot.md b/docs/upload/troubleshoot.md
index 97a31b7..6911009 100644
--- a/docs/upload/troubleshoot.md
+++ b/docs/upload/troubleshoot.md
@@ -1,10 +1,9 @@
 # Troubleshooting
 
 ## Compilation/build error
-This badge [![Build Status](https://github.com/1technophile/OpenMQTTGateway/workflows/Build/badge.svg?branch=master)](https://github.com/1technophile/OpenMQTTGateway/actions?query=branch%3Amaster+workflow%3ABuild) show you the state of the compilation of the master and this one [![Build Status](https://github.com/1technophile/OpenMQTTGateway/workflows/Build/badge.svg?branch=development)](https://github.com/1technophile/OpenMQTTGateway/actions?query=branch%3Adevelopment+workflow%3ABuild) for the development branch.
+This badge [![Build Status](https://github.com/1technophile/OpenMQTTGateway/workflows/Build/badge.svg?branch=development)](https://github.com/1technophile/OpenMQTTGateway/actions?query=branch%3Adevelopment+workflow%3ABuild) show you the state of the compilation of the development branch, from which the releases are made.
 If you see a green badge this means that the code compilation is OK with the configuration given in the `docs/platformio.ini`.
-Check your IDE environment version, boards version, libraries version before submitting an issue or a question.
-Verify especially that the libraries provided into the [release page](https://github.com/1technophile/OpenMQTTGateway/releases) are located into your "sketchbook folder"/libraries if your are using the Arduino IDE.
+Check your environment, boards , libraries before submitting an issue or a question.
 
 ## ESP32 compilation errors related to WiFi
 If you get one or several of the following errors:
@@ -36,26 +35,12 @@ in config_rf.h
 instead of
 `#define RF_RECEIVER_GPIO 0 // D3 on nodemcu`
 
-## Exception seen on serial monitor:
-Hey I got a callback 
-malloc
-memcpy
-7
-Exception (2):
-
-→ You are not using the last update of ESP8266 into board manager, go to your Arduino IDE and update it, should be at least 2.3.0
-
 ## Repetitive MQTT disconnections or/and commands sent to the gateway not taken into account
 Most probably a network issue, don't use a guest network and if going through a firewall check its rules. To put aside gateway issue, try to connect to a local broker on the same network.
 
-## You don't see the messages appearing on your broker but they appears on the serial monitor
-This is due to a too small MQTT packet size, open User_config.h and set:
-`#define mqtt_max_packet_size 1024`
-
-## Your Arduino with w5100 Ethernet shield does not connect to network until you press Reset button
-If you notice that your Arduino with w5100 Ethernet shield does not connect to network until you press its Reset button, but connects fine if you connect the Arduino with a USB cable to a computer/laptop with Arduino IDE running and open Serial Monitor, the problem is most likely the Ethernet shield and/or the power supply you're using.
-According to this [video](https://www.youtube.com/watch?v=9ZBeprOqC3w&feature=youtu.be), w5100 clones sometimes struggle to initialise because the reset pin wasn't held low long enough. The solution is simple - add a 0.1uF (100nF) capacitor between the pins on the reset switch. You can get more details [here](http://forum.arduino.cc/index.php?topic=28175.15).
-But even with this fix your board might not work well with a specific PSU. I would recommend try at least one different one and also try bigger capacitor (some report using 47uF)
+## OMG ignores messages sent to it via MQTT
+This can happen if the messages are too big and exceed the internal buffer size limit.  To fix this, check the size of the message you're sending (in bytes).  Next, open `User_config.h` and set `mqtt_max_payload_size` to be greater than that size, e.g.:
+`#define mqtt_max_payload_size 1024`
 
 ## ESP Continuous restart or strange behaviour:
 This can be due to corruption of the ESP flash memory, try to erase flash and upload OMG on it again.
diff --git a/docs/upload/web-install.md b/docs/upload/web-install.md
index bc9d5b0..56a28d6 100644
--- a/docs/upload/web-install.md
+++ b/docs/upload/web-install.md
@@ -1,39 +1,45 @@
---- 
-pageClass: table-generated-page
+---
+aside: false
 ---
 
 # (Option 1) Upload from the web
 
-[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fdocs.openmqttgateway.com%2Fupload%2Fweb-install.html&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)
+This is the easiest way to install OpenMQTTGateway: no software to download, no development environment.
+
+## Before you flash
+
+* Use a **data** USB cable — many cables are charge-only and the board won't show up with one.
+* Use **Chrome, Edge or Opera** — Firefox and Safari don't support web flashing.
+* Most boards need a **USB serial driver**. Recent operating systems often include it; if your board doesn't appear in the port list, see below.
+
+::: details My board doesn't show up in the port list
+1. Try another USB cable (data, not charge-only) and another USB port.
+2. Install the driver matching your board's USB chip (check the board's product page if unsure):
+   * **CP210x** (Silicon Labs): [driver download](https://www.silabs.com/developer-tools/usb-to-uart-bridge-vcp-drivers)
+   * **CH340 / CH341** (WCH): [driver download](https://www.wch-ic.com/downloads/CH341SER_ZIP.html)
+   * **CH9102** (WCH): [macOS driver](https://github.com/WCHSoftGroup/ch34xser_macos), [Windows driver](https://www.wch-ic.com/downloads/CH343SER_ZIP.html)
+3. On macOS, complete the driver installation by confirming it in the **Security** section of **System Preferences**, then restart. For a LilyGo LoRa32 V2.1 board, the correct port to select is `/dev/cu.wchusbserialXXXXXXXXXXX`.
+4. Some boards need the **BOOT** button held down while plugging in the cable to enter flash mode.
+5. On Linux, add your user to the `dialout` group (`sudo usermod -a -G dialout $USER`) and log in again.
+:::
+
+## Select your firmware
+To upload firmware to your ESP device directly from this page, first connect your ESP device to a USB port on your computer. Then, choose the appropriate firmware from the available options. Next, click the **Connect** button and select the USB port where your ESP is plugged in. Wait for the upload process to finish. After the upload completes, you can set up your [WiFi and MQTT credentials](portal.md).
+
+<BoardEnvironmentTable 
+      boardsUrl="/boards-info.json"
+      selectorPath="/upload/board-selector.html"
+/>
+
+<small style="color: var(--vp-c-text-3);">Board photos courtesy of their manufacturers. ESP32 Feather photo © <a href="https://www.adafruit.com/product/3405">Adafruit Industries</a>, <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a>.</small>
+
 
 ::: tip Running on a tablet or phone
 If you want to use the BLE decoding capabilities of OpenMQTTGateway with a tablet or smartphone you can use [Theengs App](https://app.theengs.io/).
 :::
 
-::: warning Note
-If you are on macOS and have a LilyGo LoRa32 V2.1 board, make sure you have the [correct driver for the CH9102 Serial Chip](https://github.com/WCHSoftGroup/ch34xser_macos) installed and selected in the popup when initiating the web install.
-To finalise the driver installation don't forget the confirmation in the **Security** section of **System Preferences** after the restart.
-The correct driver to then select in the popup of this web install is
-`/dev/cu.wchusbserialXXXXXXXXXXX`
-:::
 
-You can upload the firmware to your ESP device directly from here.
-1. Plug in your ESP to a USB port.
-2. Select the firmware in the box below.
-3. Click the install button and choose the port that the ESP is connected to.
-4. Wait until the process is complete.
-5. Once completed you can configure your [WiFi and MQTT credentials](portal.md)
+## Next step
 
-<web-uploader/>
+Once the upload is complete, connect the gateway to your WiFi network and MQTT broker through the [configuration portal](portal.md).
 
-Upload powered by [ESP Web Tools](https://esphome.github.io/esp-web-tools/)
-
-## Using OpenMQTTGateway ?
-Support open-source development through sponsorship and gain exclusive access to our private forum. Your questions, issues, and feature requests will receive priority attention, plus you'll gain insider access to our roadmap.
-
-<div style="text-align: center;">
-    <iframe src="https://github.com/sponsors/theengs/button" title="Sponsor Theengs" height="32" width="228" style="border: 0; border-radius: 6px;"></iframe>
-</div>
-
-## Environments characteristics
-The auto-generated table below describes the libraries and the modules of each board configuration.
diff --git a/docs/use/ble.md b/docs/use/ble.md
index 15776a1..c3e6670 100644
--- a/docs/use/ble.md
+++ b/docs/use/ble.md
@@ -4,29 +4,46 @@ description: Versatile Bluetooth gateway that scans and decodes data from variou
 ---
 # Bluetooth gateway
 
-The manufacturer agnostic Bluetooth Low Energy (BLE) gateway acts as a powerful BLE scanner and decoder of [Bluetooth devices](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/), allowing you to visualize and analyze information from a wide range of sensors. 
+The manufacturer agnostic Bluetooth Low Energy (BLE) gateway acts as a powerful BLE scanner and decoder of [Bluetooth devices](https://decoder.theengs.io/devices/devices.html), allowing you to visualize and analyze information from a wide range of sensors. 
 It can also act as a device tracker and presence detection gateway by receiving nearby BLE devices and trackers.
 
 Data are transmitted to an MQTT broker, where it can be used to trigger events and rules, as well as displayed, stored and processed in your favorite controller (Home Assistant, OpenHAB, Jeedom, Domoticz, ioBroker or any MQTT compatible software).
 
 With the ability to monitor and analyze data such as temperature, humidity, moisture, luminance, weight, pressure, fine particles, and more, the BLE gateway provides a flexible and customizable solution for integrating BLE technology into your control and monitoring systems.
 
-![BLE sensors and devices](../img/OpenMQTTGateway-sensors-ble.png)
+<div style="text-align: center;">
+    <img src="../img/OpenMQTTGateway-sensors-ble.png" alt="BLE sensors and devices" style="max-width: 100%; height: auto;">
+</div>
 
-## The first plug-and-play OpenMQTTGateway BLE gateway and Smart Plug!
+## Products powered by OpenMQTTGateway
 
-[Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption) is available flashed with OpenMQTTGateway, and brings the functions below:
-* BLE to MQTT gateway, tens of [Bluetooth devices](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/) supported thanks to Theengs Decoder library. The plug uses an ESP32 acting as a BLE to Wifi gateway to scan, decode and forward the data of the nearby sensors,
+### Theengs Bridge, BLE gateway with external antenna
+
+[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [100 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity.
+
+<div style="text-align: center;">
+    <a href="https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna" target="_blank" rel="noopener noreferrer">
+    <img src="../img/Theengs-Bridge-ble-gateway.png" alt="Theengs bridge view" style="max-width: 100%; height: auto;">
+    </a>
+</div>
+
+### Theengs Plug, BLE gateway and Smart Plug
+
+[Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption) brings the following features:
+* BLE to MQTT gateway, tens of [Bluetooth devices](https://decoder.theengs.io/devices/devices.html) supported thanks to Theengs Decoder library. The plug uses an ESP32 acting as a BLE to Wifi gateway to scan, decode and forward the data of the nearby sensors,
 * Smart plug that can be controlled remotely,
 * Energy consumption monitoring,
 * Device tracker,
 * Presence detection (beta),
 * Local connectivity first.
 
-[![Theengs plug view](../img/Theengs-Plug-OpenMQTTGateway.png)](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
+<div style="text-align: center;">
+    <a href="https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption" target="_blank" rel="noopener noreferrer">
+    <img src="../img/Theengs-Plug-OpenMQTTGateway.png" alt="Theengs plug view" style="max-width: 100%; height: auto;">
+    </a>
+</div>
 
-Support the project by purchasing the [Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
-The plug is available in North America only, other regions are planned.
+Support the project by purchasing the [Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) or the [Theengs plug](https://shop.theengs.io/products/theengs-plug-smart-plug-ble-gateway-and-energy-consumption)
 
 ## Disable or enable the BLE gateway (default: true, available with HA discovery)
 
@@ -55,17 +72,15 @@ Once the data has been transmitted to the MQTT broker, it can be easily integrat
 
 ![Home Assistant chart](../img/OpenMQTTGateway-home-assistant-chart.png)
 
-Examples of compatible sensors among [our list](https://decoder.theengs.io/devices/devices_by_brand.html: Mi Flora, Mi jia, LYWDS02, LYWSD03MMC, ClearGrass, Mi scale, iBBQ, TPMS
+Examples of compatible sensors among [our list](https://decoder.theengs.io/devices/devices_by_brand.html): Mi Flora, Mi jia, LYWDS02, LYWSD03MMC, ClearGrass, Mi scale, iBBQ, TPMS
 
 ## Receiving signals from BLE devices for Device Tracker detection
-The gateway will detect BLE trackers from Tile, Nut, TagIt and iTag, as well as other devices with additional properties decoding like Mi Band, Amazfit, RuuviTag and others indicated as Device Trackers in the [compatible BLE devices list](https://decoder.theengs.io/devices/devices.html), and automatically create a device tracker entity following the Home Assistant discovery convention (if auto discovery is activated).
+The gateway will detect BLE trackers from Tile, Nut, TagIt, iTAG, Gigaset G-Tag, TicWatch GTH (Pro), Teltonika FMT100 vehicle tracker and Bosch Nyon eBike computers, as well as other devices with additional properties decoding like Mi Band, Amazfit, RuuviTag and others indicated as Device Trackers in the [compatible BLE devices list](https://decoder.theengs.io/devices/devices.html), and automatically create a device tracker entity following the Home Assistant discovery convention (if auto discovery is activated).
 
 The devicen tracker entity created can be attached to a person to leverage presence detection. The `away` or `not home` state is triggered if the BLE tracker is not detected during the timer defined by `presenceawaytimer`.
  
 ![Away home Home assistant view](../img/OpenMQTTGateway-BLE-tracker-Home-Assistant.png)
 
-If you have multiple gateways, your BLE trackers may not be detected temporary by one gateway but still by the others. In this case you will see the tracker appears offline briefly and online again once it is detected by the others gateways.
-
 By default `presenceawaytimer` is set to 120s, you can change it from the slider in your controller or with the following command (ms)
 
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"presenceawaytimer":66000}'`
@@ -109,8 +124,6 @@ A white list is a list of MAC addresses permitted to be published by OMG
 to set white list
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"white-list":["01:23:14:55:16:15","4C:65:77:88:9C:79","4C:65:A6:66:3C:79"]}'`
 
-Note: if you want to filter (white or black list) on BLE sensors that are auto discovered, you need to wait for the discovery before applying the white or black list, or temporarily disable it:
-
 to temporarily disable white/black list
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"ignoreWBlist":true}'`
 
@@ -120,12 +133,13 @@ to enable white/black list back
 ::: tip
 So as to keep your white/black list persistent you can publish it with the retain option of MQTT (-r with mosquitto_pub or retain check box of MQTT Explorer)
 `mosquitto_pub -r -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"white-list":["01:23:14:55:16:15","4C:65:77:88:9C:79","4C:65:A6:66:3C:79"]}'`
+
+**NOTE**: Only when sending a white/black list should the retain option be set. All other commands to any OpenMQTTGateway gateway **must not** have the retain option set. To persist such other command settings, read [the following section](https://docs.openmqttgateway.com/use/ble.html#store-ble-configuration-into-the-gateway)
 :::
 
 ## Setting the time between BLE scans and force a scan (available with HA discovery)
 
-If you want to change the time between readings you can change the interval by MQTT.
-For example, if you want the BLE to scan every 66 seconds:
+Example if you want the BLE to scan every 66 seconds:
 
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"interval":66000}'`
 
@@ -133,6 +147,8 @@ you can also force a scan to be done by the following command:
 
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"interval":0}'`
 
+Changing the interval between scans will deactivate adaptive scanning.
+
 ::: tip
 With Home Assistant, this command is directly available through MQTT auto discovery as a switch into the HASS OpenMQTTGateway device entities list.
 :::
@@ -141,9 +157,9 @@ Once the forced scan has completed, the previous scan interval value will be res
 
 The default value `TimeBtwRead` is set into config_BT.h or into your .ini file for platformio users.
 
-If you want to scan continuously for BLE devices, for example for beacon location you can set the interval to 1ms:
+If you want to scan continuously for BLE devices, for example for beacon location you can set the interval to 100ms:
 
-`mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"interval":1}'`
+`mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"interval":100}'`
 
 In this case you should deactivate the BLE connection mechanism to avoid concurrency between scan and connections (see chapter below, bleconnect).
 
@@ -191,7 +207,7 @@ An overview with background information to better understand the different setti
 
 **Active scanning:** With this scanning mode the gateway sends out requests for sensor broadcasts first, before then picking up the broadcast advertisement data. Some devices require this request before they send out all data in their broadcasts. The interval for this active scanning with request first is set by [{"intervalacts":300000}](#setting-the-time-between-active-scanning)
 
-If adaptive scanning is set to false and you want to manually set these intervals, setting [Publishing advertisement and advanced data](#advanced-publishing-advertisement-and-advanced-data-default-false) to true will show you additional data about which of your devices require active scanning and/or continuous scanning, so that you can tune these setting to your devices and your individual requirements of their data.
+Setting [Publishing advertisement and advanced data](#advanced-publishing-advertisement-and-advanced-data-default-false) to true will show you additional data about which of your devices require active scanning and/or continuous scanning, so that you can tune these setting to your devices and your individual requirements of their data.
 
 **"cont":true** - the device requires continuous scanning. If passive ({"interval":100}) or active ({"intervalacts":100}) depends on the additional device specification.
 
@@ -201,10 +217,16 @@ If adaptive scanning is set to false and you want to manually set these interval
 
 If you have passive scanning activated, but also have some devices which require active scanning, this defines the time interval between two intermittent active scans.
 
-If you want to change the time between active scans you can change it by MQTT. For setting the active scan interval time to every 5 minutes:
+Example for setting the active scan interval time to every 5 minutes:
 
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"intervalacts":300000}'`
 
+Changing the active scan interval will deactivate adaptive scanning.
+
+::: warning Note
+The active scan interval `intervalacts` can only bet set equal to or higher than the passive scan interval `interval`, as any lower value would not make any sense.
+:::
+
 ## Setting the duration of a scan (available with HA discovery)
 
 If you want to change the default duration of each scan cycle to 5 seconds
@@ -293,6 +315,11 @@ By the way, if you want to load the default built-in configuration (on any board
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{"init":true}'`
 Note that it will not change the stored configuration, `erase` or `save` is still needed to overwrite the saved configuration.
 
+## Controlling devices
+::: tip
+To control devices reliably, set the interval between scans to at least 5 seconds and the scan duration to 1 second to ensure commands are successfully transmitted to your devices.
+:::
+
 ## Read/write BLE characteristics over MQTT
 
 The gateway can read and write BLE characteristics from devices and provide the results in an MQTT message.  
@@ -348,10 +375,16 @@ Response:
 ::: tip
 The `ttl` parameter is the number of attempts to connect (defaults to 1), which occur after the BLE scan completes.  
 `value_type` can be one of: STRING, HEX, INT, FLOAT. Default is STRING if omitted in the message.
+:::
 
 ## SwitchBot Bot control (available with HA discovery)
 
-SwitchBot Bot devices are automatically discovered and available as a device in the configuration menu of home assistant.
+SwitchBot Bot devices are automatically discovered and available as a device in the Home Assistant Settings menu. The following commands are supported:
+* Press
+* On
+* Off
+* Up
+* Down
 
 ::: tip
 If the SwitchBot mode is changed the ESP32 must be restarted. 
@@ -359,13 +392,51 @@ If the SwitchBot mode is changed the ESP32 must be restarted.
 
 The device can also be controlled over MQTT with a simplified BLE write command.
 
-### Example command to set the SwitchBot state to ON:
+### Set the SwitchBot Bot state to ON:
 ```
 mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
-  "SBS1":"on",
-  "mac":"AA:BB:CC:DD:EE:FF"
+  "model_id":"X1",
+  "cmd":"on",
+  "id":"AA:BB:CC:DD:EE:FF"
 }'
 ```
+
+### Set the SwitchBot Bot state to OFF:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"X1",
+  "cmd":"off",
+  "id":"AA:BB:CC:DD:EE:FF"
+}'
+```
+
+### Set the SwitchBot Bot to PRESS:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"X1",
+  "cmd":"press",
+  "id":"AA:BB:CC:DD:EE:FF"
+}'
+```
+
+### Set the SwitchBot Bot to go UP:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"X1",
+  "cmd":"up",
+  "id":"AA:BB:CC:DD:EE:FF"
+}'
+```
+
+### Set the SwitchBot Bot to go DOWN:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"X1",
+  "cmd":"down",
+  "id":"AA:BB:CC:DD:EE:FF"
+}'
+```
+
 Response (assuming success):
 ```
 {
@@ -374,6 +445,123 @@ Response (assuming success):
 }
 ```
 
+## SwitchBot Blind Tilt control (available with HA discovery)
+
+SwitchBot Blind Tilt devices are automatically discovered and available as a device in the settings Home Assistant Settings menu. The following commands are supported:
+* Open
+* Close down
+* Set a percentage
+
+The device can also be controlled over MQTT with a simplified BLE write command.
+
+### Set the SwitchBot Blind Tilt state to OPEN:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W270160X",
+  "tilt":"open",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Blind Tilt state to CLOSE_DOWN:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W270160X",
+  "tilt":"close_down",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Blind Tilt state to CLOSE_UP:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W270160X",
+  "tilt":"close_up",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Blind Tilt state to a percentage (0-100):
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W270160X",
+  "tilt":55,
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Blind Tilt to Stop:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W270160X",
+  "tilt":"stop",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Response (assuming success):
+The Switchbot Blind Tilt response :
+```
+{
+  "id":"AA:BB:CC:DD:EE:FF",
+  "tilt":55,
+  "open":90,
+  "direction":"up"
+}
+```
+
+## SwitchBot Curtain (2/3) control (available with HA discovery)
+
+SwitchBot Curtain (2/3) devices are automatically discovered and available as a device in the settings Home Assistant Settings menu. The following commands are supported:
+* Set a percentage
+
+The device can also be controlled over MQTT with a simplified BLE write command.
+
+### Set the SwitchBot Curtain state to OPEN:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W070160X",
+  "position":"open",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Curtain state to CLOSE:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W070160X",
+  "position":"close",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Curtain to a percentage (0-100):
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W070160X",
+  "position":55,
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Set the SwitchBot Curtain to Stop:
+```
+mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT -m '{
+  "model_id":"W070160X",
+  "position":"stop",
+  "id":"AA:BB:CC:DD:EE:FF"
+  }'
+```
+
+### Response (assuming success):
+The Switchbot Curtain response :
+```
+{
+  "id":"AA:BB:CC:DD:EE:FF",
+  "position":55,
+}
+```
+
 ## ADVANCED: Setting up an external decoder
 
 This advanced option is used to publish raw radio frames on a specific topic to be decoded by an external decoder instead of the integrated one.
diff --git a/docs/use/boards.md b/docs/use/boards.md
index 9f226dd..8563786 100644
--- a/docs/use/boards.md
+++ b/docs/use/boards.md
@@ -21,33 +21,33 @@ This can be achieved with the following macro, `WifiGMode` defined true and `Wif
 Since the WiFi protocol is persisted in the flash of the ESP you have to run at least once with `WiFiGMode` defined **false** to get Band N back.
 
 ### Low power mode for ESP32
-OpenMQTTGateway support a low power mode for ESP32, this mode is available per default on boards with batteries. The other boards needs to have the macro `DEFAULT_LOW_POWER_MODE` defined at 0, 1 or 2 to use it. More information about the modes is available into User_config.h.
+OpenMQTTGateway support a low power mode for ESP32, the boards needs to have the macro `DEFAULT_LOW_POWER_MODE` defined at `ALWAYS_ON`, `INTERVAL` or `ACTION` to use it. More information about the modes is available into User_config.h.
 
 When available this mode can be set by MQTT:
 
 * Normal mode (per default)
 
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoBT/config" -m '{"lowpowermode":0}'`
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"powermode":0, "save":true}'`
 
-* Low Power mode
+* Low Power mode wake up from interval defined by DEEP_SLEEP_IN_US and pins defined by ESP32_EXT0_WAKE_PIN and/or ESP32_EXT1_WAKE_PIN
 
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoBT/config" -m '{"lowpowermode":2}'`
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"powermode":1, "save":true}'`
 
-The interval between the ESP32 wake up is defined at build time by the macro `TimeBtwRead`, a change of the `interval` through MQTT will not impact the time between wake up.
+* Low Power mode wake up from pins defined by ESP32_EXT0_WAKE_PIN and/or ESP32_EXT1_WAKE_PIN
+
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"powermode":2, "save":true}'`
 
 ::: tip
-When coming back from mode 2 to mode 0 you may publish the command with a retain flag so as to enable the gateway to retrieve it when reconnecting.
 A low power mode switch is automatically created by discovery with Home Assistant, you may experience a delay between the command and the state update due to the fact that the update will be received and acknowledged when the device woke up.
-In low power mode you should use ESPWifiManualSetup so as to rely on the credentials entered into User_config.h.
-So as to do that uncomment the line below in User_config.h
-``` c
-//#  define ESPWifiManualSetup true
-```
-For platformio and example of environment is available into [prod_env.ini.example](https://github.com/1technophile/OpenMQTTGateway/blob/development/prod_env.ini.example)
+If you are publishing the state change while the device is asleep use the retain flag. This way the device will retrieve the powermode command at wake up.
 :::
 
+The default sleep time is defined by the macro `DEEP_SLEEP_IN_US` (default 60s)
+
+We can also use an external sensor state to wake-up the ESP, this is defined by macro `ESP32_EXT0_WAKE_PIN/ESP32_EXT1_WAKE_PIN`, the level is defined by the macro `ESP32_EXT0_WAKE_PIN_STATE/ESP32_EXT0_WAKE_PIN_STATE` (default to HIGH).
+
 ::: warning
-If you change the default low power mode in config_BT.h to 2 and your credential are not set or not correct, the ESP32 will not connect to the broker and the only way to change the low power mode will be a new erase/upload.
+If you change the default low power mode to INTERVAL or ACTION and your credential are not set or not correct, the ESP32 will not connect to the broker and the only way to change the low power mode will be a new erase/upload.
 :::
 
 ## M5StickC, M5StickC Plus or M5Stack
@@ -73,41 +73,3 @@ You can also change it by MQTT. For example if you want to set to LCD
 you can also revert it to the serial monitor:
 
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoM5/config -m '{"log-display":false}'`
-
-### Low power mode for M5 boards
-OpenMQTTGateway support a low power mode for ESP32, this mode can be set by MQTT or a button on M5 boards:
-
-* Normal mode (per default), screen ON
-
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoBT/config" -m '{"lowpowermode":0}'`
-
-* Low Power mode, screen ON when processing only
-
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoBT/config" -m '{"lowpowermode":1}'`
-
-* Low Power mode, screen OFF, LED ON when processing on M5StickC or M5stickC Plus
-
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoBT/config" -m '{"lowpowermode":2}'`
-
-The low power mode can be changed also with a push to button B when the board is processing (top button on M5stickC, M5stickC Plus and middle button of M5stack).
-If you are already in low power mode 1 or 2 with M5Stack you can wake up the board by pressing the red button.
-
-### Low power mode (deepSleep) for ESP8266 & ESP32 boards
-In certain use cases where power is severely limited you can use the ESP8266 or ESP32 deep sleep capability.
-
-* e.g. measuring a pool temperature every 5 minutes using an ESP8266 and DS18B20 probe where the ESP8266 is powered by very limited battery backed solar power.
-* e.g. as a water/leak detector which wake-up based on sensor state an ESP32 and C-37 YL-83 HM-RD sensor where the ESP32 is powered by very limited battery power.
-
-During deep sleep everything is off and (almost) all execution state is lost. 
-
-Consumption is about 20 µA on an ESP8266.
-
-Use this when you want the device to sleep for minutes,  hours woken by external sensor state.
-
-You only have to define the macro `DEEP_SLEEP_IN_US` with the number of microseconds, this works for both ESP8266 and ESP32.
-
-For an ESP8266 a hardware jumper is required connecting RST to a GPIO (not to CH_PD) defined by the macro `ESP8266_DEEP_SLEEP_WAKE_PIN` and defaulted to D0.
-
-On an ESP32 we can also use an external sensor state to wake-up the ESP and this is defined by macro `ESP32_EXT0_WAKE_PIN` and which state it must toggle to by macro `ESP32_EXT0_WAKE_PIN_STATE` defaulted to 1 (high).
-
-And the sensor code must set variable `ready_to_sleep` to true after publishing the measurement to MQTT and the main loop will then enter deep sleep.
diff --git a/docs/use/displays.md b/docs/use/displays.md
index e382050..572a565 100644
--- a/docs/use/displays.md
+++ b/docs/use/displays.md
@@ -20,6 +20,20 @@ MQTT Display ON command:
 
 `mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoSSD1306/config -m {"onstate":true}`
 
+#### Usage of a touch GPIO display blanking
+
+Support can be enabled to use a GPIO pin as a simple touch sensor to enable the display.  When enabled, the display will blank after 30 seconds, and when GPIO 2 is touched, the display will enable for 30 seconds.  For testing a wire was connected to the GPIO pin.
+
+This can be enabled with the compiler directive `-DDISPLAY_BLANKING=true`
+
+Blanking Compiler Directives
+
+| Directive | Default | Description |
+| - | - | - |
+| DISPLAY_BLANKING | false | Enables touch based display blanking |
+| DISPLAY_BLANKING_TOUCH_GPIO | 2 | GPIO pin to use the touch.  Must be a touch supported GPIO pin |
+| DISPLAY_BLANKING_START | 30 | Seconds to wait before disabling the display |
+
 ### Brightness
 The display brightness can be set between 0-100%.
 
diff --git a/docs/use/gateway.md b/docs/use/gateway.md
index 8f5abcb..bf30579 100644
--- a/docs/use/gateway.md
+++ b/docs/use/gateway.md
@@ -32,20 +32,12 @@ If you want the settings to be kept upon gateway restart, you can save the state
 `mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"disc":false, "save":true}'`
 
 ::: tip
-Auto discovery is enabled by default on release binaries and platformio (except for UNO). With Arduino IDE, please read the [advanced configuration section](../upload/advanced-configuration#auto-discovery) of the documentation.
+Auto discovery is enabled by default on release binaries and platformio.
 :::
 
-## AutoDiscovery compatible with OpenHAB (default: false)
-OpenHAB does not support the key `is_defined` in the json template, to remove it at runtime and make the auto discovery compatible you can use the following command with a retain flag.
+## Activate Offline mode
 
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"ohdisc":true}'`
-
-If you want the settings to be kept upon gateway restart, you can save the state by adding `"save":true` (ESP32 only).
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"ohdisc":true, "save":true}'`
-
-::: tip
-This command can also be used with other controllers that does not support the is_defined key.
-:::
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"offline":true,"save":true}'`
 
 ## Change the WiFi credentials
 
@@ -69,30 +61,28 @@ mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
   "mqtt_pass": "password",
   "mqtt_server": "host",
   "mqtt_port": "port",
-  "mqtt_secure": "false"
+  "mqtt_validate": false,
+  "mqtt_secure": false
 }'
 ```
+
 ::: tip INFO
 By default this function is not available on the pre built binary of RFBridge, in order to have less code size and enable to have OTA update working properly. So as to enable it remove from the rf bridge env:
 ```
 build_flags = '-UMQTTsetMQTT'
 ``` 
-Arduino boards does not have this function per default also, to add it:
-```
-build_flags = '-DMQTTsetMQTT'
-``` 
 :::
 
 ::: tip
-Server, port, and secure_flag are only required if changing connection to another broker.  
 If the new connection fails the gateway will fallback to the previous connection.
 :::
 
-## Change the MQTT main topic and or gateway name
+## Change the MQTT main topic, discovery prefix, and or gateway name
 ```
 mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
 '{
   "mqtt_topic": "topic/",
+  "discovery_prefix": "prefix",
   "gateway_name": "name"
 }'
 ```
@@ -100,13 +90,13 @@ mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
 This will change the subscribed and published mqtt_topic/gateway_name that the gateway uses. No parameters are mandatory, the current topic or gateway name will be used if not supplied.
 :::
 
-## Switching brokers and using self signed and client certificates
+## Switching brokers and using signed and client certificates
 
-In the `user_config.h` file it is possible to specify multiple MQTT brokers and client certificates. These are commonly self signed and are supported by defining `MQTT_SECURE_SELF_SIGNED` as true or 1.  
+In the `user_config.h` file it is possible to specify multiple MQTT brokers and client certificates.
 Additionally, support for multiple brokers and client certificates has been added. To use this, it is required that the server certificate, client certificate, and client key are provided as their own constant string value as demonstrated in the file.  
-To add more than one broker and switch between them it is necessary to provide all of the relevant certificates/keys and add their respective variable names in the `certs_array` structure, as shown in `user_config.h`, and changing the array size to the number of different connections -1.  
+To add more than one broker and switch between them it is necessary to provide all of the relevant certificates/keys and add their respective variable names in the `cnt_parameters_array` structure, as shown in `user_config.h`..  
 
-To switch between these servers with an MQTT command message, the format is as follows:
+To switch between these connections with an MQTT command message, the format is as follows:
 ```
 mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
 '{
@@ -114,14 +104,93 @@ mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
   "mqtt_pass": "password",
   "mqtt_server": "host",
   "mqtt_port": "port",
-  "mqtt_secure": "true",
-  "mqtt_cert_index":0
+  "mqtt_secure": true,
+  "mqtt_validate": true,
+  "cnt_index":1,
+  "save_cnt": true
  }'
  ```
 ::: tip
-The `mqtt_cert_index` value corresponds to the 0 to X index of the `certs_array` in `user_config.h`.
+The `cnt_index` value corresponds to the 0 to 2 index of the `cnt_parameters_array` in `user_config.h`.
+0 being the default index, containing the onboarding parameters.
 :::
 
+To read the connection parameters:
+```
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
+'{
+  "cnt_index":1,
+  "read_cnt": true
+ }'
+ ```
+
+ To test a connection change without saving:
+ ```
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
+'{
+  "cnt_index":1,
+  "test_cnt": true
+ }'
+ ```
+
+::: tip
+If the client can't connect to the MQTT broker corresponding to the current `cnt_index`, it will increment the index to the next valid connection set and restart with it.
+:::
+
+## Saving/Loading connection parameters/certificates at runtime
+This chapter details the process for managing certificates/connections parameters used for secure MQTT communication with OpenMQTTGateway
+
+### Storing and Loading Certificates
+* Flash Memory Storage:
+Certificates can be saved to the flash memory using specific indices. Valid indices for storing certificates are 1 and 2, as 0 is reserved for the default certificate.
+* RAM Memory Loading:
+Certificates can be loaded from RAM, where valid indices range from 0 to 2. The device publishes a hash of the certificate to the broker to verify its identity. If the connection using the current certificate fails, the device will revert to the previous certificate.
+
+### Use Case: Changing a Group of Certificates
+When updating certificates, follow these steps to ensure that the new certificates are correctly loaded and used:
+
+1. Push Certificates via MQTT:
+Send the new certificates one by one through MQTT, using indices 1 or 2. Replace newline characters (\n) in the certificates with spaces.
+```json
+{
+  "cnt_index": 1,
+  "mqtt_server_cert": "-----BEGIN CERTIFICATE----- MIIDQTCC----END CERTIFICATE-----"
+}
+```
+
+Accepted certificates are:
+* `mqtt_server_cert`
+* `mqtt_client_cert`
+* `mqtt_client_key`
+* `ota_server_cert`
+
+2. Verify Certificates in RAM:
+After pushing the certificates, verify that they have been correctly loaded into RAM.
+```json
+{
+  "cnt_index": 1,
+  "read_cnt": true
+}
+```
+
+3. Test and Save Certificates:
+Once verification is complete, test the connection using the new certificates. If the connection is successful, send the command to save the certificates to flash.
+```json
+{
+  "cnt_index": 1,
+  "save_cnt": true
+}
+```
+
+4. Broker Connection:
+The broker will attempt to use the newly received certificates for the connection.
+
+5. Successful Connection Handling:
+If the connection is successful, the certificates are permanently stored in the flash memory at the specified index.
+
+6. Handling Connection Failures:
+If the connection fails, the device will revert to the previously used certificate index, and the new certificates will not be saved.
+
 # Firmware update from MQTT (ESP only)
 
 When the gateway used is from a standard ESP32 environment [listed and defined here](https://github.com/1technophile/OpenMQTTGateway/blob/development/environments.ini), it can be updated through a simple MQTT command:
@@ -148,7 +217,7 @@ OpenMQTTGateway checks at start and every hour if an update is available.
 
 Alternatively if you want to choose the update URL you can use the command below (ESP32 and ESP8266):
 
-Without certificate, in this case we will use the root certificate defined in User_config.h
+Without certificate, in this case the gateway will use the ota_server_cert certificate defined in default_ota_cert.h
 ```
 mosquitto_pub -t "home/OpenMQTTGateway_ESP32_BLE/commands/MQTTtoSYS/firmware_update" -m '{
   "version": "test",
@@ -157,39 +226,29 @@ mosquitto_pub -t "home/OpenMQTTGateway_ESP32_BLE/commands/MQTTtoSYS/firmware_upd
 }'
 ```
 
-With certificate:
+With certificate (replace the \n in the certificate by spaces to publish it easily):
 ```
 mosquitto_pub -t "home/OpenMQTTGateway_ESP32_BLE/commands/MQTTtoSYS/firmware_update" -m '{
   "version": "test",
   "password": "OTAPASSWORD",
   "url": "https://github.com/1technophile/OpenMQTTGateway/releases/download/v0.9.12/esp32dev-ble-firmware.bin",
-  "server_cert": "-----BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----"}'
+  "ota_server_cert": "-----BEGIN CERTIFICATE----- MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= -----END CERTIFICATE-----"}'
 ```
 
-A bash script is available [here](ota_command_cert.zip) to simplify the use of the `server_cert` parameter.  
+A bash script is available [here also](ota_command_cert.zip) to simplify the use of the `server_cert` parameter.  
 
 
+Alternatively the OTA certificate can also be saved with the cnt_index for future use:
+
+```
+mosquitto_pub -t "home/OpenMQTTGateway_ESP32_BLE/commands/MQTTtoSYS/config" -m '{
+  "cnt_index": 1,
+  "save_cnt":true,
+  "ota_server_cert": "-----BEGIN CERTIFICATE----- MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= -----END CERTIFICATE-----"
+}'
+```
+The other connection parameters corresponding to the index need to be valid for the save function to work. This command will switch to connection parameters of index 1.
+
 To enable this functionality, `MQTT_HTTPS_FW_UPDATE` will need to be defined or the line that defines in in user_config.h will need to be uncommented.
 
 ::: tip
@@ -202,23 +261,124 @@ The `server_cert` parameter is optional. If the update server has changed or cer
 The pre-built binaries for **rfbridge** and **avatto-bakeey-ir** have the above WiFi and MQTT broker credentials and the Firmware update via MQTT options disabled. This is due to the restricted available flash, so as to still be able to use OTA firmware updates for these boards.
 :::
 
+# Communication layers
+
+## MQTT
+OpenMQTTGateway uses per default MQTT on top of Ethernet or WiFi for communicating (default: true).
+The MQTT communication can be deactivated with the following command:
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"mqtt":false}'`
+Once activated the MQTT API is no longer accessible
+
+## Serial
+Added to MQTT, OpenMQTTGateway cans use Serial to transmit or receive json data (default: false):
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"serial":true}'`
+
+The build need to have the following macro:
+```
+  '-DZgatewaySERIAL="SERIAL"'
+```
+
+An example scenario is a slave offline ESP32 dedicated to RF decoding connected to another online ESP32 through Serial.
+
+# Indicators
+
 ## Change the LED indicator brightness
 
 Minimum: 0, Maximum: 255, Default defined by DEFAULT_ADJ_BRIGHTNESS
 
 `mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"brightness":200}'`
 
-# State LED usage
+## Understanding LED Indicators in OpenMQTTGateway
+With boards having one or several RGB Led, OpenMQTTGateway uses them to provide visual feedback about its current state. This guide will help you interpret these LED signals to understand what's happening with your gateway.
 
-The gateway can support up to 3 LED to display its operating state:
-* LED_INFO 
-switched ON when network and MQTT connection are OK
-5s ON, 5s OFF when MQTT is disconnected
-2s ON, 2s OFF when NETWORK is disconnected
+## LED Color Guide
+OpenMQTTGateway uses a variety of colors to indicate different states:
 
-* LED_RECEIVE
-Blink for `TimeLedON` 1s when the gateway receive a signal from one of its module so as to send to MQTT
+Green (0x00FF00): Indicates normal operation or successful connections
+Blue (0x0000FF): Shows processing or offline status
+Orange (0xFFA500): Indicates waiting states or minor issues
+Yellow (0xFFFF00): Used during the onboarding process
+Red (0xFF0000): Signals an error state
+Magenta (0xFF00FF): Indicates local Over-The-Air (OTA) updates
+Purple (0x8000FF): Shows remote OTA updates are in progress
 
-* LED_SEND
-Blink for `TimeLedON` 1s when the gateway send a signal with one of its module from an MQTT command
+## Understanding Gateway States
+Here's what different LED behaviors mean:
 
+### Power On
+
+Color: Green
+Behavior: Solid light
+Meaning: The gateway is powered and operational
+
+### Processing
+
+Color: Blue
+Behavior: Blinking (3 times)
+Meaning: The gateway is processing data
+
+### Waiting for Onboarding
+
+Color: Orange
+Behavior: Solid light
+Meaning: The gateway is ready to be set up
+
+### Onboarding in Progress
+
+Color: Yellow
+Behavior: Solid light
+Meaning: The gateway is being configured
+
+### Network Connected
+
+Color: Green
+Behavior: Solid light
+Meaning: Successfully connected to the network
+
+### Network Disconnected
+
+Color: Orange
+Behavior: Blinking
+Meaning: Lost connection to the network
+
+### MQTT Broker Connected
+
+Color: Green
+Behavior: Solid light
+Meaning: Successfully connected to the MQTT broker
+
+### MQTT Broker Disconnected
+
+Color: Orange
+Behavior: Blinking
+Meaning: Lost connection to the MQTT broker
+
+### Offline
+
+Color: Blue
+Behavior: Blinking
+Meaning: The gateway is offline
+
+### Local OTA Update
+
+Color: Magenta
+Behavior: Blinking
+Meaning: A local Over-The-Air update is in progress
+
+### Remote OTA Update
+
+Color: Purple
+Behavior: Blinking
+Meaning: A remote Over-The-Air update is in progress
+
+### Error
+
+Color: Red
+Behavior: Blinking (3 times)
+Meaning: An error has occurred
+
+### Actuator On/Off
+
+Color: Green
+Behavior: Depends on actuator state
+Meaning: Indicates the state of a connected actuator
\ No newline at end of file
diff --git a/docs/use/ir.md b/docs/use/ir.md
index 89cb45d..35121aa 100644
--- a/docs/use/ir.md
+++ b/docs/use/ir.md
@@ -97,11 +97,7 @@ mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoIR -m '{"value":551489775,"
 
 ## Send raw IR data by MQTT
 
-2) If you use an Arduino UNO enable `IR_Raw` by uncommenting the line 129 in User_config.h
-`#define IR_Raw`
-If you are using the uno you will have to comment other gateway like ZgatewayRF, ZgatewayBT and ZgatewayIR to keep enough memory
-
-3) publish your code like below
+Publish your code like below
 ```
 mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoIR -m '{"raw":"8850,4450,600,550,550,550,600,1600,600,550,600,500,600,500,600,550,600,500,600,1650,600,1600,600,550,600,1600,600,1650,600,1600,600,1650,600,1600,600,550,600,500,600,550,550,1650,600,500,600,550,600,500,600,550,550,1650,600,1650,550,1650,600,550,550,1650,600,1650,550,1650,600,1650,600","protocol_name":"Raw"}'
 ```
@@ -111,12 +107,10 @@ In this case the best way is to use hex values instead, but if you can't you may
 In User_config.h replace:
 ```cpp
 # define JSON_MSG_BUFFER 512
-# define mqtt_max_packet_size 1024
 ```
 by
 ```cpp
 # define JSON_MSG_BUFFER 1280
-# define mqtt_max_packet_size 1280
 ```
 
 ## Repeat the IR signal OpenMQTTGateway receive
diff --git a/docs/use/rf.md b/docs/use/rf.md
index e52065d..560a3a4 100644
--- a/docs/use/rf.md
+++ b/docs/use/rf.md
@@ -39,19 +39,23 @@ Note that with CC1101 this frequency will be used as the default sending frequen
 
 Switching of the active transceiver (RTL_433 receiver only) module is available between the RF, RF2, and (RTL_433 or Pilight) gateway modules, allowing for changing of signal decoders without redeploying the OpenMQTTGateway package.  Sending a JSON message to the command topic will change the active transceiver module.
 
-To enable the RF gateway module send a json message to the RF gateway module command subject with the key being 'active', and any value.  The value at this time is ignored. 
+To change the RF gateway module, which will receive, send a json message to the RF gateway module command subject (home/OpenMQTTGateway/commands/MQTTtoRF/config) with the corresponding value of the key "active" 
 
-1 - PiLight
-2 - RF
-3 - RTL_433
+1 - PiLight<br>
+2 - RF<br>
+3 - RTL_433<br>
 4 - RF2
 
 Example to receive from the RF gateway:
 `mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoRF/config" -m '{"active":2}'`
 
+Example to receive from the Pilight gateway:
+`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoRF/config" -m '{"active":1}'`
+
 The active receiver can also be changed with the WebUI.
 
 The OpenMQTTGateway RFtoMQTT status message contains a key `active` which is the current active receiver module.
+There is example configuration entry for Homea Assistant in the intergrations doc.
 
 ## RTL_433 device decoders
 
@@ -66,95 +70,13 @@ This feature is only available on a ESP32 based device with a supported transcei
 
 ### Supported Decoders
 
-```
-Registering protocol [2] "Acurite 609TXC Temperature and Humidity Sensor"
-Registering protocol [3] "Acurite 592TXR Temp/Humidity, 5n1 Weather Station, 6045 Lightning, 3N1, Atlas"
-Registering protocol [4] "Acurite 986 Refrigerator / Freezer Thermometer"
-Registering protocol [5] "Acurite 606TX Temperature Sensor"
-Registering protocol [6] "Acurite 00275rm,00276rm Temp/Humidity with optional probe"
-Registering protocol [7] "Acurite 590TX Temperature with optional Humidity"
-Registering protocol [8] "Acurite Grill/Meat Thermometer 01185M"
-Registering protocol [9] "Akhan 100F14 remote keyless entry"
-Registering protocol [10] "AlectoV1 Weather Sensor (Alecto WS3500 WS4500 Ventus W155/W044 Oregon)"
-Registering protocol [11] "Ambient Weather TX-8300 Temperature/Humidity Sensor"
-Registering protocol [13] "Auriol AFT 77 B2 temperature sensor"
-Registering protocol [14] "Auriol AFW2A1 temperature/humidity sensor"
-Registering protocol [15] "Auriol AHFL temperature/humidity sensor"
-Registering protocol [16] "Auriol HG02832, HG05124A-DCF, Rubicson 48957 temperature/humidity sensor"
-Registering protocol [18] "Blyss DC5-UK-WH"
-Registering protocol [20] "Bresser Thermo-/Hygro-Sensor 3CH"
-Registering protocol [22] "Burnhard BBQ thermometer"
-Registering protocol [23] "Calibeur RF-104 Sensor"
-Registering protocol [24] "Cardin S466-TX2"
-Registering protocol [25] "Chuango Security Technology"
-Registering protocol [26] "Companion WTR001 Temperature Sensor"
-Registering protocol [29] "Ecowitt Wireless Outdoor Thermometer WH53/WH0280/WH0281A"
-Registering protocol [30] "Eurochron EFTH-800 temperature and humidity sensor"
-Registering protocol [34] "Esperanza EWS"
-Registering protocol [36] "Fine Offset Electronics, WH2, WH5, Telldus Temperature/Humidity/Rain Sensor"
-Registering protocol [37] "Fine Offset Electronics, WH0530 Temperature/Rain Sensor"
-Registering protocol [38] "Fine Offset WH1050 Weather Station"
-Registering protocol [39] "Fine Offset Electronics WH1080/WH3080 Weather Station"
-Registering protocol [41] "FT-004-B Temperature Sensor"
-Registering protocol [42] "Generic wireless motion sensor"
-Registering protocol [43] "Generic Remote SC226x EV1527"
-Registering protocol [44] "Generic temperature sensor 1"
-Registering protocol [45] "Govee Water Leak Dectector H5054, Door Contact Sensor B5023"
-Registering protocol [46] "Globaltronics QUIGG GT-TMBBQ-05"
-Registering protocol [47] "Globaltronics GT-WT-02 Sensor"
-Registering protocol [48] "Globaltronics GT-WT-03 Sensor"
-Registering protocol [49] "Microchip HCS200 KeeLoq Hopping Encoder based remotes"
-Registering protocol [50] "Honeywell ActivLink, Wireless Doorbell"
-Registering protocol [51] "HT680 Remote control"
-Registering protocol [52] "inFactory, nor-tec, FreeTec NC-3982-913 temperature humidity sensor"
-Registering protocol [54] "Interlogix GE UTC Security Devices"
-Registering protocol [56] "Kedsum Temperature & Humidity Sensor, Pearl NC-7415"
-Registering protocol [57] "Kerui PIR / Contact Sensor"
-Registering protocol [58] "LaCrosse TX Temperature / Humidity Sensor"
-Registering protocol [59] "LaCrosse TX141-Bv2, TX141TH-Bv2, TX141-Bv3, TX141W, TX145wsdth, (TFA, ORIA) sensor"
-Registering protocol [60] "LaCrosse/ELV/Conrad WS7000/WS2500 weather sensors"
-Registering protocol [61] "LaCrosse WS-2310 / WS-3600 Weather Station"
-Registering protocol [63] "Markisol, E-Motion, BOFU, Rollerhouse, BF-30x, BF-415 curtain remote"
-Registering protocol [64] "Maverick et73"
-Registering protocol [66] "Missil ML0757 weather station"
-Registering protocol [68] "Nexus, FreeTec NC-7345, NX-3980, Solight TE82S, TFA 30.3209 temperature/humidity sensor"
-Registering protocol [70] "Opus/Imagintronix XT300 Soil Moisture"
-Registering protocol [71] "Oregon Scientific Weather Sensor"
-Registering protocol [72] "Oregon Scientific SL109H Remote Thermal Hygro Sensor"
-Registering protocol [74] "Philips outdoor temperature sensor (type AJ3650)"
-Registering protocol [75] "Philips outdoor temperature sensor (type AJ7010)"
-Registering protocol [76] "Prologue, FreeTec NC-7104, NC-7159-675 temperature sensor"
-Registering protocol [77] "Quhwa"
-Registering protocol [79] "Rubicson Temperature Sensor"
-Registering protocol [80] "Rubicson 48659 Thermometer"
-Registering protocol [81] "Conrad S3318P, FreeTec NC-5849-913 temperature humidity sensor"
-Registering protocol [82] "Silvercrest Remote Control"
-Registering protocol [83] "Skylink HA-434TL motion sensor"
-Registering protocol [84] "Wireless Smoke and Heat Detector GS 558"
-Registering protocol [85] "Solight TE44/TE66, EMOS E0107T, NX-6876-917"
-Registering protocol [86] "Springfield Temperature and Soil Moisture"
-Registering protocol [87] "TFA Dostmann 30.3221.02 T/H Outdoor Sensor"
-Registering protocol [88] "TFA Drop Rain Gauge 30.3233.01"
-Registering protocol [89] "TFA pool temperature sensor"
-Registering protocol [90] "TFA-Twin-Plus-30.3049, Conrad KW9010, Ea2 BL999"
-Registering protocol [91] "Thermopro TP11 Thermometer"
-Registering protocol [92] "Thermopro TP08/TP12/TP20 thermometer"
-Registering protocol [94] "TS-FT002 Wireless Ultrasonic Tank Liquid Level Meter With Temperature Sensor"
-Registering protocol [95] "Visonic powercode"
-Registering protocol [96] "Waveman Switch Transmitter"
-Registering protocol [97] "WG-PB12V1 Temperature Sensor"
-Registering protocol [98] "WS2032 weather station"
-Registering protocol [99] "Hyundai WS SENZOR Remote Temperature Sensor"
-Registering protocol [100] "WT0124 Pool Thermometer"
-Registering protocol [101] "X10 RF"
-Registering protocol [102] "X10 Security"
-```
+For the most recent support decoder list please check the [rtl_433_esp](https://github.com/NorthernMan54/rtl_433_ESP?tab=readme-ov-file#ook-signal-device-decoders) repository.
 
 ### Change Signal RSSI Threshold Delta
 
 Delta applied to RSSI floor noise level to determine start and end of signal, defaults to 9db.
 
-`home/OpenMQTTGateway/commands/MQTTtoRF/config {"rssiThreshold": 9}`
+`home/OpenMQTTGateway/commands/MQTTtoRF/config {"rssithreshold": 9}`
 
 ### Retrieve current status of receiver
 
@@ -183,82 +105,114 @@ Delta applied to RSSI floor noise level to determine start and end of signal, de
 
 ## RCSwitch based gateway
 
-### Receiving data from RF signal
+The [RCSwitch](https://github.com/1technophile/rc-switch.git) library is an Arduino library that facilitates communication with 433MHz RF modules. It is designed to be lightweight and easy to use, making it suitable for basic RF communication tasks. The library supports both sending and receiving of RF signals, allowing for integration with various RF devices such as remote controls, sensors, and switches.
 
-Subscribe to all the messages with mosquitto or open your MQTT client software:
+To enable this module during compilation, add the flag `'-DZgatewayRF="RF"'` or uncomment the line `#define ZgatewayRF "RF"` in the `User_config.h` file.
 
-`    sudo mosquitto_sub -t +/# -v`
 
-Generate your RF signals by pressing a remote button or other and you should see :
+Other useful definitions can be:
 
-`home/OpenMQTTGateway/433toMQTT {"value":1315156,"protocol":1,"length":24,"delay":317}`
+* `#define RF_DISABLE_TRANSMIT` To disable the transmit functions and free up the pin for other uses, add (or uncomment) this line to the `config_rf.h` file.
+* `#define repeatRFwMQTT true` To enable repeating the RF signal received by the gateway, set this parameter to true in the `config_rf.h` file.
+* `#define RF_on_HAS_as_DeviceTrigger` To send a Home Assistant Device Trigger Message for each RF signal received, add (or uncomment) this line in the `config_rf.h` file. Note that this action also depends on the `ZmqttDiscovery` settings.
+* `#define RF_on_HAS_as_MQTTSensor` To send a Home Assistant MQTT sensor message for each RF signal received, add (or uncomment) this line in the `config_rf.h` file. Note that this action also depends on the `ZmqttDiscovery` settings.
 
-### Disabling Transmit function to safe a PIN
 
-To disable transmit functions to allow the use of another pin, add the following to the config_rf.h file :
 
-`#define RF_DISABLE_TRANSMIT`
+### Handling RF signal over MQTT 
+In this chapter, the process of receiving and sending RF signals using MQTT will be explored. By subscribing to MQTT topics and publishing messages, RF devices can be seamlessly integrated with an MQTT broker. 
 
-### Send data by MQTT to convert it on RF signal 
+#### Receiving Data from RF Signal
 
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1315156}'`
+To receive data from an RF signal, follow these steps:
 
-This command will send by RF the code 1315156 and use the default parameters (protocol 1, delay 350)
+1. Subscribe to all messages using mosquitto or open your MQTT client software:
+    ```sh
+    sudo mosquitto_sub -t +/# -v
+    ```
 
-Arduino IDE serial data received when publishing data by MQTT
+2. Generate your RF signals by pressing a remote button or other RF device. You should see output similar to:
+    ```json
+    home/OpenMQTTGateway/433toMQTT {"value":1315156,"protocol":1,"length":24,"delay":317}
+    ```
+
+
+#### Send data by MQTT to convert it to an RF signal
+
+To send an RF signal using MQTT, you can publish a message to the topic `home/OpenMQTTGateway/commands/MQTTto433` with the desired value. For example:
+
+```sh
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1315156}'
+```
+
+This command will send the RF code `1315156` using the default parameters (protocol 1, delay 350).
+
+When publishing data via MQTT, the Arduino IDE serial monitor will display the received value and the corresponding MQTT topic:
 
 ![Serial data](../img/OpenMQTTGateway_serial1.jpg)
 
-We see that the Arduino receive the value 1315156 on the MQTT subject "MQTTto433" and send the data by RF
+In this example, the Arduino receives the value `1315156` on the MQTT topic `MQTTto433` and transmits the data via RF.
 
-Arduino IDE serial data received when receiving data by 433Mhz
+Similarly, when receiving data via 433MHz, the Arduino IDE serial monitor will show the received data:
 
 ![Serial data 2](../img/OpenMQTTGateway_serial2.jpg)
 
 ### Send data by MQTT with advanced RF parameters
 
-RF sending support three advanced parameters: bits length, RF protocol and RF pulselength
+RF sending supports three advanced parameters: bits length, RF protocol, and RF pulse length.
 
--if you want to use a bits number different than 24 put inside your topic "length":24 for example
-
--if you want to use a different RCswitch protocol put inside your payload the protocol number 2, "protocol":2.
-
--if you want to use a pulselength 315 put inside your topic "delay":315
+- To use a different bits number, include `"length":24` in your payload.
+- To use a different RCSwitch protocol, include `"protocol":2` in your payload.
+- To use a different pulse length, include `"delay":315` in your payload.
 
 Example:
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1315156,"protocol":2,"length":24,"delay":315}'`
-will make RCSwitch use the protocol 2 with a pulselength of 315ms and a bits number of 24 with a power of 5
 
-### Repeat the RF signal OpenMQTTGateway receive
-So as to repeat the RF signal received by the gateway once set the following parameter to true in config_RF.h
+```sh
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1315156,"protocol":2,"length":24,"delay":315}'
+```
 
-`#define repeatRFwMQTT true`
+This command will make RCSwitch use protocol 2 with a pulse length of 315ms and a bits number of 24.
 
-### Repeat the RF signal several times
-You can add a "repeat" key/value to the MQTTto433 JSON message to override the default number of repeats.
+
+#### Repeat the RF signal several time
+
+You can add a "repeat" key/value to the MQTTto433 JSON message to override the default number of repeats. Ensure that `repeatRFwMQTT` is enabled at compile time.
 
 Example:
-`home/OpenMQTTGateway/commands/MQTTto433 {"value":1315156,"protocol":1,"length":24,"delay":317, "repeat":10}`
+```sh
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1315156,"protocol":1,"length":24,"delay":317,"repeat":10}'
+```
 
-### Set Transmit and Receive Frequency and Transmit Power of CC1101 Transceiver
+#### Set Transmit and Receive Frequency and Transmit Power of CC1101 Transceiver
 
-Default transmit frequency of the CC1101 module is 433.92 Mhz, and this can be can changed by including the frequency in the transmit message.  Parameter is `mhz` and valid values are 300-348 Mhz, 387-464Mhz and 779-928Mhz.  Actual frequency support will depend on your CC1101 board.
+The default transmit frequency of the CC1101 module is 433.92 MHz. This can be changed by including the desired frequency in the transmit message. The parameter is `frequency`, and valid values are 300-348 MHz, 387-464 MHz, and 779-928 MHz. Actual frequency support will depend on your CC1101 board.
 
-`home/OpenMQTTGateway/commands/MQTTto433 {"value":1150,"protocol":6,"length":12,"delay":450,"repeat":8,"frequency":303.732}`
+Example:
+```sh
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1150,"protocol":6,"length":12,"delay":450,"repeat":8,"frequency":303.732}'
+```
 
-Default receive frequency of the CC1101 module is 433.92 Mhz, and this can be can changed by sending a message with the frequency.  Parameter is `frequency` and valid values are 300-348 Mhz, 387-464Mhz and 779-928Mhz.  Actual frequency support will depend on your CC1101 board
+The default receive frequency of the CC1101 module is also 433.92 MHz. This can be changed by sending a message with the desired frequency. The parameter is `frequency`, and valid values are 300-348 MHz, 387-464 MHz, and 779-928 MHz. Actual frequency support will depend on your CC1101 board.
 
-`home/OpenMQTTGateway/commands/MQTTtoRF/config {"frequency":433.92}`
+Example:
+```sh
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoRF/config" -m '{"frequency":433.92}'
+```
 
-Messages received will include the frequency, and when transmitting on a different frequency the module return to the receive frequency afterwards.  ie transmit messages on 303.732 Mhz then receive messages on 433.92 Mhz 
+Messages received will include the frequency, and when transmitting on a different frequency, the module will return to the receive frequency afterward. For example, transmit messages on 303.732 MHz and then receive messages on 433.92 MHz.
 
-`{"value":4534142,"protocol":6,"length":26,"delay":356,"frequency":315.026}`
+Example received message:
+```json
+{"value":4534142,"protocol":6,"length":26,"delay":356,"frequency":315.026}
+```
 
-You can adjust the tx-power in db for a transmission. Parameter is `cc1101_pa` and valid values in decibel are (-30  -20  -15  -10  -6    0    5    7    10   11   12) Default is max!
-That can be done to reduce range and therefore disturbances with other nearby devices.
-If you want to send a transmission with a power of 5 db than use the message 
+You can also adjust the transmit power (tx-power) in decibels (dB) for a transmission. The parameter is `cc1101_pa`, and valid values in decibels are -30, -20, -15, -10, -6, 0, 5, 7, 10, 11, and 12. The default is the maximum value. Adjusting the transmit power can help reduce range and minimize disturbances with other nearby devices.
+
+Example:
+```sh
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTto433" -m '{"value":1315156,"protocol":2,"length":24,"delay":315,"cc1101_pa":5}'
+```
 
-`{"value":1315156,"protocol":2,"length":24,"delay":315, "cc1101_pa":5}`
 
 
 ## Pilight gateway
@@ -276,7 +230,10 @@ Generate your RF signals by pressing a remote button or other and you will see :
 #### Enabling RAW packet return support
 First, you need to compile a binary with `Pilight_rawEnabled true` uncommented in config_RF.h.
 
-Once the device is online, you can turn on the RAW packet return support with the following MQTT command:
+Once the device is online and the active receiver is Pilght, you can toggle raw packet return.
+If current active receiver is not Pilight the toggle command will be ignored and harmless error message will be published.
+
+You can turn on the RAW packet return support with the following MQTT command:
 
 `mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoPilight/protocols" -m '{"rawEnabled":true}'`
 
diff --git a/docs/use/rs232.md b/docs/use/serial.md
similarity index 54%
rename from docs/use/rs232.md
rename to docs/use/serial.md
index efdaf27..ba93eea 100644
--- a/docs/use/rs232.md
+++ b/docs/use/serial.md
@@ -1,32 +1,32 @@
-# RS232 gateway
+# RS232/Serial gateway
 
-The RS232 gateway can be used to send and receive data from the serial connection to and from MQTT. Both softwareSerial as hardwareSerial are supported. HardwareSerial can be used for higher baud rates, but is limited to specific pins on most platforms.
+The SERIAL gateway can be used to send and receive data from the serial connection to and from MQTT. Both softwareSerial as hardwareSerial are supported. HardwareSerial can be used for higher baud rates, but is limited to specific pins on most platforms.
 
-## Sending an RS232 message
+## Sending an SERIAL message
 
 Simply publish the message you wish to transmit, minus the prefix and postfix. For example, to send the "Turn On" signal for a Mitsubishi XD221U projector, the code is simply '!' so you would use the command
 
-`mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoRS232 -m  '{"value": "!"}'`
+`mosquitto_pub -t home/OpenMQTTGateway/commands/XtoSERIAL -m  '{"value": "!"}'`
 
-It will automatically add the prefix and postfix you set in [config_RS232.h](https://github.com/1technophile/OpenMQTTGateway/blob/master/main/config_RS232.h).
+It will automatically add the prefix and postfix you set in [config_SERIAL.h](https://github.com/1technophile/OpenMQTTGateway/blob/master/main/config_SERIAL.h).
 
 
-## Receiving an RS232 message
+## Receiving an SERIAL message
 
-Two modes are available for receiving RS232 messages.
+Two modes are available for receiving SERIAL messages.
 
 ### Single MQTT message mode (default)
 To receive a message, subscribe to all with `mosquitto_sub -t +/# -v`
 and perform an action that should get a response from the device. For example, If I were to send the "Turn On" signal from earlier, I would receive back
 
 ```json
-home/OpenMQTTGateway/RS232toMQTT {"value":"1"}
+home/OpenMQTTGateway/SERIALtoMQTT {"value":"1"}
 ```
 
 Because this projector echoes back a received command to acknowledge. Some devices will send a NACK, or Negative Acknowledge, to confirm that they received your message but could not comply. That would look like
 
 ```json
-home/OpenMQTTGateway/RStoMQTT {"value":"!:N"}
+home/OpenMQTTGateway/SERIALtoMQTT {"value":"!:N"}
 ```
 
 ### JSON mode
@@ -42,15 +42,15 @@ input received at serial link:
 
 output in case of max nesting level 1:
 ```json
-home/OpenMQTTGateway/RS232toMQTT/temperature  "{sens1: 22, sens2: 23}"
-home/OpenMQTTGateway/RS232toMQTT/humidity     "{sens1: 80, sens2: 60}"
+home/OpenMQTTGateway/SERIALtoMQTT/temperature  "{sens1: 22, sens2: 23}"
+home/OpenMQTTGateway/SERIALtoMQTT/humidity     "{sens1: 80, sens2: 60}"
 ```
 
 output in case of max nesting level 2 (or higher):
 ```json
-home/OpenMQTTGateway/RS232toMQTT/temperature/sens1  22
-home/OpenMQTTGateway/RS232toMQTT/temperature/sens2  23
-home/OpenMQTTGateway/RS232toMQTT/humidity/sens1  80
-home/OpenMQTTGateway/RS232toMQTT/humidity/sens2  60
+home/OpenMQTTGateway/SERIALtoMQTT/temperature/sens1  22
+home/OpenMQTTGateway/SERIALtoMQTT/temperature/sens2  23
+home/OpenMQTTGateway/SERIALtoMQTT/humidity/sens1  80
+home/OpenMQTTGateway/SERIALtoMQTT/humidity/sens2  60
 ```
 
diff --git a/docs/use/webui.md b/docs/use/webui.md
index 24198c0..b3004a9 100644
--- a/docs/use/webui.md
+++ b/docs/use/webui.md
@@ -30,6 +30,10 @@ Ability to change the mqtt settings, if the change is unsuccessful it will rever
 
 Ability to change the display of sensor to Metric or Imperial, and disable the WebUI Authentication
 
+## Bluetooth Low Energy - BLE
+
+Ability to add the default AES BLE decryption key, and multiple per-device `macaddress:aeskey` allowing for devices that cannot have their AES key changed.
+
 ## Logging
 
 Ability to temporarily change the logging level.
diff --git a/docsgen/boards-info.js b/docsgen/boards-info.js
new file mode 100644
index 0000000..ce52d05
--- /dev/null
+++ b/docsgen/boards-info.js
@@ -0,0 +1,248 @@
+'use strict';
+/**
+ * Universal parser for PlatformIO dependencies.
+ * Formats URLs and registry strings into a consistent "Registry Style":
+ * Name @ Version (provider:user)
+ */
+function smartFormat(dep) {
+    if (!dep) return "";
+    if (typeof dep !== 'string') return dep;
+
+    const cleanDep = dep.trim();
+
+    // Configuration for Git providers with specific regex for archives, releases, and git repos
+    const providers = [
+        {
+            id: 'gh',
+            name: 'github',
+            // Captures: 1. Author, 2. Repo, 3. Version from path (releases), 4. Version from filename/branch
+            regex: /github\.com\/([^/]+)\/([^/.]+)(?:\/(?:archive|releases\/download\/([^/]+)|tree)\/)?([^/]+)?(?:\.zip|\.git)?$/i
+        },
+        {
+            id: 'gl',
+            name: 'gitlab',
+            // Captures: 1. Author, 2. Repo, 3. Version from path, 4. Version from filename
+            regex: /gitlab\.com\/([^/]+)\/([^/.]+)(?:\/(?:-\/)?(?:archive|releases)\/([^/]+))?\/([^/]+)?(?:\.zip|\.git)?$/i
+        },
+        {
+            id: 'bb',
+            name: 'bitbucket',
+            // Captures: 1. Author, 2. Repo, 3. Version from path, 4. Version from filename
+            regex: /bitbucket\.org\/([^/]+)\/([^/.]+)(?:\/(?:get|downloads)\/([^/]+))?\/([^/]+)?(?:\.zip|\.git)?$/i
+        }
+    ];
+
+    // 1. Try to match against Git providers (GitHub, GitLab, Bitbucket)
+    for (const p of providers) {
+        const match = cleanDep.match(p.regex);
+        if (match) {
+            let [_, author, repo, pathVer, fileVer] = match;
+
+            // Prioritize version from path (typical in releases) over filename
+            let version = pathVer || fileVer || "latest";
+
+            // Clean up version string: remove extensions and 'v' prefix
+            version = version
+                .replace(/\.(zip|git|tar\.gz)$/i, '')
+                .replace(/^v(\d)/i, '$1'); // Removes 'v' only if followed by a number
+
+            // Avoid redundancy if the version string is identical to the repo name
+            if (version.toLowerCase() === repo.toLowerCase()) {
+                version = "latest";
+            }
+
+            return `${repo} @ ${version} (${p.id}:${author})`;
+        }
+    }
+
+    // 2. Fallback for Standard PlatformIO Registry format (e.g., owner/lib @ ^1.0.0)
+    if (cleanDep.includes('/') || cleanDep.includes('@')) {
+        const parts = cleanDep.split('@');
+        const fullName = parts[0].trim(); // Includes owner/name
+
+        // Clean up version if present
+        let version = "latest";
+        if (parts[1]) {
+            version = parts[1].trim().replace(/^[\^~=]/, '');
+        }
+
+        // Separate owner and library name for consistent formatting
+        if (fullName.includes('/')) {
+            const [owner, libName] = fullName.split('/');
+            return `${libName.trim()} @ ${version} (pio:${owner.trim()})`;
+        }
+
+        return `${fullName} @ ${version}`;
+    }
+
+    // 3. Return original string if no patterns match
+    return cleanDep;
+}
+
+function rowConfigFromPlatformIO() {
+    const { execSync } = require('child_process');
+
+    try {
+        const jsonConfig = execSync('pio project config --json-output').toString();
+        const config = JSON.parse(jsonConfig);
+        return config;
+    } catch (error) {
+        console.error("Make sure PlatformIO Core is installed and in PATH");
+        throw error;
+    }
+}
+
+function cleanValue(v) {
+    if (typeof v !== 'string') return v;
+    return v
+        .replace(/{/g, '')
+        .replace(/}/g, '')
+        .replace(/\$/g, '')
+        .replace(/env:/g, '')
+        .replace(/'/g, '')
+        .replace(/-D/g, '');
+}
+
+function convertJsonToSections(jsonConfig) {
+    const sections = {};
+    jsonConfig.forEach(([sectionName, configArray]) => {
+        sections[sectionName] = {};
+        configArray.forEach(([key, value]) => {
+            sections[sectionName][key] = value;
+        });
+    });
+    return sections;
+}
+
+function cleanLibraries(raw) {
+    if (!raw) return [];
+    if (typeof raw === 'string') {
+        raw = raw.split(',')
+    }
+    return raw.map((dep) => smartFormat(dep));
+}
+
+function extractModulesFromFlags(flags) {
+    if (!flags) return [];
+    let flagArray = [];
+    if (Array.isArray(flags)) {
+        flagArray = flags;
+    } else if (typeof flags === 'string') {
+        flagArray = flags.split(',').map(s => s.trim()).filter(s => s.length > 0);
+    } else {
+        return [];
+    }
+    const modules = [];
+    flagArray.forEach((flag) => {
+        // Match -DZmoduleName, allowing surrounding quotes
+        const match = flag.match(/^['" ]*-DZ([^=]+)/);
+        if (match) {
+            const moduleName = match[1];
+            // Additional constraint: must contain 'gateway', 'sensor', or 'actuator'
+            if (moduleName.includes('gateway') || moduleName.includes('sensor') || moduleName.includes('actuator')) {
+                modules.push(moduleName);
+            }
+        }
+        //if MQTT_BROKER_MODE = true then modules.push("MQTT Broker Mode");
+        const brokerMatch = flag.match(/^['" ]*-DMQTT_BROKER_MODE(?:=([^'"\s]+))?/);
+        if (brokerMatch) {
+            const value = brokerMatch[1];
+            // Add only if not explicitly set to false (case insensitive)
+            if (!value || value.toLowerCase() !== 'false') {
+                modules.push("MQTT Broker Mode");
+            }
+        }
+
+    });
+    return modules;
+}
+
+function collectBoardsInformations(sections, { includeTests = false } = {}) {
+    const rows = [];
+
+    Object.entries(sections).forEach(([section, items]) => {
+        if (!section.includes('env:')) return;
+        if (!includeTests && section.includes('-test')) return;
+
+        const env = section.replace('env:', '');
+        let uc = '';
+        let hardware = '';
+        let description = '';
+        let modules = [];
+        let platform = '';
+        let partitions = '';
+        let libraries = [];
+        let options = [];
+        let customImg = '';
+
+        Object.entries(items).forEach(([k, raw]) => {
+            const v = cleanValue(raw);
+
+
+            if (k === 'board') uc = v;
+            if (k === 'platform') platform = smartFormat(v);
+            if (k === 'board_build.partitions') partitions = v;
+            if (k === 'custom_description') description = v;
+            if (k === 'custom_hardware') hardware = v;
+            if (k === 'custom_img') customImg = v;
+
+            if (k === 'lib_deps') {
+                libraries = cleanLibraries(raw);
+            }
+
+            if (k === 'build_flags') {
+                options = v;
+                modules = extractModulesFromFlags(v);
+            }
+        });
+
+        rows.push({
+            Environment: env,
+            uC: uc,
+            Hardware: hardware,
+            Description: description,
+            Modules: modules,
+            Platform: platform,
+            Partitions: partitions,
+            Libraries: libraries,
+            Options: options,
+            CustomImg: customImg
+        });
+    });
+
+    rows.sort((a, b) => a.Environment.localeCompare(b.Environment, 'en', { sensitivity: 'base' }));
+    return rows;
+}
+
+// pio project config resolves extra_configs, which pulls in user-specific
+// files like prod_env.ini; only environments declared in environments.ini
+// belong in the published boards list.
+function publicEnvironmentNames() {
+    const fs = require('fs');
+    const path = require('path');
+    const ini = fs.readFileSync(path.resolve(__dirname, '..', 'environments.ini'), 'utf8');
+    const names = new Set();
+    for (const match of ini.matchAll(/^\[env:([^\]]+)\]/gm)) {
+        names.add(match[1].trim());
+    }
+    return names;
+}
+
+function loadBoardsInfo(options = {}) {
+    const { includeTests = false } = options;
+    const config = rowConfigFromPlatformIO();
+    const sections = convertJsonToSections(config);
+    const rows = collectBoardsInformations(sections, { includeTests });
+    const publicEnvs = publicEnvironmentNames();
+    return rows.filter(row => publicEnvs.has(row.Environment));
+}
+
+function ensureDir(dir) {
+    const fs = require('fs');
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+}
+
+module.exports = {
+    loadBoardsInfo,
+    ensureDir
+};
diff --git a/docsgen/common_wu.js b/docsgen/common_wu.js
new file mode 100644
index 0000000..bccc307
--- /dev/null
+++ b/docsgen/common_wu.js
@@ -0,0 +1,77 @@
+// Common templates and constants for web installer manifest generation
+// Used by: scripts/gen_wu.js
+
+const mf_temp32 = (vars) => `{
+  "name": "OpenMQTTGateway",
+  "new_install_prompt_erase": true,
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "${vars.cp}${vars.bl}", "offset": 4096 },
+        { "path": "${vars.cp}${vars.part}", "offset": 32768 },
+        { "path": "${vars.cp}${vars.boot}", "offset": 57344 },
+        { "path": "${vars.cp}${vars.bin}", "offset": 65536 }
+      ]
+    }
+  ]
+}`;
+
+const mf_temp32c3 = (vars) => `{
+  "name": "OpenMQTTGateway",
+  "new_install_prompt_erase": true,
+  "builds": [
+    {
+      "chipFamily": "ESP32-C3",
+      "improv": false,
+      "parts": [
+        { "path": "${vars.cp}${vars.bl}", "offset": 0 },
+        { "path": "${vars.cp}${vars.part}", "offset": 32768 },
+        { "path": "${vars.cp}${vars.boot}", "offset": 57344 },
+        { "path": "${vars.cp}${vars.bin}", "offset": 65536 }
+      ]
+    }
+  ]
+}`;
+
+const mf_temp32s3 = (vars) => `{
+  "name": "OpenMQTTGateway",
+  "new_install_prompt_erase": true,
+  "builds": [
+    {
+      "chipFamily": "ESP32-S3",
+      "improv": false,
+      "parts": [
+        { "path": "${vars.cp}${vars.bl}", "offset": 0 },
+        { "path": "${vars.cp}${vars.part}", "offset": 32768 },
+        { "path": "${vars.cp}${vars.boot}", "offset": 57344 },
+        { "path": "${vars.cp}${vars.bin}", "offset": 65536 }
+      ]
+    }
+  ]
+}`;
+
+const mf_temp8266 = (vars) => `{
+  "name": "OpenMQTTGateway",
+  "new_install_prompt_erase": true,
+  "builds": [
+    {
+      "chipFamily": "ESP8266",
+      "parts": [{ "path": "${vars.cp}${vars.bin}", "offset": 0 }]
+    }
+  ]
+}`;
+
+
+const cors_proxy = ''; // 'https://cors.bridged.cc/'
+const esp32_boot = 'https://github.com/espressif/arduino-esp32/raw/2.0.7/tools/partitions/boot_app0.bin';
+
+module.exports = {
+  mf_temp32,
+  mf_temp32c3,
+  mf_temp32s3,
+  mf_temp8266,
+  cors_proxy,
+  esp32_boot
+};
diff --git a/docsgen/gen_wu.js b/docsgen/gen_wu.js
new file mode 100644
index 0000000..ae83fbb
--- /dev/null
+++ b/docsgen/gen_wu.js
@@ -0,0 +1,349 @@
+#!/usr/bin/env node
+
+// Creates web installer manifests for ESP Web Tools firmware installation
+
+const fs = require('fs');
+const path = require('path');
+const https = require('https');
+const { loadBoardsInfo, ensureDir } = require('./boards-info');
+
+const {
+    mf_temp32,
+    mf_temp32c3,
+    mf_temp32s3,
+    mf_temp8266,
+    cors_proxy,
+    esp32_boot
+} = require('./common_wu.js');
+
+// ============================================================================
+// Directory Configuration
+// ============================================================================
+
+// Base directories
+const ROOT_DIR = path.join(__dirname, '..');
+const DOCS_DIR = path.join(ROOT_DIR, 'docs');
+const VITEPRESS_DIR = path.join(DOCS_DIR, '.vitepress');
+const PUBLIC_DIR = path.join(VITEPRESS_DIR, 'public');
+const COMPONENTS_DIR = path.join(VITEPRESS_DIR, 'components');
+const ARTIFACTS_DIR = path.join(ROOT_DIR, 'generated', 'artifacts');
+
+// Feature-specific directories
+const FIRMWARE_SRC_DIR = path.join(ARTIFACTS_DIR, 'firmware_build');
+const FIRMWARE_BUILD_DIR = path.join(PUBLIC_DIR, 'firmware_build');
+const BOARDS_INFO_FILE = path.join(PUBLIC_DIR, 'boards-info.json');
+
+// Configuration files
+const DEFAULTS_CONFIG_PATH = path.join(VITEPRESS_DIR, 'defaults.json');
+const META_CONFIG_PATH = path.join(VITEPRESS_DIR, 'meta.json');
+
+
+
+let meta = require(DEFAULTS_CONFIG_PATH);
+try {
+    const meta_overload = require(META_CONFIG_PATH);
+    meta = { ...meta, ...meta_overload };
+} catch (e) {
+    console.warn('meta.json not found or not valid. Using default configuration.');
+}
+
+// Parse command line arguments
+const args = process.argv.slice(2);
+const dev = args.includes('--dev') || meta.mode === 'dev';
+const repo = meta.repo || '1technophile/OpenMQTTGateway';
+const firmwareManifestFolder = dev ? `/dev/firmware_build/` : `/firmware_build/`;
+
+// ============================================================================
+// Utility Functions
+// ============================================================================
+
+function ensureFirmwareArtifacts() {
+    if (!fs.existsSync(FIRMWARE_SRC_DIR)) {
+        throw new Error(`Missing firmware artifacts in ${FIRMWARE_SRC_DIR}. Run "ci.sh build ..." first to populate this folder.`);
+    }
+    console.log(`Found firmware artifacts in: ${FIRMWARE_SRC_DIR}`);
+}
+// Replace version_tag in template and write to destination
+function renderVersionTemplate(templatePath, outputPath, version) {
+    if (!fs.existsSync(templatePath)) {
+        throw new Error(`Template not found: ${templatePath}`);
+    }
+    const content = fs.readFileSync(templatePath, 'utf8').replace(/version_tag/g, version);
+    fs.writeFileSync(outputPath, content);
+    console.log(`Generated version file from template: ${outputPath}`);
+}
+
+/**
+ * Download file from URL
+ */
+function downloadFile(url) {
+    return new Promise((resolve, reject) => {
+        https.get(url, (response) => {
+            // Handle redirects
+            if (response.statusCode === 302 || response.statusCode === 301) {
+                return downloadFile(response.headers.location).then(resolve).catch(reject);
+            }
+            if (response.statusCode !== 200) {
+                return reject(new Error(`Failed to download: ${response.statusCode}`));
+            }
+            const chunks = [];
+            response.on('data', (chunk) => chunks.push(chunk));
+            response.on('end', () => resolve(Buffer.concat(chunks)));
+            response.on('error', reject);
+        }).on('error', reject);
+    });
+}
+
+/**
+ * Fetch JSON from URL
+ */
+function fetchJson(url) {
+    return new Promise((resolve, reject) => {
+        https.get(url, { headers: { 'User-Agent': 'OpenMQTTGateway-Script' } }, (response) => {
+            if (response.statusCode !== 200) {
+                return reject(new Error(`Failed to fetch: ${response.statusCode}`));
+            }
+            let data = '';
+            response.on('data', (chunk) => data += chunk);
+            response.on('end', () => {
+                try {
+                    resolve(JSON.parse(data));
+                } catch (e) {
+                    reject(e);
+                }
+            });
+            response.on('error', reject);
+        }).on('error', reject);
+    });
+}
+
+/**
+ * Download and save asset
+ */
+async function downloadAsset(asset, destPath) {
+    const buffer = await downloadFile(asset.browser_download_url);
+    const filename = asset.browser_download_url.split('/').pop();
+    fs.writeFileSync(path.join(destPath, filename), buffer);
+    console.log(`Downloaded asset: ${filename} to ${destPath}`);
+}
+
+/**
+ * Create manifest and Vue option for a firmware
+ * Partition path uses filename only (matches Python; split is redundant but harmless)
+ */
+function createManifest(name, templateFn) {
+    const fw = name.split('-firmware')[0];
+    const man_file = fw + '.manifest.json';
+    const fwp_name = fw + '-partitions.bin';
+    const fwb_name = fw + '-bootloader.bin';
+
+    // Use filename to mirror Python behavior (no directories present today)
+    const partPath = fwp_name.split('/').pop();
+
+    const mani_str = templateFn({
+        cp: cors_proxy,
+        part: firmwareManifestFolder + partPath,
+        bin: firmwareManifestFolder + name,
+        bl: firmwareManifestFolder + fwb_name,
+        boot: firmwareManifestFolder + esp32_boot.split('/').pop()
+    });
+
+    const outPath = path.join(FIRMWARE_BUILD_DIR, man_file);
+    fs.writeFileSync(outPath, mani_str);
+    console.log(`Created manifest for ${fw}: ${outPath}`);
+}
+
+/**
+ * Create manifest for ESP8266
+ * Python adds manif_folder when writing to file, not in return
+ */
+function createManifest8266(name) {
+    const fw = name.split('-firmware')[0];
+    const man_file = fw + '.manifest.json';
+
+    const mani_str = mf_temp8266({
+        cp: cors_proxy,
+        bin: firmwareManifestFolder + name
+    });
+
+    const outPath = path.join(FIRMWARE_BUILD_DIR, man_file);
+    fs.writeFileSync(outPath, mani_str);
+    console.log(`Created manifest for ${fw} (ESP8266): ${outPath}`);
+
+}
+
+/**
+ * Device type matchers
+ */
+const ESP32_NAMES = ['esp32', 'ttgo', 'heltec', 'thingpulse', 'theengs', 'lilygo', 'shelly', 'tinypico'];
+const ESP8266_NAMES = ['nodemcu', 'sonoff', 'rf-wifi-gateway', 'manual-wifi-test', 'rfbridge'];
+
+const deviceMatchers = {
+    esp32: (name) => name.includes('firmware.bin') &&
+        !name.includes('esp32c3') && !name.includes('esp32s3') &&
+        ESP32_NAMES.some(key => name.includes(key)),
+
+    esp32c3: (name) => name.includes('firmware.bin') && name.includes('esp32c3'),
+
+    esp32s3: (name) => name.includes('firmware.bin') && name.includes('esp32s3'),
+
+    esp8266: (name) => name.includes('firmware.bin') &&
+        ESP8266_NAMES.some(key => name.includes(key))
+};
+
+/**
+ * Setup dev environment
+ */
+async function setupDevEnvironment() {
+    console.log('DEV mode: preparing web upload files...');
+    ensureFirmwareArtifacts();
+    // Generate OTA latest version definition from template
+    const tpl = path.join(__dirname, 'latest_version_dev.json.tpl');
+    renderVersionTemplate(tpl, path.join(FIRMWARE_BUILD_DIR, 'latest_version_dev.json'), meta.version);
+
+    // Copy the binaries from FIRMWARE_SRC_DIR to FIRMWARE_BUILD_DIR
+    const files = fs.readdirSync(FIRMWARE_SRC_DIR);
+    let copied = 0;
+    for (const name of files) {
+        if (name.includes('.bin')) {
+            fs.copyFileSync(
+                path.join(FIRMWARE_SRC_DIR, name),
+                path.join(FIRMWARE_BUILD_DIR, name)
+            );
+            copied++;
+            console.log(`Copied binary: ${name}`);
+        }
+    }
+    console.log(`Copied ${copied} firmware binaries to ${FIRMWARE_BUILD_DIR}`);
+}
+
+/**
+ * Setup release environment
+ */
+async function setupReleaseEnvironment() {
+    console.log('RELEASE mode: downloading and preparing web upload files...');
+
+    // Generate OTA latest version definition from template
+    const tpl = path.join(__dirname, 'latest_version.json.tpl');
+    renderVersionTemplate(tpl, path.join(FIRMWARE_BUILD_DIR, 'latest_version.json'), meta.version);
+
+    const releaseUrl = `https://api.github.com/repos/${repo}/releases/latest`;
+    console.log(`Fetching latest release info from: ${releaseUrl}`);
+    const rel_data = await fetchJson(releaseUrl);
+
+    if (!rel_data.assets) {
+        console.error('No assets found in the latest release!');
+        process.exit(1);
+    }
+
+    // Download all assets
+    let downloaded = 0;
+    for (const asset of rel_data.assets) {
+        const name = asset.name;
+        if (name.includes('firmware.bin') ||
+            name.includes('partitions.bin') ||
+            name.includes('bootloader.bin')) {
+            await downloadAsset(asset, FIRMWARE_BUILD_DIR);
+            downloaded++;
+        }
+    }
+    console.log(`Downloaded ${downloaded} firmware assets to ${FIRMWARE_BUILD_DIR}`);
+}
+
+/**
+ * Process firmware files and generate manifests
+ */
+function processFirmwareFiles(files) {
+    let manifestCount = 0;
+    for (const name of files) {
+        if (deviceMatchers.esp32(name)) {
+            createManifest(name, mf_temp32);
+            manifestCount++;
+        }
+        if (deviceMatchers.esp32c3(name)) {
+            createManifest(name, mf_temp32c3);
+            manifestCount++;
+        }
+        if (deviceMatchers.esp32s3(name)) {
+            createManifest(name, mf_temp32s3);
+            manifestCount++;
+        }
+        if (deviceMatchers.esp8266(name)) {
+            createManifest8266(name);
+            manifestCount++;
+        }
+    }
+    console.log(`Generated ${manifestCount} manifest files in ${FIRMWARE_BUILD_DIR}`);
+
+}
+
+/**
+ * Main execution function
+ */
+// ===================== OpenMQTTGateway Web Uploader Manifest Generator =====================
+// =====================                MAIN SCRIPT STARTS HERE                =====================
+async function main() {
+    console.log('================================================================================');
+    console.log(' OpenMQTTGateway Web Uploader Manifest Generator - START');
+    console.log('================================================================================');
+
+    // === [1] Load and generate boards info ===
+    console.log('\n[1/4] Generating boards-info.json ...');
+    const boardsInfo = loadBoardsInfo({ verbose: 0 });
+    const boardsJson = boardsInfo.map((row) => ({
+        environment: row.Environment,
+        hardware: row.Hardware,
+        description: row.Description,
+        microcontroller: row.uC,
+        modules: row.Modules.filter(Boolean),
+        platform: row.Platform,
+        partitions: row.Partitions,
+        libraries: row.Libraries.filter(Boolean),
+        options: row.Options,
+        customImg: row.CustomImg
+    }));
+    ensureDir(path.dirname(BOARDS_INFO_FILE));
+    fs.writeFileSync(BOARDS_INFO_FILE, JSON.stringify(boardsJson, null, 2), 'utf8');
+    console.log(`Generated boards-info.json with ${boardsJson.length} boards: ${BOARDS_INFO_FILE}`);
+
+    // === [2] Ensure output directory ===
+    console.log('\n[2/4] Ensuring output directory ...');
+    ensureDir(FIRMWARE_BUILD_DIR);
+    console.log(`Ensured output directory exists: ${FIRMWARE_BUILD_DIR}`);
+
+    // === [3] Setup environment (dev or release) ===
+    console.log('\n[3/4] Preparing firmware files ...');
+    try {
+        if (dev) {
+            await setupDevEnvironment();
+        } else {
+            await setupReleaseEnvironment();
+        }
+    } catch (error) {
+        console.error(`Error setting up environment: ${error.message}`);
+        process.exit(1);
+    }
+
+    // === [4] Download boot binary and generate manifests ===
+    console.log('\n[4/4] Downloading boot binary and generating manifests ...');
+    console.log(`Downloading boot binary: ${esp32_boot}`);
+    const boot_bin = await downloadFile(esp32_boot);
+    const boot_filename = esp32_boot.split('/').pop();
+    fs.writeFileSync(path.join(FIRMWARE_BUILD_DIR, boot_filename), boot_bin);
+    console.log(`Saved boot binary as: ${boot_filename}`);
+
+    const files = fs.readdirSync(FIRMWARE_BUILD_DIR).sort();
+    console.log(`Processing firmware files in ${FIRMWARE_BUILD_DIR}...`);
+    processFirmwareFiles(files);
+
+    console.log('\n================================================================================');
+    console.log(' OpenMQTTGateway Web Uploader Manifest Generator - END');
+    console.log('================================================================================');
+}
+// =====================                MAIN SCRIPT ENDS HERE                  =====================
+
+// Run main function
+main().catch(error => {
+    console.error('Fatal error:', error);
+    process.exit(1);
+});
diff --git a/scripts/latest_version.json b/docsgen/latest_version.json.tpl
similarity index 100%
rename from scripts/latest_version.json
rename to docsgen/latest_version.json.tpl
diff --git a/scripts/latest_version_dev.json b/docsgen/latest_version_dev.json.tpl
similarity index 100%
rename from scripts/latest_version_dev.json
rename to docsgen/latest_version_dev.json.tpl
diff --git a/environments.ini b/environments.ini
index 2929a13..0013819 100644
--- a/environments.ini
+++ b/environments.ini
@@ -24,9 +24,10 @@ board_build.ldscript = eagle.flash.1m64.ld ;this frees more space for firmware u
 ;extra_scripts = scripts/compressFirmware.py ;uncomment this to compress the firmware. This helps updating e.g. Sonoff RF Bridge via OTA flash by saving space for the uploaded firmware.
 custom_description = RF gateway for the Sonoff RF Bridge relying on the internal decoder
 custom_hardware = RFBridge v1
+custom_img = img/boards/sonoff-rf-bridge.jpg
 
 [env:rfbridge-direct]
-platform = espressif8266@^2
+platform = ${com.esp8266_platform}
 board = esp8285
 lib_deps =
   ${com-esp.lib_deps}
@@ -42,16 +43,19 @@ build_flags =
   '-DZsensorGPIOInput="GPIOInput"'
   '-DINPUT_GPIO=0'
   '-DGateway_Name="OMG_SRFB_Direct"'
+  '-fcommon'
 board_build.flash_mode = dout
 board_build.ldscript = eagle.flash.1m64.ld ;this frees more space for firmware uplad via OTA.
 ;extra_scripts = scripts/compressFirmware.py ;uncomment this to compress the firmware. This helps updating e.g. Sonoff RF Bridge via OTA flash by saving space for the uploaded firmware.
-custom_description = RF gateway for the Sonoff RF Bridge requiring direct hack, relying on ESPilight library, [tutorial](https://1technophile.blogspot.com/2019/04/sonoff-rf-bridge-pilight-or-how-to.html).
+custom_description = 'RF gateway for the Sonoff RF Bridge requiring direct hack, relying on ESPilight library, <a href="https://1technophile.blogspot.com/2019/04/sonoff-rf-bridge-pilight-or-how-to.html" target="_blank">tutorial</a>.'
 custom_hardware = RFBridge v1
+custom_img = img/boards/sonoff-rf-bridge.jpg
 
 [env:theengs-bridge]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
+board_build.flash_mode = qio
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -61,37 +65,142 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
   '-DESP32_ETHERNET=true'
   '-DETH_PHY_TYPE=ETH_PHY_LAN8720'
   '-DETH_PHY_ADDR=0'
   '-DETH_PHY_POWER=5'
   '-DETH_PHY_MDC=23'
   '-DETH_PHY_MDIO=18'
-  '-DETH_CLK_MODE=ETH_CLOCK_GPIO16_OUT'
-  '-DANEOPIX_IND_DATA_GPIO=32'
-  '-DANEOPIX_IND_NUM_LEDS=4'
-  '-DANEOPIX_INFO_LED=0'
-  '-DANEOPIX_SEND_RECEIVE_LED=1'
-  '-DANEOPIX_ERROR_LED=1'
-  '-DANEOPIX_BRIGHTNESS=10'
-  '-DRGB_INDICATORS=true'
+  '-DETH_CLK_MODE=ETH_CLOCK_GPIO0_OUT'
+  '-DETH_PHY_COLD_CYCLE'
+  '-DLED_ADDRESSABLE_PIN1=32'
+  '-DLED_ADDRESSABLE_NUM=4'
+  '-DLED_BROKER=0'
+  '-DLED_PROCESSING=1'
+  '-DLED_ERROR=1'
+  '-DDEFAULT_ADJ_BRIGHTNESS=10'
+  '-DLED_ADDRESSABLE=true'
   '-DAttemptBLEConnect=false'
   '-DUSE_MAC_AS_GATEWAY_NAME'
   '-DGATEWAY_MANUFACTURER="Theengs"'
   '-DGATEWAY_MODEL="TBRIDGE01"'
-  ;'-DBOARD_HAS_PSRAM'
-  '-UZwebUI="WebUI"' ; Disable WebUI
-  ;'-mfix-esp32-psram-cache-issue'
-custom_description = BLE gateway with external antenna and Ethernet/WiFi connectivity, [user guide](https://tbridge01.theengs.io/)
+  '-DBOARD_HAS_PSRAM'
+  '-mfix-esp32-psram-cache-issue'
+  '-mfix-esp32-psram-cache-strategy=memw'
+custom_description = 'BLE gateway with external antenna and Ethernet/WiFi connectivity, <a href="https://tbridge01.theengs.io/" target="_blank">user guide</a>'
 custom_hardware = Theengs Bridge gateway ethernet
+custom_img = img/Theengs-Bridge-ble-gateway.png
+
+[env:theengs-bridge-v11]
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32dev
+board_build.flash_mode = qio
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.adafruit_neopixel}
+  ${libraries.decoder}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DESP32_ETHERNET=true'
+  '-DETH_PHY_TYPE=ETH_PHY_LAN8720'
+  '-DETH_PHY_ADDR=0'
+  '-DETH_PHY_POWER=5'
+  '-DETH_PHY_MDC=23'
+  '-DETH_PHY_MDIO=18'
+  '-DETH_CLK_MODE=ETH_CLOCK_GPIO0_OUT'
+  '-DETH_PHY_COLD_CYCLE'
+  '-DLED_ADDRESSABLE=true'
+  '-DLED_ADDRESSABLE_PIN1=32'
+  '-DLED_ADDRESSABLE_NUM=4'
+  '-DLED_ERROR=3'
+  '-DLED_PROCESSING=3'
+  '-DLED_BROKER=2'
+  '-DLED_NETWORK=1'
+  '-DLED_POWER=0'
+  '-DAttemptBLEConnect=false'
+  '-DTRIGGER_GPIO=4'
+  '-DUSE_MAC_AS_GATEWAY_NAME'
+  '-DGATEWAY_MANUFACTURER="Theengs"'
+  '-DGATEWAY_MODEL="TBRIDGE02"'
+  '-DBOARD_HAS_PSRAM'
+  '-mfix-esp32-psram-cache-issue'
+  '-mfix-esp32-psram-cache-strategy=memw'
+  ;'-DSELF_TEST=true'
+custom_description = 'BLE gateway with external antenna and Ethernet/WiFi connectivity, <a href="https://tbridge02.theengs.io/" target="_blank">user guide</a>'
+custom_hardware = Theengs Bridge gateway ethernet
+custom_img = img/Theengs-Bridge-ble-gateway.png
+
+; DISCLAIMER: This is the default environment for Theengs Plug.
+; Any modifications to this configuration are not covered by warranty.
+; Proceed with caution when making changes.
+;
+; SAFETY WARNING: Do not modify values related to current limits MAX_CURRENT_ACTUATOR or other
+; safety-critical parameters. Doing so may lead to fire hazards or damage to the device.
+[env:theengs-plug]
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32dev
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.decoder}
+  ${libraries.adafruit_neopixel}
+  ${libraries.rn8209}
+build_flags =
+  ${env.build_flags}
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DZsensorRN8209="RN8209"'
+  '-DRN8209_KU=18570'
+  '-DRN8209_KIA=265263'
+  '-DRN8209_EC=26675'
+  '-DTRIGGER_GPIO=4'
+  '-DZactuatorONOFF="ONOFF"'
+  '-DACTUATOR_ON=1'
+  '-DACTUATOR_OFF=0'
+  '-DACTUATOR_BUTTON_TRIGGER_LEVEL=0'
+  '-DACTUATOR_TRIGGER=true'
+  '-DZsensorGPIOInput="GPIOInput"'
+  '-DINPUT_GPIO=4'
+  '-DACTUATOR_ONOFF_GPIO=25'
+  '-DAttemptBLEConnect=false'
+  '-DLED_ADDRESSABLE=true'
+  '-DLED_ADDRESSABLE_PIN1=26'
+  '-DLED_ADDRESSABLE_PIN2=27'
+  '-DLED_ADDRESSABLE_NUM=2'
+  '-DLED_ADDRESSABLE_POWER=16'
+  '-DLED_ERROR=0'
+  '-DLED_PROCESSING=0'
+  '-DLED_BROKER=0'
+  '-DLED_NETWORK=0'
+  '-DLED_ACTUATOR_ONOFF=1'
+  ; Maximum current in A DO NOT MODIFY MAX_CURRENT_ACTUATOR
+  ;-----------------------------
+  '-DMAX_CURRENT_ACTUATOR=15.0'
+  ;-----------------------------
+  '-DWM_PWD_FROM_MAC=true'
+  '-DUSE_MAC_AS_GATEWAY_NAME'
+  '-DDEFAULT_LOW_POWER_MODE=DEACTIVATED'
+  '-DWifiReconnectWatchDog=false' ; Don't reboot on persistent WiFi loss, it would interrupt the relay state
+  '-DGATEWAY_MANUFACTURER="Theengs"'
+  '-DGATEWAY_MODEL="TPLUG01"'
+  '-UZwebUI="WebUI"' ; Disable WebUI
+custom_description = 'Smart Plug, BLE Gateway and energy monitoring, <a href="https://tplug01.theengs.io/" target="_blank">user guide</a>'
+custom_hardware = Theengs Plug
+custom_img = img/Theengs-Plug-OpenMQTTGateway.png
 
 [env:esp32dev-all-test]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/alltest_large.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -127,7 +236,7 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DZactuatorONOFF="ONOFF"'
   '-DACTUATOR_BUTTON_TRIGGER_LEVEL=0'
-  '-ACTUATOR_TRIGGER=true'
+  '-DACTUATOR_TRIGGER=true'
   '-DZactuatorFASTLED="FASTLED"'
   '-DZactuatorPWM="PWM"'
   '-DZsensorINA226="INA226"'
@@ -160,6 +269,7 @@ build_flags =
   '-DMQTT_USER=""'
   '-DMQTT_PASS=""'
   '-DMQTT_PORT="1883"'
+  '-DMDNS_SD=true'
   '-DDEEP_SLEEP_IN_US=120000000' ; Deep sleep for a period of time to conserve battery
   '-DESP32_EXT0_WAKE_PIN=GPIO_NUM_14' ;Should a water leak be detected immediatly wake the ESP32 and report the problem
   '-DESP32_EXT0_WAKE_PIN_STATE=0' ;Should a water leak be detected immediatly wake the ESP32 and report the problem, sensor state to look for wakeup
@@ -172,7 +282,9 @@ build_flags =
 
 [env:esp32dev-rf]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.rc-switch}
@@ -180,11 +292,18 @@ build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayRF="RF"'
   '-DGateway_Name="OMG_ESP32_RF"'
+  '-DvalueAsATopic=true'
 custom_description = RF gateway using RCSwitch library
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-pilight]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+extra_scripts =
+  pre:scripts/add_c_flags.py
+  pre:scripts/add_mlongcalls.py
 board = esp32dev
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.esppilight}
@@ -193,9 +312,14 @@ build_flags =
   '-DZgatewayPilight="Pilight"'
   '-DGateway_Name="OMG_ESP32_Pilight"'
 custom_description = RF gateway using ESPilight library
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-pilight-cc1101]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+extra_scripts =
+  pre:scripts/add_c_flags.py
+  pre:scripts/add_mlongcalls.py
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -208,10 +332,13 @@ build_flags =
   '-DZradioCC1101="CC1101"'
   '-DGateway_Name="OMG_ESP32_Pilight-CC1101"'
 custom_description = Gateway using ESPilight library only, need CC1101
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-somfy-cc1101]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.somfy_remote}
@@ -222,9 +349,14 @@ build_flags =
   '-DZradioCC1101="CC1101"'
   '-DGateway_Name="OMG_ESP32_Somfy-CC1101"'
 custom_description = Gateway using Somfy Remote library, need CC1101
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-pilight-somfy-cc1101]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+extra_scripts =
+  pre:scripts/add_c_flags.py
+  pre:scripts/add_mlongcalls.py
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -239,10 +371,13 @@ build_flags =
   '-DZradioCC1101="CC1101"'
   '-DGateway_Name="OMG_ESP32_Pilight-Somfy-CC1101"'
 custom_description = Gateway using Somfy Remote and ESPilight library, need CC1101
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-weatherstation]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.rfWeatherStation}
@@ -251,10 +386,13 @@ build_flags =
   '-DZgatewayWeatherStation="WeatherStation"'
   '-DGateway_Name="OMG_ESP32_WeatherStation"'
 custom_description = Gateway to retrieve weather station data Ventus W174/W132 (tested), Auriol H13726, Hama EWS 1500, Meteoscan W155/W160 using WeatherStationDataRx
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-gf-sun-inverter]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.emodbus}
@@ -264,9 +402,11 @@ build_flags =
   '-DZgatewayGFSunInverter="GFSunInverter"'
   '-DGateway_Name="OMG_ESP32_GFSunInverter"'
 custom_description = RS232 reading of GridFree Sun Inverter
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-ir]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -277,11 +417,12 @@ build_flags =
   '-DZgatewayIR="IR"'
   '-DGateway_Name="OMG_ESP32_IR"'
 custom_description = Infrared (Emitting and receiving) using IRremoteESP8266
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -290,33 +431,54 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
   '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = Regular BLE gateway with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
+custom_img = img/boards/esp32dev.jpg
+
+[env:esp32dev-ble-broker]
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32dev
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.decoder}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
+  '-DGateway_Name="OMG_ESP32_BLE"'
+  '-DMQTT_BROKER_MODE=true'
+custom_description = MQTT Broker with BLE gateway with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-ble-mqtt-undecoded]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
-  ${libraries.decoder}
 build_flags =
   ${com-esp32.build_flags}
+  '-DBLEDecoder=false'
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
   '-DGateway_Name="OMG_ESP32_BLE"'
   '-DMQTTDecodeTopic="undecoded"'
 custom_description = BLE gateway with the decoding offloaded to Theengs Gateway
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-ble-aws]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -326,22 +488,24 @@ build_flags =
   ${com-esp32.build_flags}
   '-UZmqttDiscovery="HADiscovery"'
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
+  '-DARDUINO_LOOP_STACK_SIZE=17500'
   '-DMQTT_SECURE_DEFAULT=true'
-  '-DMQTT_SECURE_SELF_SIGNED'
   '-DMQTT_CERT_VALIDATE_DEFAULT=true'
+  '-DMQTT_SECURE_SIGNED_CLIENT=true'
   '-DMQTT_SERVER="xxxxxxxxxxxxx-ats.iot.eu-west-2.amazonaws.com"'
   '-DMQTT_PORT="8883"'
   '-DMQTT_USER=""'
   '-DMQTT_PASS=""'
   '-DAWS_IOT=true'
 custom_description = BLE gateway with AWS integration capability
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32feather-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = featheresp32
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -350,16 +514,17 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=13'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=13'
+  '-DLED_PIN_ON=0'
   '-DGateway_Name="OMG_ESP32_FTH_BLE"'
 custom_description =  BLE Gateway
 custom_hardware = ESP32 Feather Adafruit
+custom_img = img/boards/esp32-feather.jpg
 
 [env:esp32-lolin32lite-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = lolin32
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -368,11 +533,11 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=22'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=22'
+  '-DLED_PIN_ON=0'
   '-DGateway_Name="OMG_LOLIN32LITE_BLE"'
 ;; Low power parameters, uncomment and fill credentials
-  '-DDEFAULT_LOW_POWER_MODE=2'
+  '-DDEFAULT_LOW_POWER_MODE=INTERVAL'
 ;  '-DTimeBtwRead=155000'
 ;  '-DScan_duration=2000'
 ;  '-DAttemptBLEConnect=false'
@@ -383,13 +548,14 @@ build_flags =
 ;  '-DMQTT_SERVER="192.168.1.17"'
 ;  '-Dwifi_ssid="WIFI_SSID"'
 ;  '-Dwifi_password="WIFI_PASSWORD"'
-custom_description = Suitable for low power with BLE gateway, [tutorial](https://1technophile.blogspot.com/2021/04/low-power-esp32-ble-gateway.html)
+custom_description = 'Suitable for low power with BLE gateway, <a href="https://1technophile.blogspot.com/2021/04/low-power-esp32-ble-gateway.html" target="_blank">tutorial</a>'
 custom_hardware = LOLIN 32 Lite
+custom_img = img/boards/lolin32-lite.jpg
 
 [env:esp32-olimex-gtw-ble-eth]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-gateway
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -398,18 +564,19 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=33'
-  '-DLED_SEND_RECEIVE_ON=1'
+  '-DLED_PIN=33'
+  '-DLED_PIN_ON=1'
   '-DTRIGGER_GPIO=34'
   '-DESP32_ETHERNET=true'
   '-DGateway_Name="OMG_ESP32_OLM_GTWE"'
 custom_description = BLE gateway using ethernet or wifi
 custom_hardware = OLIMEX ESP32 Gateway
+custom_img = img/boards/olimex-esp32-gateway.jpg
 
 [env:esp32-olimex-gtw-ble-poe]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-poe
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -422,11 +589,12 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_OLM_POE"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = OLIMEX ESP32 Gateway with POE
+custom_img = img/boards/olimex-esp32-poe.jpg
 
 [env:esp32-olimex-gtw-ble-poe-iso]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-poe-iso
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -439,11 +607,12 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_OLM_POE"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = OLIMEX ESP32 Gateway with POE and ISO
+custom_img = img/boards/olimex-esp32-poe-iso.jpg
 
 [env:esp32-wt32-eth01-ble-eth]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-gateway
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -459,11 +628,12 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_WT32-ETH01"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = WT32
+custom_img = img/boards/wt32-eth01.jpg
 
 [env:esp32-olimex-gtw-ble-wifi]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-gateway
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -478,12 +648,13 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_OLM_GTWW"'
 custom_description = BLE gateway using wifi
 custom_hardware = OLIMEX ESP32 Gateway
+custom_img = img/boards/olimex-esp32-gateway.jpg
 
 [env:esp32-m5stick-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = m5stack-core-esp32
-extra_scripts = ${com-esp32.extra_scripts}
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/no_coredump.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -493,24 +664,25 @@ build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
   '-DZgatewayIR="IR"'
-  '-DLED_SEND_RECEIVE=19'
-  '-DLED_SEND_RECEIVE_ON=1'
+  '-DLED_PIN=19'
+  '-DLED_PIN_ON=1'
   '-DTRIGGER_GPIO=35'
   '-DIR_EMITTER_GPIO=17'
-  '-DDEFAULT_LOW_POWER_MODE=0'
+  '-DDEFAULT_LOW_POWER_MODE=ALWAYS_ON'
   '-DGateway_Name="OMG_ESP32_M5STICK_BLE_IR"'
 board_upload.speed = 921600
 custom_description = Expandable module with BLE gateway, display, and little IR emitter
 custom_hardware = M5Stick Grey
+custom_img = img/boards/m5stick.webp
 
 [env:esp32-m5stack-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = m5stack-core-esp32
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
-  ${libraries.m5stack}
+  ${libraries.m5unified}
   ${libraries.ble}
   ${libraries.decoder}
 build_flags =
@@ -518,24 +690,25 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DZsensorGPIOInput="GPIOInput"'
   '-DZboardM5STACK="M5Stack"'
-  '-DLED_SEND_RECEIVE=15'
+  '-DLED_PIN=15'
   '-DTRIGGER_GPIO=37'
   '-DSLEEP_BUTTON=38'
   '-DINPUT_GPIO=39'
-  '-DDEFAULT_LOW_POWER_MODE=0'
+  '-DDEFAULT_LOW_POWER_MODE=ALWAYS_ON'
   '-DGateway_Name="OMG_ESP32_M5STACK_BLE"'
 board_upload.speed = 921600
 custom_description = Expandable module with BLE gateway and display
 custom_hardware = M5Stack Core
+custom_img = img/boards/m5stack-core.webp
 
 [env:esp32-m5tough-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = m5stack-core-esp32
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
-  ${libraries.m5tough}
+  ${libraries.m5unified}
   ${libraries.ble}
   ${libraries.decoder}
 build_flags =
@@ -546,17 +719,26 @@ build_flags =
 board_upload.speed = 921600
 custom_description = Expandable module with BLE gateway and display, suitable for outdoor
 custom_hardware = M5Tough rugged
+custom_img = img/boards/m5tough.webp
 
 [env:esp32-m5stick-c-ble]
 platform = ${com.esp32_platform}
-board = m5stick-c
-extra_scripts = ${com-esp32.extra_scripts}
-board_build.partitions = min_spiffs.csv
+platform_packages = ${com.esp32_platform_packages}
+; The modern framework dropped the "m5stick_c" board variant (no
+; pins_arduino.h), so target the identical ESP32-PICO-D4 "pico32" variant
+; instead — the same silicon the M5StickC-Plus env already uses. M5Unified
+; detects the real StickC at runtime, and OMG defines every StickC GPIO
+; explicitly below, so the variant's pin defaults are irrelevant.
+board = pico32
+; M5Unified is much larger than the old M5StickC lib and overflows min_spiffs'
+; 0x1E0000 app slot (~1.9 MB) once IR is also enabled; use the 0x1F0000 layout
+; the M5StickC-Plus env already uses.
+board_build.partitions = partitions/no_coredump.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
   ${libraries.decoder}
-  ${libraries.m5stickc}
+  ${libraries.m5unified}
   ${libraries.irremoteesp}
 build_flags =
   ${com-esp32.build_flags}
@@ -566,28 +748,29 @@ build_flags =
   '-DZboardM5STICKC="M5StickC"'
   '-DACTUATOR_ONOFF_GPIO=10'
   '-DINPUT_GPIO=37'
-  '-DLED_SEND_RECEIVE=10'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=10'
+  '-DLED_PIN_ON=0'
   '-DSLEEP_BUTTON=39'
   '-DTRIGGER_GPIO=39'
   '-DIR_EMITTER_INVERTED=true'
   '-DIR_EMITTER_GPIO=9'
-  '-DDEFAULT_LOW_POWER_MODE=0'
+  '-DDEFAULT_LOW_POWER_MODE=ALWAYS_ON'
   '-DGateway_Name="OMG_ESP32_M5STICK_C_BLE_IR"'
 board_upload.speed = 1500000
 custom_description = Expandable module with BLE gateway, display, and little IR emitter
 custom_hardware = M5Stick C
+custom_img = img/boards/m5stick-c.webp
 
 [env:esp32-m5stick-cp-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = pico32
-extra_scripts = ${com-esp32.extra_scripts}
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/no_coredump.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
   ${libraries.decoder}
-  ${libraries.m5stickcp}
+  ${libraries.m5unified}
   ${libraries.irremoteesp}
 build_flags =
   ${com-esp32.build_flags}
@@ -597,23 +780,24 @@ build_flags =
   '-DZboardM5STICKCP="M5StickCP"'
   '-DACTUATOR_ONOFF_GPIO=10'
   '-DINPUT_GPIO=37'
-  '-DLED_SEND_RECEIVE=10'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=10'
+  '-DLED_PIN_ON=0'
   '-DSLEEP_BUTTON=39'
   '-DTRIGGER_GPIO=39'
   '-DIR_EMITTER_INVERTED=true'
   '-DIR_EMITTER_GPIO=9'
-  '-DDEFAULT_LOW_POWER_MODE=0'
+  '-DDEFAULT_LOW_POWER_MODE=ALWAYS_ON'
   '-DGateway_Name="OMG_ESP32_M5STICK_CP_BLE_IR"'
 board_upload.speed = 1500000
 custom_description = Expandable module with BLE gateway, display, and little IR emitter
 custom_hardware = M5Stick CP
+custom_img = img/boards/m5stick-c-plus.webp
 
 [env:esp32-m5atom-matrix]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = pico32
-extra_scripts = ${com-esp32.extra_scripts}
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/no_coredump.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -627,19 +811,25 @@ build_flags =
   '-DTRIGGER_GPIO=39'
   '-DSLEEP_BUTTON=39'
   '-DIR_EMITTER_GPIO=12'
-  '-DANEOPIX_IND_DATA_GPIO=27'
-  '-DANEOPIX_IND_NUM_LEDS=25'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=27'
+  '-DLED_ADDRESSABLE_NUM=25'
+  '-DLED_ADDRESSABLE=true'
+  '-DLED_ERROR=4'
+  '-DLED_PROCESSING=3'
+  '-DLED_BROKER=2'
+  '-DLED_NETWORK=1'
+  '-DLED_POWER=0'
   '-DGateway_Name="OMG_ATOM_M"'
 board_upload.speed = 1500000
 custom_description = Compact enclosure ESP32 with BLE gateway
 custom_hardware = M5 ATOM Matrix
+custom_img = img/boards/m5atom-matrix.webp
 
 [env:esp32-m5atom-lite]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = pico32
-extra_scripts = ${com-esp32.extra_scripts}
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/no_coredump.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -653,16 +843,18 @@ build_flags =
   '-DTRIGGER_GPIO=39'
   '-DSLEEP_BUTTON=39'
   '-DIR_EMITTER_GPIO=12'
-  '-DANEOPIX_IND_DATA_GPIO=27'
-  '-DANEOPIX_IND_NUM_LEDS=1'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=27'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
   '-DGateway_Name="OMG_ATOM_L"'
 board_upload.speed = 1500000
 custom_description = Compact enclosure ESP32 with BLE gateway
 custom_hardware = M5 ATOM Lite
+custom_img = img/boards/m5atom-lite.webp
 
 [env:esp32doitv1-aithinker-r01-sx1278]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32doit-devkit-v1
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -711,6 +903,7 @@ board_upload.speed = 921600
 board_upload.port = /dev/cu.usbserial-0001
 board_monitor.speed = 921600
 board_monitor.port = /dev/cu.usbserial-0001
+custom_img = img/boards/esp32doitv1.jpg
 
 [env:esp32doitv1-aithinker-r01-sx1278-hcsr501-test]
 extends = env:esp32doitv1-aithinker-r01-sx1278
@@ -742,6 +935,7 @@ upload_flags =
 
 [env:esp32dev-rtl_433]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -779,9 +973,57 @@ build_flags =
 ;  '-DRADIOLIB_DEBUG=true'<
 ;  '-DRADIOLIB_VERBOSE=true'
 custom_description = Gateway using RTL_433_ESP library, need CC1101
+custom_img = img/boards/esp32dev.jpg
+
+[env:esp32dev-rtl_433-fsk]
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32dev
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.rtl_433_ESP}
+  ${libraries.smartrc-cc1101-driver-lib}
+build_flags =
+  ${com-esp32.build_flags}
+; *** OpenMQTTGateway Config ***
+  ;'-UZmqttDiscovery'          ; disables MQTT Discovery
+  '-DvalueAsATopic=true'       ; MQTT topic includes model and device
+  '-DLOG_LEVEL=LOG_LEVEL_TRACE'
+  '-DGateway_Name="OMG_rtl_433_ESP_FSK"'
+; *** OpenMQTTGateway Modules ***
+  '-DOOK_MODULATION=false' ; FSK modulation activated
+  ;'-DRF_FREQUENCY=915'
+  '-DRF_FREQUENCY=868.300'
+  ;-DRF_FREQUENCY=433.9'
+  '-DZgatewayRTL_433="rtl_433"'
+  '-DZradioCC1101="CC1101"'
+; *** rtl_433_ESP Options ***
+;  '-DRTL_DEBUG=4'             ; rtl_433 verbose mode
+;  '-DRTL_VERBOSE=58'          ; LaCrosse TX141-Bv2, TX141TH-Bv2, TX141-Bv3, TX141W, TX145wsdth sensor
+;  '-DRAW_SIGNAL_DEBUG=true'   ; display raw received messages
+;  '-DMEMORY_DEBUG=true'       ; display memory usage information
+  '-DDEMOD_DEBUG=true'         ; display signal debug info
+;  '-DMY_DEVICES=true'         ; subset of devices
+  '-DPUBLISH_UNPARSED=true'    ; publish unparsed signal details
+;  '-DRSSI_THRESHOLD=12'       ; Apply a delta of 12 to average RSSI level
+;  '-DAVERAGE_RSSI=5000'       ; Display RSSI floor ( Average of 5000 samples )
+  '-DSIGNAL_RSSI=true'         ; Display during signal receive
+  '-DNO_DEAF_WORKAROUND=true'
+; *** RF Module Options ***
+  '-DRF_CC1101="CC1101"'       ; CC1101 Transceiver Module
+;  '-DRF_MODULE_CS=5'          ; pin to be used as chip select
+  '-DRF_MODULE_GDO0=12'        ; CC1101 pin GDO0
+  '-DRF_MODULE_GDO2=27'        ; CC1101 pin GDO2
+; *** RadioLib Options ***
+;  '-DRADIOLIB_DEBUG=true'
+;  '-DRADIOLIB_VERBOSE=true'
+custom_description = Gateway using RTL_433_ESP library and RadioLib with FSK modulation (beta), need CC1101
+custom_img = img/boards/esp32dev.jpg
 
 [env:heltec-rtl_433]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = heltec_wifi_lora_32_V2
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
 board_build.partitions = min_spiffs.csv
@@ -794,7 +1036,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_heltec_rtl_433_ESP"'
+  '-DGateway_Name="OMG_heltec_rtl_433_ESP_OOK"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -808,9 +1050,11 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = Gateway using RTL_433_ESP and RadioLib
 custom_hardware = ESP32 HELTEC LORA32 V2
+custom_img = img/boards/heltec-wifi-lora-32.png
 
 [env:heltec-rtl_433-fsk]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = heltec_wifi_lora_32_V2
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
 board_build.partitions = min_spiffs.csv
@@ -823,7 +1067,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_heltec_rtl_433_ESP"'
+  '-DGateway_Name="OMG_heltec_rtl_433_ESP_FSK"'
   '-DOOK_MODULATION=false' ; FSK modulation activated
   '-DRF_FREQUENCY=915'
   ;-DRF_FREQUENCY=868.300'
@@ -841,11 +1085,12 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = Gateway using RTL_433_ESP and RadioLib with FSK modulation (beta)
 custom_hardware = ESP32 HELTEC LORA32 V2
+custom_img = img/boards/heltec-wifi-lora-32.png
 
 [env:heltec-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = heltec_wifi_lora_32_V2
-extra_scripts = ${com-esp32.extra_scripts}
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -866,9 +1111,11 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = Heltec BLE gateway with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
 custom_hardware = ESP32 HELTEC LORA32 V2
+custom_img = img/boards/heltec-wifi-lora-32.png
 
 [env:lilygo-rtl_433]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = ttgo-lora32-v21
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
 board_build.partitions = min_spiffs.csv
@@ -881,7 +1128,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'    ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_lilygo_rtl_433_ESP"'
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP_OOK"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -895,9 +1142,11 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = For ESP32, Gateway using RTL_433_ESP and RadioLib
 custom_hardware = ESP32 LILYGO LoRa32 V2.1
+custom_img = img/boards/lilygo-lora32-v21.jpg
 
 [env:lilygo-rtl_433-fsk]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = ttgo-lora32-v21
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
 board_build.partitions = min_spiffs.csv
@@ -910,7 +1159,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'    ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_lilygo_rtl_433_ESP"'
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP_FSK"'
   '-DOOK_MODULATION=false' ; FSK modulation activated
   '-DRF_FREQUENCY=915'
   ;-DRF_FREQUENCY=868.300'
@@ -928,11 +1177,110 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = For ESP32, Gateway using RTL_433_ESP and RadioLib with FSK modulation (beta)
 custom_hardware = ESP32 LILYGO LoRa32 V2.1
+custom_img = img/boards/lilygo-lora32-v21.jpg
+
+[env:lilygo-t3-s3-rtl_433]
+platform = espressif32@6.10.0
+board = lilygo-t3-s3
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ssd1306}
+  ${libraries.rtl_433_ESP}
+build_flags =
+  ${com-esp32.build_flags}
+; *** OpenMQTTGateway Config ***
+  ;'-UZmqttDiscovery'          ; disables MQTT Discovery
+  '-DvalueAsATopic=true'    ; MQTT topic includes model and device
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP_OOK"'
+; *** OpenMQTTGateway Modules ***
+  '-DZgatewayRTL_433="rtl_433"'
+  '-DZradioSX127x="SX127x"'
+; *** ssd1306 Display Options ***
+  '-DZdisplaySSD1306="LilyGo_SSD1306"'
+  '-DGenericSSD1306=true'
+;  '-DLOG_TO_OLED=true'         ; Enable log to OLED
+;  '-DJSON_TO_OLED=true'
+;  '-DLOG_LEVEL_OLED=LOG_LEVEL_NOTICE'
+;  '-DDISPLAY_IDLE_LOGO=false'
+;  '-DDISPLAY_BRIGHTNESS=80'
+;  '-DDISPLAY_METRIC=false'
+
+  '-DNO_INT_TEMP_READING=true'
+  ; '-DLED_PIN=37'
+  '-DOLED_SDA=18'               ; SSD1306 pin SDA
+  '-DOLED_SCL=17'               ; SSD1306 pin SCL
+  '-DRF_SX1276="SX1276"'
+  '-DRF_MODULE_SCK=5'
+  '-DRF_MODULE_MISO=3'
+  '-DRF_MODULE_MOSI=6'
+  '-DRF_MODULE_CS=7'
+  '-DRF_MODULE_RST=8'
+  '-DRF_MODULE_DIO0=9'
+  '-DRF_MODULE_DIO1=33'
+  '-DRF_MODULE_DIO2=34'
+  '-DRF_MODULE_DIO3=21'
+  '-DRF_MODULE_DIO4=10'
+  '-DRF_MODULE_DIO5=36'
+custom_description = For ESP32, Gateway using RTL_433_ESP and RadioLib with FSK modulation (beta)
+custom_hardware = ESP32 LILYGO T3-S3 SX1276 v1.0
+custom_img = img/boards/lilygo-t3-s3.jpg
+
+[env:lilygo-t3-s3-rtl_433-fsk]
+platform = espressif32@6.10.0
+board = lilygo-t3-s3
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ssd1306}
+  ${libraries.rtl_433_ESP}
+build_flags =
+  ${com-esp32.build_flags}
+; *** OpenMQTTGateway Config ***
+  ;'-UZmqttDiscovery'          ; disables MQTT Discovery
+  '-DvalueAsATopic=true'    ; MQTT topic includes model and device
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP_FSK"'
+  '-DOOK_MODULATION=false' ; FSK modulation activated
+  '-DRF_FREQUENCY=915'
+  ;-DRF_FREQUENCY=868.300'
+  ;-DRF_FREQUENCY=433.9'
+; *** OpenMQTTGateway Modules ***
+  '-DZgatewayRTL_433="rtl_433"'
+  '-DZradioSX127x="SX127x"'
+; *** ssd1306 Display Options ***
+  '-DZdisplaySSD1306="LilyGo_SSD1306"'
+  '-DGenericSSD1306=true'
+;  '-DLOG_TO_OLED=true'         ; Enable log to OLED
+;  '-DJSON_TO_OLED=true'
+;  '-DLOG_LEVEL_OLED=LOG_LEVEL_NOTICE'
+;  '-DDISPLAY_IDLE_LOGO=false'
+;  '-DDISPLAY_BRIGHTNESS=80'
+;  '-DDISPLAY_METRIC=false'
+
+  '-DNO_INT_TEMP_READING=true'
+  ; '-DLED_PIN=37'
+  '-DOLED_SDA=18'               ; SSD1306 pin SDA
+  '-DOLED_SCL=17'               ; SSD1306 pin SCL
+  '-DRF_SX1276="SX1276"'
+  '-DRF_MODULE_SCK=5'
+  '-DRF_MODULE_MISO=3'
+  '-DRF_MODULE_MOSI=6'
+  '-DRF_MODULE_CS=7'
+  '-DRF_MODULE_RST=8'
+  '-DRF_MODULE_DIO0=9'
+  '-DRF_MODULE_DIO1=33'
+  '-DRF_MODULE_DIO2=34'
+  '-DRF_MODULE_DIO3=21'
+  '-DRF_MODULE_DIO4=10'
+  '-DRF_MODULE_DIO5=36'
+custom_description = For ESP32, Gateway using RTL_433_ESP and RadioLib with FSK modulation (beta)
+custom_hardware = ESP32 LILYGO T3-S3 SX1276 v1.0
+custom_img = img/boards/lilygo-t3-s3.jpg
 
 [env:lilygo-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = ttgo-lora32-v21
-extra_scripts = ${com-esp32.extra_scripts}
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -953,9 +1301,11 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = LilyGo BLE gateway with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
 custom_hardware = ESP32 LILYGO LoRa32 V2.1
+custom_img = img/boards/lilygo-lora32-v21.jpg
 
 [env:esp32dev-multi_receiver]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -979,9 +1329,14 @@ build_flags =
   '-DRF_MODULE_GDO2=27'   ; CC1101 pin GDO2
 ;  '-DRF_MODULE_INIT_STATUS=true'    ; Display transceiver config during startup
 custom_description = Multi RF library with the possibility to switch between RTL_433_ESP, NewRemoteSwitch and RCSwitch, need CC1101
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32dev-multi_receiver-pilight]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+extra_scripts =
+  pre:scripts/add_c_flags.py
+  pre:scripts/add_mlongcalls.py
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -1005,11 +1360,12 @@ build_flags =
   '-DRF_MODULE_GDO2=27'   ; CC1101 pin GDO2
 ;  '-DRF_MODULE_INIT_STATUS=true'    ; Display transceiver config during startup
 custom_description = Multi RF library with the possibility to switch between ESPilight, NewRemoteSwitch and RCSwitch, need CC1101
+custom_img = img/boards/esp32dev.jpg
 
 [env:tinypico-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = tinypico
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1022,10 +1378,13 @@ build_flags =
 board_build.flash_mode = dio
 custom_description = BLE gateway
 custom_hardware = ESP32 TinyPICO
+custom_img = img/boards/tinypico.jpg
 
 [env:ttgo-lora32-v1]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = ttgo-lora32-v1
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ssd1306}
@@ -1042,10 +1401,13 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_LORA"'
 custom_description = LORA communication using arduino-LoRA configurable frequency
 custom_hardware= ESP32 TTGO LORA V1
+custom_img = img/boards/ttgo-lora32-v1.jpg
 
 [env:ttgo-lora32-v21]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = ttgo-lora32-v21
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ssd1306}
@@ -1067,13 +1429,14 @@ build_flags =
 ;  '-DDISPLAY_METRIC=false'
 custom_description = For ESP32, Gateway using LORA
 custom_hardware = ESP32 LILYGO LoRa32 V2.1
+custom_img = img/boards/lilygo-lora32-v21.jpg
 
 [env:ttgo-t-beam]
 # See version pinout differences here
 # https://www.thethingsnetwork.org/forum/t/big-esp32-sx127x-topic-part-3/18436
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = ttgo-t-beam
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1085,11 +1448,11 @@ build_flags =
   '-DZgatewayLORA="LORA"'
   '-DZgatewayBT="BT"'
   '-DGateway_Name="OMG_ESP32_BLE_LORA"'
-  '-DLED_SEND_RECEIVE=21' # T-BEAM board V0.5
-#  '-DLED_SEND_RECEIVE=14' # T-BEAM board  V0.7
-#  '-DLED_SEND_RECEIVE=4' # T-BEAM board  V1.0+
+  '-DLED_PIN=21' # T-BEAM board V0.5
+#  '-DLED_PIN=14' # T-BEAM board  V0.7
+#  '-DLED_PIN=4' # T-BEAM board  V1.0+
   '-DTimeLedON=0.05'
-  '-DLED_SEND_RECEIVE_ON=1' # Set 0 for board V1.0+
+  '-DLED_PIN_ON=1' # Set 0 for board V1.0+
   # for V0.5 and V0.7 ONLY (V1.0+ as onboard AXP202 dedicated chip, need driver)
   # it's a 100K/100K divider (so 2 divider) and connected to GPIO35
   '-DZsensorADC="ADC"'
@@ -1099,10 +1462,13 @@ build_flags =
   '-DTimeBetweenReadingADC=60000'
 custom_description = BLE gateway with battery holder
 custom_hardware = TTGO T BEAM
+custom_img = img/boards/ttgo-t-beam.jpg
 
 [env:heltec-wifi-lora-32]  ; Heltec ESP32 Board with SSD1306 display
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = heltec_wifi_lora_32
+board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.lora}
@@ -1113,9 +1479,9 @@ build_flags =
   '-DZgatewayLORA="LORA"'
   '-DLORA_BAND=868E6'
   '-DGateway_Name="OMG_ESP32_LORA"'
-  '-DLED_SEND_RECEIVE=25'
+  '-DLED_PIN=25'
   '-DTimeLedON=0.1'
-  '-DLED_SEND_RECEIVE_ON=1'
+  '-DLED_PIN_ON=1'
 ; *** ssd1306 Display Options ***
   '-DZdisplaySSD1306="HELTEC_SSD1306"'
 ;  '-DLOG_TO_OLED=true'         ; Enable log to OLED
@@ -1128,10 +1494,10 @@ custom_description = LORA communication using arduino-LoRA
 custom_hardware = ESP32 HELTEC LORA32
 
 ; For testing only, not for production use
+custom_img = img/boards/heltec-wifi-lora-32.png
 [env:shelly-plus1]
 platform = ${com.esp32_solo_platform}
 board = esp32-solo1
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1161,6 +1527,7 @@ build_flags =
   '-DGATEWAY_MODEL="SPLUS1"'
 custom_description = BLE, Relay control, Switch
 custom_hardware = Shelly Plus 1
+custom_img = img/boards/shelly-plus1.jpg
 
 [env:nodemcuv2-all-test]
 platform = ${com.esp8266_platform}
@@ -1249,6 +1616,7 @@ build_flags =
   '-DGateway_Name="OMG_ESP8266_2G"'
 board_build.flash_mode = dout
 custom_description = SMS gateway, need A6/A7 GSM module
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:nodemcuv2-ir]
 platform = ${com.esp8266_platform}
@@ -1264,8 +1632,9 @@ build_flags =
   '-DGateway_Name="OMG_ESP8266_IR"'
 board_build.flash_mode = dout
 custom_description = Infrared gateway using IRremoteESP8266
+custom_img = img/boards/nodemcuv2.jpg
 
-[env:nodemcuv2-rs232]
+[env:nodemcuv2-serial]
 platform = ${com.esp8266_platform}
 board = nodemcuv2
 lib_deps =
@@ -1274,10 +1643,11 @@ lib_deps =
   ${libraries.esp8266_mdns}
 build_flags =
   ${com-esp.build_flags}
-  '-DZgatewayRS232="RS232"'
-  '-DGateway_Name="OMG_ESP8266_RS232"'
+  '-DZgatewaySERIAL="SERIAL"'
+  '-DGateway_Name="OMG_ESP8266_SERIAL"'
 board_build.flash_mode = dout
-custom_description = RS232 gateway
+custom_description = SERIAL gateway
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:avatto-bakeey-ir]
 platform = ${com.esp8266_platform}
@@ -1292,7 +1662,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayIR="IR"'
   '-DTRIGGER_GPIO=13'
-  '-DLED_SEND_RECEIVE=4'
+  '-DLED_PIN=4'
   '-DIR_EMITTER_GPIO=14'
   '-DIR_RECEIVER_GPIO=5'
   '-UMQTTsetMQTT' ;We remove this function to have sufficient FLASH available for OTA, you should also use ESPWifiManualSetup and 'board_build.ldscript = eagle.flash.1m64.ld' to save flash memory and have OTA working
@@ -1300,7 +1670,8 @@ build_flags =
   '-DGateway_Name="OMG_AVATTO_IR"'
 board_build.flash_mode = dout
 custom_description = IR gateway bi directional
-custom_hardware = Avatto Bakey IR first version, [tutorial](https://1technophile.blogspot.com/2020/07/avatto-s06-ir-gateway-compatible-with.html)
+custom_hardware = 'Avatto Bakey IR first version,<a href="https://1technophile.blogspot.com/2020/07/avatto-s06-ir-gateway-compatible-with.html" target="_blank">tutorial</a>'
+custom_img = https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEiWdLlg_I1Fxg8PKa0LNCwj3fDtSCVn50Zqima9QZvJfPpIyr3Rh7cvg_WPzRkZpzP4_Tu9inXfo3e6CbLLLpZzo5yGOUX_zFT0CnopCtyuEgJyHHJLP8ctfm1UyHP3KZJGzRbZul4F9JBX/
 
 [env:nodemcuv2-rf]
 platform = ${com.esp8266_platform}
@@ -1314,8 +1685,10 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF="RF"'
   '-DGateway_Name="OMG_ESP8266_RF"'
+  '-DvalueAsATopic=true'
 board_build.flash_mode = dout
 custom_description = The historic RF gateway using RCSwitch library
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:nodemcuv2-rf-cc1101]
 platform = ${com.esp8266_platform}
@@ -1331,8 +1704,10 @@ build_flags =
   '-DZgatewayRF="RF"'
   '-DZradioCC1101="CC1101"'
   '-DGateway_Name="OMG_ESP8266_RF-CC1101"'
+  '-DvalueAsATopic=true'
 board_build.flash_mode = dout
 custom_description = RF gateway using RCSwitch library with CC1101
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:nodemcuv2-somfy-cc1101]
 platform = ${com.esp8266_platform}
@@ -1350,6 +1725,7 @@ build_flags =
   '-DGateway_Name="OMG_ESP8266_Somfy-CC1101"'
 board_build.flash_mode = dout
 custom_description = Somfy RF gateway using Somfy Remote library, need CC1101
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:manual-wifi-test]
 platform = ${com.esp8266_platform}
@@ -1366,18 +1742,6 @@ build_flags =
   '-DGateway_Name="OMG_TEST_MANUAL_WIFI"'
 board_build.flash_mode = dout
 
-[env:nodemcuv2-mqtt-fw-test]
-platform = ${com.esp8266_platform}
-board = nodemcuv2
-lib_deps =
-  ${com-esp.lib_deps}
-  ${libraries.wifimanager8266}
-build_flags =
-  ${com-esp.build_flags}
-  '-DMQTT_SECURE_SELF_SIGNED'
-  '-DGateway_Name="OMG_TEST_MQTT_FW"'
-board_build.flash_mode = dout
-
 [env:rf-wifi-gateway]
 platform = ${com.esp8266_platform}
 board = nodemcuv2
@@ -1393,7 +1757,7 @@ build_flags =
   '-DRF_RECEIVER_GPIO=5'
 board_build.flash_mode = dout
 custom_description = RF gateway for USB stick using RCSwitch
-custom_hardware = RF Wifi USB stick, [tutorial](https://1technophile.blogspot.com/2019/09/hack-of-rf-wifi-gateway-usb-stick.html)
+custom_hardware = 'RF Wifi USB stick, <a href="https://1technophile.blogspot.com/2019/09/hack-of-rf-wifi-gateway-usb-stick.html" target="_blank">tutorial</a>'
 
 [env:nodemcuv2-rf2]
 platform = ${com.esp8266_platform}
@@ -1409,6 +1773,7 @@ build_flags =
   '-DGateway_Name="OMG_ESP8266_RF2"'
 board_build.flash_mode = dout
 custom_description = KAKU RF gateway using NewRemoteSwitch library
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:nodemcuv2-rf2-cc1101]
 platform = ${com.esp8266_platform}
@@ -1426,9 +1791,10 @@ build_flags =
   '-DGateway_Name="OMG_ESP8266_RF2-CC1101"'
 board_build.flash_mode = dout
 custom_description = KAKU RF gateway using NewRemoteSwitch library, need CC1101
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:nodemcuv2-pilight]
-platform = espressif8266@^2
+platform = ${com.esp8266_platform}
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1439,8 +1805,10 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayPilight="Pilight"'
   '-DGateway_Name="OMG_ESP8266_Pilight"'
+  '-fcommon'
 board_build.flash_mode = dout
 custom_description = Gateway using ESPilight without the need of CC1101
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:nodemcuv2-weatherstation]
 platform = ${com.esp8266_platform}
@@ -1456,6 +1824,7 @@ build_flags =
   '-DGateway_Name="OMG_ESP8266_RF3"'
 board_build.flash_mode = dout
 custom_description = RF gateway using WeatherStationDataRx library
+custom_img = img/boards/nodemcuv2.jpg
 
 [env:sonoff-basic]
 platform = ${com.esp8266_platform}
@@ -1473,11 +1842,12 @@ build_flags =
   '-DACTUATOR_ON=0'
   '-DACTUATOR_ONOFF_DEFAULT=ACTUATOR_ON'
   '-DACTUATOR_BUTTON_TRIGGER_LEVEL=0'
-  '-ACTUATOR_TRIGGER=true'
+  '-DACTUATOR_TRIGGER=true'
   '-DGateway_Name="OMG_SONOFF_RELAY"'
 board_build.flash_mode = dout
 custom_description = Basic Sonoff wifi relay
 custom_hardware = Sonoff Basic R1, R2
+custom_img = img/boards/sonoff-basic.jpg
 
 [env:sonoff-basic-rfr3]
 platform = ${com.esp8266_platform}
@@ -1496,98 +1866,19 @@ build_flags =
   '-DACTUATOR_ON=0'
   '-DACTUATOR_ONOFF_DEFAULT=ACTUATOR_ON'
   '-DACTUATOR_BUTTON_TRIGGER_LEVEL=0'
-  '-ACTUATOR_TRIGGER=true'
+  '-DACTUATOR_TRIGGER=true'
   '-DRF_RECEIVER_GPIO=4'
   '-DZgatewayRF="RF"'
   '-DGateway_Name="OMG_SONOFF_BASIC_RFR3"'
 board_build.flash_mode = dout
-custom_description = Wifi relay and RF receiver using RCSwitch library, [tutorial](https://1technophile.blogspot.com/2019/08/new-sonoff-rfr3-as-433tomqtt-gateway.html)
-custom_hardware = Sonoff Basic RFR3, [tutorial](https://1technophile.blogspot.com/2019/08/new-sonoff-rfr3-as-433tomqtt-gateway.html)
-
-[env:atmega-all-test]
-platform = ${com.atmelavr_platform}
-board = megaatmega2560
-lib_deps =
-  ${com-arduino.lib_deps}
-  ${libraries.irremote}
-  ${libraries.rfm69}
-  ${libraries.rfm69spi}
-  ${libraries.rfm69_low-power}
-  ${libraries.rc-switch}
-  ${libraries.newremoteswitch}
-  ${libraries.bme280}
-  ${libraries.bmp180}
-  ${libraries.htu21}
-  ${libraries.ahtx0}
-  ${libraries.unifiedsensor}
-  ${libraries.dht}
-  ${libraries.tsl2561}
-  ${libraries.a6lib}
-  ${libraries.ina226}
-  ${libraries.fastled}
-  ${libraries.onewire}
-  ${libraries.dallastemperature}
-  ${libraries.rfWeatherStation}
-  ${libraries.stl}
-build_flags =
-  ${com-arduino.build_flags}
-  '-DZgatewayRF="RF"'
-  '-DZgatewayRF="RF315"'
-  '-DZgatewayRF2="RF2"'
-  '-DZgatewayIR="IR"'
-  '-DZactuatorONOFF="ONOFF"'
-  '-DZactuatorFASTLED="FASTLED"'
-  '-DZactuatorPWM="PWM"'
-  '-DZsensorINA226="INA226"'
-  '-DZsensorHCSR501="HCSR501"'
-  '-DZsensorADC="ADC"'
-  '-DZsensorBH1750="BH1750"'
-  '-DZsensorBME280="BME280"'
-  '-DZsensorHTU21="HTU21"'
-  '-DZsensorAHTx0="AHTx0"'
-  '-DZsensorTSL2561="TSL2561"'
-  '-DZsensorDHT="DHT"'
-  '-DZsensorDS1820="DS1820"'
-  '-DZgatewayRFM69="RFM69"'
-  '-DZgatewayWeatherStation="WeatherStation"'
-  '-DZsensorGPIOInput="GPIOInput"'
-  ;'-DZsensorGPIOKeyCode="GPIOKeyCode"'
-  '-DZmqttDiscovery="HADiscovery"'
-  '-DsimplePublishing=true'
-  '-DGateway_Name="OMG_ATMEGA_ALL"'
-  '-UZmqttDiscovery="HADiscovery"'
-
-[env:uno-rf]
-platform = ${com.atmelavr_platform}
-board = uno
-lib_deps =
-  ${com-arduino.lib_deps}
-  ${libraries.rc-switch}
-build_flags =
-  ${com-arduino-low-memory.build_flags}
-  '-UZmqttDiscovery="HADiscovery"'
-  '-DZgatewayRF="RF"'
-  '-DGateway_Name="OMG_1_RF"'
-  '-DDISABLE_LOGGING'
-custom_description = RF gateway based on RCSwitch
-
-[env:uno-fastled]
-platform = ${com.atmelavr_platform}
-board = uno
-lib_deps =
-  ${com-arduino.lib_deps}
-  ${libraries.fastled}
-build_flags =
-  ${com-arduino-low-memory.build_flags}
-  '-DGateway_Name="OMG_1_FL"'
-  '-DZactuatorFASTLED="FASTLED"'
-  '-UZmqttDiscovery="HADiscovery"'
-custom_description = FastLed control
+custom_description = 'Wifi relay and RF receiver using RCSwitch library, <a href="https://1technophile.blogspot.com/2019/08/new-sonoff-rfr3-as-433tomqtt-gateway.html" target="_blank">tutorial</a>'
+custom_hardware = 'Sonoff Basic RFR3, <a href="https://1technophile.blogspot.com/2019/08/new-sonoff-rfr3-as-433tomqtt-gateway.html" target="_blank">tutorial</a>'
+custom_img = img/boards/sonoff-rfr3.jpg
 
 [env:esp32dev-ble-datatest]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1596,17 +1887,19 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
   '-DTimeBtwRead=0'
   '-DScan_duration=3000'
   '-DAttemptBLEConnect=false'
   '-DpubBLEAdvData=true'
   '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = Default BLE gateway with additional servicedata, manufacturerdata and service uuid for analysing decoding issues
+custom_img = img/boards/esp32dev.jpg
 
 [env:esp32s3-dev-c1-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-s3-devkitc-1
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1616,15 +1909,37 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DANEOPIX_IND_DATA_GPIO=48'
-  '-DANEOPIX_IND_NUM_LEDS=1'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=48'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
   '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = BLE gateway on the S3
+custom_img = img/boards/esp32s3-devkit-c1.png
+
+[env:esp32s3-m5stack-stamps3]
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32-s3-devkitc-1
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.decoder}
+  ${libraries.adafruit_neopixel}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DLED_ADDRESSABLE_PIN1=21'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
+  '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
+  '-DGateway_Name="OMG_ESP32_BLE"'
+custom_description = BLE gateway on the M5Stack StampS3
+custom_img = img/boards/m5stamp-s3.webp
 
 [env:esp32s3-atomS3U]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = m5stack-atoms3
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1636,9 +1951,9 @@ build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
   '-DZgatewayIR="IR"'
-  '-DANEOPIX_IND_DATA_GPIO=35'
-  '-DANEOPIX_IND_NUM_LEDS=1'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=35'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
   '-DTRIGGER_GPIO=41'
   '-DIR_EMITTER_GPIO=12'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
@@ -1646,9 +1961,11 @@ build_flags =
 board_upload.speed = 921600
 custom_description = USB module with BLE gateway, and IR emitter
 custom_hardware = AtomS3U ESP32S3
+custom_img = img/boards/m5atoms3u.webp
 
 [env:esp32c3-dev-m1-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-c3-devkitm-1
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -1659,15 +1976,17 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DANEOPIX_IND_DATA_GPIO=8'
-  '-DANEOPIX_IND_NUM_LEDS=1'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=8'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
   '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = BLE gateway on the C3
+custom_img = img/boards/esp32c3-devkit-m1.png
 
 [env:airm2m_core_esp32c3]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = airm2m_core_esp32c3
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -1678,15 +1997,17 @@ build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
   '-DLED_INFO=19'
-  '-DLED_SEND_RECEIVE=20'
+  '-DLED_PIN=20'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
   '-DGateway_Name="OMG_AirM2M_Core_ESP32C3"'
 custom_description = BLE gateway on the C3
 custom_hardware = AirM2M ESP32C3-CORE
 
 ; Espressiv ESP32-C3-DevKitC-02
+custom_img = img/boards/airm2m.png
 [env:esp32c3-dev-c2-ble]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-c3-devkitm-1
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -1697,15 +2018,16 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DANEOPIX_IND_DATA_GPIO=8'
-  '-DANEOPIX_IND_NUM_LEDS=1'
- ; '-DANEOPIX_BRIGHTNESS=10'   ; 0 - 255, default 20
+  '-DLED_ADDRESSABLE_PIN1=8'
+  '-DLED_ADDRESSABLE_NUM=1'
+ ; '-DDEFAULT_ADJ_BRIGHTNESS=10'   ; 0 - 255, default 20
   '-DANEOPIX_COLOR_SCHEME=2'   ; blue based signalling colors
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE=true'
   '-DNO_INT_TEMP_READING=true' ; No internal temperature reading on ESP32 C3 or S3
   '-DTRIGGER_GPIO=7'
   '-DGateway_Name="OpenMQTTGateway_ESP32C3_DKC02"'
 custom_description = BLE gateway on Espressiv ESP32-C3-DevKitC-02
+custom_img = img/boards/esp32c3-devkit-c02.png
 
 [env:esp32c3-dev-c2-ble-no-serial]
 extends = env:esp32c3-dev-c2-ble
@@ -1716,8 +2038,10 @@ build_flags =
 custom_description = BLE gateway on Espressiv ESP32-C3-DevKitC-02 without logging
 
 ; Wemos Lolin C3 mini v2.1.0
+custom_img = img/boards/esp32c3-devkit-c02.png
 [env:esp32c3_lolin_mini]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = lolin_c3_mini
 board_build.partitions = min_spiffs.csv
 monitor_speed = 115200
@@ -1729,11 +2053,11 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DANEOPIX_IND_DATA_GPIO=7'
-  '-DANEOPIX_IND_NUM_LEDS=1'
- ; '-DANEOPIX_BRIGHTNESS=10'  ; 0 - 255, default 20
+  '-DLED_ADDRESSABLE_PIN1=7'
+  '-DLED_ADDRESSABLE_NUM=1'
+ ; '-DDEFAULT_ADJ_BRIGHTNESS=10'  ; 0 - 255, default 20
   '-DANEOPIX_COLOR_SCHEME=1'  ; Alternative LED colour scheme: 2 = blue/gold. 1 = green/gold
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE=true'
 ; The momentary switch on the board is connected to GPIO9
   '-DTRIGGER_GPIO=9'
   '-DNO_INT_TEMP_READING=true' ; No internal temperature on ESP32 C3 or S3
@@ -1745,6 +2069,7 @@ build_flags =
   '-DWM_DEBUG=0'  ; disable serial logging.
 custom_description = BLE gateway on ESP32C3
 custom_hardware = Wemos Lolin C3 mini v2.1.0
+custom_img = img/boards/lolin-c3-mini.jpg
 
 [env:esp32c3_lolin_mini_with_serial]
 extends = env:esp32c3_lolin_mini
@@ -1754,9 +2079,12 @@ build_flags =
 ; Serial output via USB
   '-DCONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=true'
   '-DCONFIG_ESP_CONSOLE_UART=ESP_CONSOLE_USB_SERIAL_JTAG'
+custom_img = img/boards/lolin-c3-mini.jpg
 
 [env:esp32c3-m5stamp]
+; https://docs.m5stack.com/en/core/stamp_c3
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32-c3-devkitm-1
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -1769,18 +2097,44 @@ build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
   '-DTRIGGER_GPIO=3'
-  '-DANEOPIX_IND_DATA_GPIO=2'
-  '-DANEOPIX_IND_NUM_LEDS=1'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=2'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
   '-DUSE_MAC_AS_GATEWAY_NAME'
 custom_description = BLE gateway on ESP32C3
 custom_hardware = M5Stamp C3
+custom_img = img/boards/m5stamp-c3.webp
+
+[env:esp32c3u-m5stamp]
+; https://docs.m5stack.com/en/core/stamp_c3u
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32-c3-devkitm-1
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.wifimanager32}
+  ${libraries.ble}
+  ${libraries.decoder}
+  ${libraries.adafruit_neopixel}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DTRIGGER_GPIO=9'
+  '-DLED_ADDRESSABLE_PIN1=2'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
+  '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
+  '-DUSE_MAC_AS_GATEWAY_NAME'
+custom_description = BLE gateway on ESP32C3
+custom_hardware = M5Stamp C3U
+custom_img = img/boards/m5stamp-c3u.webp
 
 [env:thingpulse-espgateway]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1790,8 +2144,8 @@ lib_deps =
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
   '-DGateway_Name="OMG_THINGPULSE_ETH_BLE"'
   '-DESP32_ETHERNET=true'
   '-DETH_PHY_TYPE=ETH_PHY_LAN8720'
@@ -1800,32 +2154,81 @@ build_flags =
   '-DETH_PHY_MDC=23'
   '-DETH_PHY_MDIO=18'
   '-DETH_CLK_MODE=ETH_CLOCK_GPIO16_OUT'
-  '-DANEOPIX_IND_DATA_GPIO=32'
-  '-DANEOPIX_IND_NUM_LEDS=4'
-  '-DANEOPIX_INFO_LED=0'
-  '-DANEOPIX_SEND_RECEIVE_LED=1'
-  '-DANEOPIX_ERROR_LED=2'
-  '-DANEOPIX_BRIGHTNESS=255'
-  '-DRGB_INDICATORS=true'
+  '-DLED_ADDRESSABLE_PIN1=32'
+  '-DLED_ADDRESSABLE_NUM=4'
+  '-DLED_BROKER=0'
+  '-DLED_PROCESSING=1'
+  '-DLED_ERROR=2'
+  '-DDEFAULT_ADJ_BRIGHTNESS=255'
+  '-DLED_ADDRESSABLE=true'
 ;  '-DsimplePublishing=true'
 custom_description = BLE Gateway using ethernet or wifi with external antenna
 custom_hardware = ThingPulse gateway single ESP32
+custom_img = img/boards/thingpulse-espgateway.jpg
 
 [env:esp32dev-ble-idf]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 framework = arduino, espidf
 board = esp32dev
-extra_scripts = ${com-esp32.extra_scripts}
 board_build.partitions = partitions/min_spiffs.csv
+board_build.embed_txtfiles =
+    managed_components/espressif__esp_insights/server_certs/https_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
 lib_deps =
   ${com-esp32.lib_deps}
-  ${libraries.ble}
   ${libraries.decoder}
+  https://github.com/h2zero/esp-nimble-cpp/archive/2.5.0.zip
+  h2zero/NimBLEOta@0.2.0
 build_flags =
   ${com-esp32.build_flags}
   '-DZgatewayBT="BT"'
-  '-DLED_SEND_RECEIVE=2'
-  '-DLED_SEND_RECEIVE_ON=0'
+  '-DLED_PIN=2'
+  '-DLED_PIN_ON=0'
   '-DGateway_Name="OMG_ESP32_BLE"'
   '-DUSE_BLUFI=1'
-custom_description = Regular BLE gateway with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
+  '-DenableMultiGTWSync=false'
+custom_description = Regular BLE gateway based on esp-idf with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
+custom_img = img/boards/esp32dev.jpg
+
+[env:isno-super]
+platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
+board = esp32-s3-devkitc-1
+board_build.flash_size = 8MB
+board_upload.flash_size = 8MB
+board_build.partitions = default_8MB.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.rc-switch}
+  ${libraries.smartrc-cc1101-driver-lib}
+  ${libraries.rtl_433_ESP}
+  ${libraries.newremoteswitch}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayRF="RF"'
+  '-DZgatewayRF2="RF2"'
+  '-DZgatewayRTL_433="RTL_433"'
+  '-DZradioCC1101="CC1101"'
+  '-DGateway_Name="OMG_ISNO_Super"'
+  '-DvalueAsATopic=true'
+  '-DNO_INT_TEMP_READING=true' ; internal temperature sensor not building on ESP32-S3
+  '-DRF_CC1101="CC1101"'
+; ISNO Super: two CC1101 share one SPI bus, combined on a single antenna through an LC diplexer
+  '-DRF_MODULE_SCK=4'
+  '-DRF_MODULE_MISO=5'
+  '-DRF_MODULE_MOSI=6'
+; active radio = 868 MHz (RadioLib / rtl_433 path)
+  '-DRF_MODULE_CS=7'
+  '-DRF_MODULE_GDO0=1'
+  '-DRF_MODULE_GDO2=2'
+; same pins for the ELECHOUSE path (ZgatewayRF / ZgatewayRF2)
+  '-DRF_CC1101_SCK=4'
+  '-DRF_CC1101_MISO=5'
+  '-DRF_CC1101_MOSI=6'
+  '-DRF_CC1101_CS=7'
+; park the 433 MHz radio, CS held high by commonRF.cpp
+  '-DRF_MODULE_SECONDARY_CS=15'
+custom_description = ISNO Super, ESP32-S3 with two CC1101 (433 MHz + 868/915 MHz) combined on one antenna through an LC diplexer; the 868/915 MHz radio is active (868 in the EU, 915 in the US), the 433 MHz radio is parked in this environment
diff --git a/examples/LoraWaterCounter/OpenGatewaySensorCounter.ino b/examples/LoraWaterCounter/OpenGatewaySensorCounter.ino
new file mode 100644
index 0000000..329be40
--- /dev/null
+++ b/examples/LoraWaterCounter/OpenGatewaySensorCounter.ino
@@ -0,0 +1,199 @@
+#include <Adafruit_Sensor.h>
+#include <DHT.h>
+#include <DHT_U.h>
+#include <LoRa.h>
+#include <SPI.h>
+#include <WiFi.h>
+#include <Wire.h>
+#include <stdio.h>
+
+#include "SSD1306.h"
+
+//LoRa pins
+#define SCK  5 // GPIO5  -- SX1278's SCK
+#define MISO 19 // GPIO19 -- SX1278's MISnO
+#define MOSI 27 // GPIO27 -- SX1278's MOSI
+#define SS   18 // GPIO18 -- SX1278's CS
+#define RST  23 // GPIO14 -- SX1278's RESET
+#define DI0  26 // GPIO26 -- SX1278's IRQ(Interrupt Request)
+#define BAND 433E6
+
+//OLED pins
+#define OLED_SDA 21
+#define OLED_SCL 22
+//#define OLED_RST 16
+
+#define LED 25
+
+#define DHT_PIN  14
+#define DHT_TYPE DHT22
+
+#define CNT_PIN 34
+
+#define BAT_PIN 35
+
+const int MAX_ANALOG_VAL = 4095;
+const float MAX_BATTERY_VOLTAGE = 4.2;
+
+int cntpkt = 0;
+unsigned long counter = 0;
+unsigned long last_interrupt_time = 0;
+int pulse_seen = 0; // pulse detected by interrupt function
+int bounce_delay_ms = 100;
+
+SSD1306 display(0x3c, OLED_SDA, OLED_SCL);
+String rssi = "RSSI --";
+String packSize = "--";
+String packet;
+
+DHT_Unified dht(DHT_PIN, DHT_TYPE); // Initialize the "dht" object with sensor pin and DHT type (11/22)
+
+void ICACHE_RAM_ATTR bounceCheck();
+
+void setup() {
+  pinMode(LED, OUTPUT);
+
+  //pinMode(OLED_RST, OUTPUT);
+  //digitalWrite(OLED_RST, LOW); // set GPIO16 low to reset OLED
+  //delay(50);
+  //digitalWrite(OLED_RST, HIGH); // while OLED is running, must set GPIO16 in high
+
+  Serial.begin(115200);
+  while (!Serial);
+  Serial.println();
+  Serial.println("LoRa Sender Test");
+
+  SPI.begin(SCK, MISO, MOSI, SS);
+  LoRa.setPins(SS, RST, DI0);
+  if (!LoRa.begin(BAND)) {
+    Serial.println("Starting LoRa failed!");
+    while (1);
+  }
+
+  Serial.println("init ok");
+  display.init();
+  display.flipScreenVertically();
+  display.setFont(ArialMT_Plain_10);
+
+  pinMode(BAT_PIN, INPUT);
+  pinMode(CNT_PIN, INPUT_PULLUP);
+
+  attachInterrupt(CNT_PIN, bounceCheck, RISING);
+
+  dht.begin();
+  sensor_t sensor;
+  dht.temperature().getSensor(&sensor);
+  Serial.println(F("------------------------------------"));
+  Serial.println(F("Temperature Sensor"));
+  Serial.print(F("Sensor Type: "));
+  Serial.println(sensor.name);
+  Serial.print(F("Driver Ver:  "));
+  Serial.println(sensor.version);
+  Serial.print(F("Unique ID:   "));
+  Serial.println(sensor.sensor_id);
+  Serial.print(F("Max Value:   "));
+  Serial.print(sensor.max_value);
+  Serial.println(F("°C"));
+  Serial.print(F("Min Value:   "));
+  Serial.print(sensor.min_value);
+  Serial.println(F("°C"));
+  Serial.print(F("Resolution:  "));
+  Serial.print(sensor.resolution);
+  Serial.println(F("°C"));
+  Serial.println(F("------------------------------------"));
+  // Print humidity sensor details.
+  dht.humidity().getSensor(&sensor);
+  Serial.println(F("Humidity Sensor"));
+  Serial.print(F("Sensor Type: "));
+  Serial.println(sensor.name);
+  Serial.print(F("Driver Ver:  "));
+  Serial.println(sensor.version);
+  Serial.print(F("Unique ID:   "));
+  Serial.println(sensor.sensor_id);
+  Serial.print(F("Max Value:   "));
+  Serial.print(sensor.max_value);
+  Serial.println(F("%"));
+  Serial.print(F("Min Value:   "));
+  Serial.print(sensor.min_value);
+  Serial.println(F("%"));
+  Serial.print(F("Resolution:  "));
+  Serial.print(sensor.resolution);
+  Serial.println(F("%"));
+  Serial.println(F("------------------------------------"));
+
+  delay(1500);
+}
+
+void loop() {
+  sensors_event_t event1, event2;
+
+  display.clear();
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.setFont(ArialMT_Plain_10);
+
+  display.drawString(0, 0, "Sending packet: ");
+  display.drawString(90, 0, String(cntpkt));
+
+  String NodeId = WiFi.macAddress();
+  // float temp = dht.readTemperature();
+  // float hum = dht.readHumidity();
+  float battery = getBattery();
+
+  dht.temperature().getEvent(&event1);
+  if (isnan(event1.temperature)) {
+    Serial.println(F("Error reading temperature!"));
+  } else {
+    Serial.print(F("Temperature: "));
+    Serial.print(event1.temperature);
+    Serial.println(F("°C"));
+  }
+  // Get humidity event and print its value.
+  dht.humidity().getEvent(&event2);
+  if (isnan(event2.relative_humidity)) {
+    Serial.println(F("Error reading humidity!"));
+  } else {
+    Serial.print(F("Humidity: "));
+    Serial.print(event2.relative_humidity);
+    Serial.println(F("%"));
+  }
+
+  // send packet
+  LoRa.beginPacket();
+
+  String msg = "{\"model\":\"ESP32CNT\",\"id\":\"" + NodeId + "\",\"count\":\"" + String(counter) + "\",\"tempc\":\"" + String(event1.temperature) + "\",\"hum\":\"" + String(event2.relative_humidity) + "\",\"batt\":\"" + String(battery) + "\"}";
+  // Send json string
+  LoRa.print(msg);
+  LoRa.endPacket();
+
+  Serial.println(msg);
+
+  display.drawString(0, 15, String(NodeId));
+  display.drawString(0, 30, "count: " + String(counter));
+  display.drawString(0, 45, "battery: " + String(battery) + " %");
+  display.display();
+
+  delay(5000);
+
+  cntpkt++;
+
+  digitalWrite(LED, HIGH); // turn the LED on (HIGH is the voltage level)
+  delay(1000); // wait for a second
+  digitalWrite(LED, LOW); // turn the LED off by making the voltage LOW
+  //delay(60000); // wait for 60 seconds
+  delay(6000);
+}
+
+void ICACHE_RAM_ATTR bounceCheck() {
+  unsigned long interrupt_time = millis();
+  if (interrupt_time - last_interrupt_time > bounce_delay_ms) counter++; // void loop() then notes pulse == 1 and takes action
+  last_interrupt_time = interrupt_time;
+}
+
+float getBattery(void) {
+  int rawValue = analogRead(BAT_PIN);
+
+  float voltageLevel = (rawValue / 4095.0) * 2 * 1.1 * 3.3; // calculate voltage level
+  float perc = voltageLevel / MAX_BATTERY_VOLTAGE * 100;
+
+  return (perc);
+}
diff --git a/examples/LoraWaterCounter/README.md b/examples/LoraWaterCounter/README.md
new file mode 100644
index 0000000..5470f95
--- /dev/null
+++ b/examples/LoraWaterCounter/README.md
@@ -0,0 +1,65 @@
+# OpenMQTTGateway LoRa Node Example
+This repository contains an example of a LoRa node program designed for the ESP32 platform. 
+The program reads the DHT22 temperature and humidity, the battery level and  water consumption via reed switch, packages the data into a JSON format, and sends it over LoRa.
+
+## Features:
+* Uses an SX12XX LoRa module.
+* Displays packet sending status, counter and battery level data on an SSD1306 OLED display.
+* Sends the ESP32's MAC address as the node ID.
+* Sends temperature data in Celsius.
+
+## Hardware Requirements:
+* ESP32 development board.
+* SX12XX LoRa module.
+* SSD1306 OLED display.
+
+## Pin Configuration: (Lilygo LoRa32 V2.1_1.6)
+* SCK  - GPIO5
+* MISO - GPIO19
+* MOSI - GPIO27
+* SS   - GPIO18
+* RST  - GPIO23
+* DI0  - GPIO26
+
+## Setup:
+### Hardware Setup:
+
+Connect the SX1278 LoRa module and the SSD1306 OLED display to the ESP32 according to the pin configuration.
+Ensure that the OLED display is powered correctly.
+
+### Software Setup:
+
+* Clone this repository.
+* Open the provided node program with PlatformIO
+* Upload the program to your ESP32.
+
+## Usage:
+Power on the ESP32.
+The OLED display will show the status of the packet being sent and the current temperature reading.
+The built-in LED on the ESP32 will blink once every time a packet is sent.
+Monitor the serial output (at 115200 baud rate) to see the JSON formatted data being sent.
+
+If you use arduino load ino file.
+
+## Data Format:
+The data is sent in the following JSON format:
+
+```json
+{
+  "model": "ESP32CNT",
+  "id": "ESP32_MAC_ADDRESS",
+  "count": "COUNTER_IN_LITER",
+  "tempc": "TEMPERATURE_IN_CELSIUS",
+  "hum": "HUMIDITY_IN_PERCENTAGE",
+  "batt": "BATTERY_IN_PERCENTAGE"
+}
+```
+
+## Troubleshooting:
+LoRa Initialization Failed: Ensure that the SX1278 LoRa module is connected correctly and powered on.
+OLED Display Not Working: Check the connections and ensure that the display is powered correctly.
+No Temperature Data: Ensure that the ESP32's internal temperature sensor is functional.
+Contributing:
+Feel free to contribute to this example by opening issues or submitting pull requests. Any feedback or improvements are welcome!
+
+I hope this README helps users understand and use your program! Adjustments can be made as necessary to fit any additional details or changes.
diff --git a/examples/LoraWaterCounter/platformio.ini b/examples/LoraWaterCounter/platformio.ini
new file mode 100644
index 0000000..77aa265
--- /dev/null
+++ b/examples/LoraWaterCounter/platformio.ini
@@ -0,0 +1,36 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:ttgo-lora32-v1]
+platform = espressif32
+board = ttgo-lora32-v1
+framework = arduino
+lib_deps =
+    https://github.com/sandeepmistry/arduino-LoRa.git#f4a1d27
+    https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
+monitor_speed = 115200
+
+[env:ttgo-lora32-v21]
+platform = espressif32
+board = ttgo-lora32-v21
+framework = arduino
+lib_deps =
+    https://github.com/sandeepmistry/arduino-LoRa.git#f4a1d27
+    https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
+monitor_speed = 115200
+
+[env:heltec-wifi-lora-32]  ; Heltec ESP32 Board with SSD1306 display
+platform = espressif32
+board = heltec_wifi_lora_32
+framework = arduino
+lib_deps =
+    https://github.com/sandeepmistry/arduino-LoRa.git#f4a1d27
+    https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
+monitor_speed = 115200
\ No newline at end of file
diff --git a/examples/LoraWaterCounter/src/main.cpp b/examples/LoraWaterCounter/src/main.cpp
new file mode 100644
index 0000000..c62cf5e
--- /dev/null
+++ b/examples/LoraWaterCounter/src/main.cpp
@@ -0,0 +1,137 @@
+#include <LoRa.h>
+#include <SPI.h>
+#include <WiFi.h>
+#include <Wire.h>
+#include <stdio.h>
+
+#include "SSD1306.h"
+#include "rom/ets_sys.h"
+#include "soc/rtc_cntl_reg.h"
+#include "soc/sens_reg.h"
+
+#define SCK  5 // GPIO5  -- SX1278's SCK
+#define MISO 19 // GPIO19 -- SX1278's MISnO
+#define MOSI 27 // GPIO27 -- SX1278's MOSI
+#define SS   18 // GPIO18 -- SX1278's CS
+#define RST  23 // GPIO23 -- SX1278's RESET
+#define DI0  26 // GPIO26 -- SX1278's IRQ(Interrupt Request)
+#define BAND 433E6
+
+//OLED pins
+#define OLED_SDA 21
+#define OLED_SCL 22
+//#define OLED_RST 16
+
+#define LED 25
+
+#define DHT_PIN  12
+#define DHT_TYPE DHT22
+
+#define CNT_PIN 34
+
+#define BAT_PIN 35
+
+const int MAX_ANALOG_VAL = 4095;
+const float MAX_BATTERY_VOLTAGE = 4.2;
+
+int cntpkt = 0;
+unsigned long counter = 0;
+unsigned long last_interrupt_time = 0;
+int pulse_seen = 0; // pulse detected by interrupt function
+int bounce_delay_ms = 100;
+
+SSD1306 display(0x3c, OLED_SDA, OLED_SCL);
+String rssi = "RSSI --";
+String packSize = "--";
+String packet;
+
+DHT dht(DHT_PIN, DHT_TYPE); // Initialize the "dht" object with sensor pin and DHT type (11/22)
+
+void ICACHE_RAM_ATTR bounceCheck();
+
+void setup() {
+  pinMode(LED, OUTPUT);
+
+  //pinMode(OLED_RST, OUTPUT);
+  //digitalWrite(OLED_RST, LOW); // set GPIO16 low to reset OLED
+  //delay(50);
+  //digitalWrite(OLED_RST, HIGH); // while OLED is running, must set GPIO16 in high
+
+  Serial.begin(115200);
+  while (!Serial);
+  Serial.println();
+  Serial.println("LoRa Sender Test");
+
+  SPI.begin(SCK, MISO, MOSI, SS);
+  LoRa.setPins(SS, RST, DI0);
+  if (!LoRa.begin(BAND)) {
+    Serial.println("Starting LoRa failed!");
+    while (1);
+  }
+
+  Serial.println("init ok");
+  display.init();
+  display.flipScreenVertically();
+  display.setFont(ArialMT_Plain_10);
+
+  pinMode(BAT_PIN, INPUT);
+  pinMode(CNT_PIN, INPUT_PULLUP);
+
+  attachInterrupt(CNT_PIN, bounceCheck, RISING);
+
+  delay(1500);
+}
+
+void loop() {
+  display.clear();
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.setFont(ArialMT_Plain_10);
+
+  display.drawString(0, 0, "Sending packet: ");
+  display.drawString(90, 0, String(cntpkt));
+
+  String NodeId = WiFi.macAddress();
+  float temp = dht.readTemperature();
+  float hum = dht.readHumidity();
+  float battery = getBattery();
+  // send packet
+  LoRa.beginPacket();
+  // Build json string to send
+  // Remove this line for test
+
+  String msg = "{\"model\":\"ESP32CNT\",\"id\":\"" + NodeId + "\",\"count\":\"" + String(counter) + "\",\"tempc\":\"" + String(temp) + "\",\"hum\":\"" + String(hum) + "\",\"batt\":\"" + String(battery) + "\"}";
+  // Send json string
+  LoRa.print(msg);
+  LoRa.endPacket();
+
+  Serial.println(msg);
+
+  display.drawString(0, 15, String(NodeId));
+  display.drawString(0, 30, "count: " + String(counter));
+  display.drawString(0, 45, "battery: " + String(battery) + " %");
+  display.display();
+
+  delay(5000);
+
+  cntpkt++;
+
+  digitalWrite(LED, HIGH); // turn the LED on (HIGH is the voltage level)
+  delay(1000); // wait for a second
+  digitalWrite(LED, LOW); // turn the LED off by making the voltage LOW
+  delay(60000); // wait for 60 seconds
+}
+
+void ICACHE_RAM_ATTR bounceCheck() {
+  unsigned long interrupt_time = millis();
+  if (interrupt_time - last_interrupt_time > bounce_delay_ms) counter++; // void loop() then notes pulse == 1 and takes action
+  last_interrupt_time = interrupt_time;
+}
+
+float getBattery(void) {
+  int rawValue = analogRead(BAT_PIN);
+
+  float voltageLevel = (rawValue / 4095.0) * 2 * 1.1 * 3.3; // calculate voltage level
+  float perc = voltageLevel / MAX_BATTERY_VOLTAGE * 100;
+
+  return (perc);
+}
diff --git a/lib/LEDManager/LEDManager.cpp b/lib/LEDManager/LEDManager.cpp
new file mode 100644
index 0000000..4505bdd
--- /dev/null
+++ b/lib/LEDManager/LEDManager.cpp
@@ -0,0 +1,251 @@
+/*  
+    Theengs LEDManager - We Unite Sensors in One Open-Source Interface
+  
+    Copyright: (c)Florian ROBERT
+
+    This file is part of LEDManager library.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "LEDManager.h"
+
+LEDManager::LEDManager() : globalBrightness(255) {}
+
+void LEDManager::addLEDStrip(int pin, int numLeds) {
+  LEDStrip ledStrip;
+  ledStrip.pin = pin;
+#ifdef LED_ADDRESSABLE
+  if (LED_ADDRESSABLE_POWER > -1) {
+    pinMode(LED_ADDRESSABLE_POWER, OUTPUT);
+    digitalWrite(LED_ADDRESSABLE_POWER, HIGH);
+  }
+  ledStrip.strip = new Adafruit_NeoPixel(numLeds, pin, NEO_GRB + NEO_KHZ800);
+  ledStrip.strip->begin();
+  ledStrip.strip->show();
+  ledStrip.strip->setBrightness(globalBrightness);
+#else
+  pinMode(pin, OUTPUT);
+#endif
+
+  ledStrip.ledStates.resize(numLeds, {OFF, OFF, 0, 0, 0, 0, 0, false, 255, FADE_AMOUNT, {OFF, 0, -1, false}});
+
+  ledStrips.push_back(ledStrip);
+}
+
+void LEDManager::setMode(int stripIndex, int ledIndex, Mode mode, uint32_t color, int durationOrBlinkCount) {
+  if (stripIndex >= 0 && stripIndex < ledStrips.size()) {
+    if (ledIndex == -1) {
+      for (int i = 0; i < ledStrips[stripIndex].ledStates.size(); i++) {
+        setModeForSingleLED(stripIndex, i, mode, color, durationOrBlinkCount);
+      }
+    } else if (ledIndex >= 0 && ledIndex < ledStrips[stripIndex].ledStates.size()) {
+      setModeForSingleLED(stripIndex, ledIndex, mode, color, durationOrBlinkCount);
+    }
+  } else if (stripIndex == -1) {
+    for (int i = 0; i < ledStrips.size(); i++) {
+      setMode(i, ledIndex, mode, color, durationOrBlinkCount);
+    }
+  }
+}
+
+void LEDManager::setModeForSingleLED(int stripIndex, int ledIndex, Mode mode, uint32_t color, int durationOrBlinkCount) {
+  auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+
+  if ((state.mode == BLINK || state.mode == PULSE) && state.durationOrBlinkCount > 0) {
+    state.queuedState = {mode, color, durationOrBlinkCount, true};
+    return;
+  }
+
+  if (mode != BLINK && mode != PULSE) {
+    state.previousMode = state.mode;
+    state.previousColor = state.color;
+  }
+  state.mode = mode;
+  state.color = color;
+  state.durationOrBlinkCount = durationOrBlinkCount;
+  state.lastUpdateTime = millis();
+  state.blinkCounter = 0;
+  state.isBlinkOn = false;
+  state.brightness = globalBrightness;
+  state.fadeAmount = FADE_AMOUNT;
+  state.queuedState.isQueued = false;
+}
+
+void LEDManager::setBrightness(uint8_t brightness) {
+#ifdef LED_ADDRESSABLE
+  globalBrightness = brightness;
+  for (auto& ledStrip : ledStrips) {
+    ledStrip.strip->setBrightness(brightness);
+    for (auto& state : ledStrip.ledStates) {
+      state.brightness = brightness;
+    }
+  }
+#endif
+}
+
+void LEDManager::setLEDColor(int stripIndex, int ledIndex, uint32_t color) {
+  if (stripIndex < 0 || stripIndex >= ledStrips.size()) return;
+  if (ledIndex < 0 || ledIndex >= ledStrips[stripIndex].ledStates.size()) return;
+
+  uint8_t r, g, b;
+  extractRGB(color, r, g, b);
+
+  r = (r * globalBrightness) / 255;
+  g = (g * globalBrightness) / 255;
+  b = (b * globalBrightness) / 255;
+
+#ifdef LED_ADDRESSABLE
+  ledStrips[stripIndex].strip->setPixelColor(ledIndex, r, g, b);
+  ledStrips[stripIndex].strip->show();
+#else
+  // For non-addressable LEDs, we'll use the first LED of each strip
+  if (ledIndex == 0) {
+    int pin = ledStrips[stripIndex].pin;
+    analogWrite(pin, (r + g + b) / 3); // Average of RGB for single-color LED
+  }
+#endif
+}
+
+void LEDManager::update() {
+  for (int stripIndex = 0; stripIndex < ledStrips.size(); stripIndex++) {
+    for (int ledIndex = 0; ledIndex < ledStrips[stripIndex].ledStates.size(); ledIndex++) {
+      auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+      switch (state.mode) {
+        case BLINK:
+          handleBlink(stripIndex, ledIndex);
+          break;
+        case PULSE:
+          handlePulse(stripIndex, ledIndex);
+          break;
+        case STATIC:
+          handleStatic(stripIndex, ledIndex);
+          break;
+        case OFF:
+          setLEDColor(stripIndex, ledIndex, 0);
+          break;
+      }
+    }
+#ifdef LED_ADDRESSABLE
+    ledStrips[stripIndex].strip->show();
+#endif
+  }
+}
+
+void LEDManager::handleBlink(int stripIndex, int ledIndex) {
+  auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+  unsigned long currentTime = millis();
+  if (currentTime - state.lastUpdateTime >= BLINK_INTERVAL) {
+    state.lastUpdateTime = currentTime;
+    if (state.durationOrBlinkCount > 0) {
+      if (state.blinkCounter == 0) {
+        state.blinkCounter = state.durationOrBlinkCount * 2;
+      } else {
+        state.blinkCounter--;
+        if (state.blinkCounter == 0) {
+          if (state.queuedState.isQueued) {
+            applyQueuedState(stripIndex, ledIndex);
+          } else {
+            returnToPreviousState(stripIndex, ledIndex);
+          }
+          return;
+        }
+      }
+    }
+
+    state.isBlinkOn = !state.isBlinkOn;
+    if (state.isBlinkOn) {
+      setLEDColor(stripIndex, ledIndex, state.color);
+    } else {
+      setLEDColor(stripIndex, ledIndex, 0);
+    }
+  }
+}
+
+void LEDManager::handlePulse(int stripIndex, int ledIndex) {
+  auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+  unsigned long currentTime = millis();
+  if (currentTime - state.lastUpdateTime >= PULSE_INTERVAL) {
+    state.lastUpdateTime = currentTime;
+    state.brightness += state.fadeAmount;
+    if (state.brightness <= 0 || state.brightness >= 255) {
+      state.fadeAmount = -state.fadeAmount;
+      state.brightness = constrain(state.brightness, 0, 255);
+      if (state.durationOrBlinkCount > 0) {
+        state.durationOrBlinkCount--;
+        if (state.durationOrBlinkCount == 0) {
+          if (state.queuedState.isQueued) {
+            applyQueuedState(stripIndex, ledIndex);
+          } else {
+            returnToPreviousState(stripIndex, ledIndex);
+          }
+          return;
+        }
+      }
+    }
+    uint32_t adjustedColor = (state.color & 0xFF000000) |
+                             (((state.color & 0x00FF0000) * state.brightness / 255) & 0x00FF0000) |
+                             (((state.color & 0x0000FF00) * state.brightness / 255) & 0x0000FF00) |
+                             (((state.color & 0x000000FF) * state.brightness / 255) & 0x000000FF);
+    setLEDColor(stripIndex, ledIndex, adjustedColor);
+  }
+}
+
+void LEDManager::handleStatic(int stripIndex, int ledIndex) {
+  auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+  unsigned long currentTime = millis();
+  if (state.durationOrBlinkCount > 0) {
+    if (currentTime - state.lastUpdateTime >= static_cast<unsigned long>(state.durationOrBlinkCount) * 1000) {
+      if (state.queuedState.isQueued) {
+        applyQueuedState(stripIndex, ledIndex);
+      } else {
+        returnToPreviousState(stripIndex, ledIndex);
+      }
+      return;
+    }
+  }
+  setLEDColor(stripIndex, ledIndex, state.color);
+}
+
+void LEDManager::returnToPreviousState(int stripIndex, int ledIndex) {
+  auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+  state.mode = state.previousMode;
+  state.color = state.previousColor;
+  state.durationOrBlinkCount = -1; // Set to infinite for the previous state
+  state.lastUpdateTime = millis();
+  state.blinkCounter = 0;
+  state.isBlinkOn = false;
+  state.brightness = globalBrightness;
+  state.fadeAmount = FADE_AMOUNT;
+}
+
+void LEDManager::applyQueuedState(int stripIndex, int ledIndex) {
+  auto& state = ledStrips[stripIndex].ledStates[ledIndex];
+  state.mode = state.queuedState.mode;
+  state.color = state.queuedState.color;
+  state.durationOrBlinkCount = state.queuedState.durationOrBlinkCount;
+  state.lastUpdateTime = millis();
+  state.blinkCounter = 0;
+  state.isBlinkOn = false;
+  state.brightness = globalBrightness;
+  state.fadeAmount = FADE_AMOUNT;
+  state.queuedState.isQueued = false;
+}
+
+void LEDManager::extractRGB(uint32_t color, uint8_t& r, uint8_t& g, uint8_t& b) {
+  r = (color >> 16) & 0xFF;
+  g = (color >> 8) & 0xFF;
+  b = color & 0xFF;
+}
\ No newline at end of file
diff --git a/lib/LEDManager/LEDManager.h b/lib/LEDManager/LEDManager.h
new file mode 100644
index 0000000..e625d64
--- /dev/null
+++ b/lib/LEDManager/LEDManager.h
@@ -0,0 +1,107 @@
+/*  
+    Theengs LEDManager - We Unite Sensors in One Open-Source Interface
+  
+    Copyright: (c)Florian ROBERT
+
+    This file is part of LEDManager library.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+#ifndef LED_MANAGER_H
+#define LED_MANAGER_H
+
+#include <Arduino.h>
+
+#include <vector>
+
+#ifdef LED_ADDRESSABLE
+#  include <Adafruit_NeoPixel.h>
+#endif
+
+#ifndef BLINK_INTERVAL
+#  define BLINK_INTERVAL 500
+#endif
+
+#ifndef PULSE_INTERVAL
+#  define PULSE_INTERVAL 30
+#endif
+
+#ifndef FADE_AMOUNT
+#  define FADE_AMOUNT 5
+#endif
+
+// Define the pins for the RGB LED power if needed
+#ifndef LED_ADDRESSABLE_POWER
+#  define LED_ADDRESSABLE_POWER -1
+#endif
+
+class LEDManager {
+public:
+  enum Mode { OFF,
+              STATIC,
+              BLINK,
+              PULSE };
+
+  LEDManager();
+  void init();
+  void addLEDStrip(int pin, int numLeds);
+  void setMode(int stripIndex, int ledIndex, Mode mode, uint32_t color, int durationOrBlinkCount = -1);
+  void update();
+  void setBrightness(uint8_t brightness);
+
+private:
+  struct QueuedState {
+    Mode mode;
+    uint32_t color;
+    int durationOrBlinkCount;
+    bool isQueued;
+  };
+
+  struct LEDState {
+    Mode mode;
+    Mode previousMode;
+    uint32_t color;
+    uint32_t previousColor;
+    int durationOrBlinkCount;
+    unsigned long lastUpdateTime;
+    int blinkCounter;
+    bool isBlinkOn;
+    int brightness;
+    int fadeAmount;
+    QueuedState queuedState;
+  };
+
+  struct LEDStrip {
+#ifdef LED_ADDRESSABLE
+    Adafruit_NeoPixel* strip;
+#endif
+    int pin;
+    std::vector<LEDState> ledStates;
+  };
+
+  std::vector<LEDStrip> ledStrips;
+  int globalBrightness;
+
+  void setModeForSingleLED(int stripIndex, int ledIndex, Mode mode, uint32_t color, int durationOrBlinkCount);
+  void setLEDColor(int stripIndex, int ledIndex, uint32_t color);
+  void handleBlink(int stripIndex, int ledIndex);
+  void handlePulse(int stripIndex, int ledIndex);
+  void handleStatic(int stripIndex, int ledIndex);
+  void returnToPreviousState(int stripIndex, int ledIndex);
+  void applyQueuedState(int stripIndex, int ledIndex);
+  void extractRGB(uint32_t color, uint8_t& r, uint8_t& g, uint8_t& b);
+};
+
+#endif // LED_MANAGER_H
\ No newline at end of file
diff --git a/lib/LEDManager/README.md b/lib/LEDManager/README.md
new file mode 100644
index 0000000..2f25ccb
--- /dev/null
+++ b/lib/LEDManager/README.md
@@ -0,0 +1,135 @@
+# LEDManager Library
+
+## Overview
+
+The LEDManager library provides a flexible and easy-to-use interface for controlling LEDs in projects. It supports both addressable LED strips and individual non-addressable LEDs, offering various modes of operation such as static, blinking, and pulsing. The library is designed to work seamlessly with PlatformIO and can be easily configured using build flags.
+
+## Features
+
+- Support for both addressable LED strips and individual non-addressable LEDs
+- Multiple operation modes: OFF, STATIC, BLINK, and PULSE
+- Individual control of LEDs within each strip (for addressable LEDs)
+- Global brightness control
+- Queueing of LED states for complex sequences
+- Automatic return to previous state after temporary modes
+- Compatible with PlatformIO build flags for easy configuration
+- Customizable color schemes
+
+## Installation
+
+1. Clone this repository or download the ZIP file.
+2. Extract the contents to your PlatformIO project's `lib` directory.
+
+## Configuration
+
+Configure the LEDManager library using build flags in your `platformio.ini` file:
+
+```ini
+build_flags = 
+    ; For addressable LEDs:
+    -DLED_ADDRESSABLE=true
+    ; For non-addressable LEDs, comment out the line above
+    
+    ; If the Addressable LED requires power
+    -DLED_ADDRESSABLE_POWER=15
+
+    ; Optional timing configurations:
+    -DBLINK_INTERVAL=500
+    -DPULSE_INTERVAL=30
+    -DFADE_AMOUNT=5
+```
+
+## Usage
+
+Here's a basic example of how to use the LEDManager library:
+
+```cpp
+#include "LEDManager.h"
+
+LEDManager ledManager;
+
+void setup() {
+    
+    #ifdef LED_ADDRESSABLE
+    ledManager.addLEDStrip(5, 30);  // Add addressable LED strip on pin 5 with 30 LEDs
+    #else
+    ledManager.addLEDStrip(5, 1);   // Add non-addressable LED on pin 5
+    ledManager.addLEDStrip(6, 1);   // Add non-addressable LED on pin 6
+    #endif
+    
+    ledManager.setBrightness(128); // Set global brightness to 50%
+}
+
+void loop() {
+    #ifdef LED_ADDRESSABLE
+    // Set all LEDs on the first strip to static green
+    ledManager.setMode(0, -1, LEDManager::STATIC, LED_COLOR_GREEN);
+    
+    // Blink first 5 LEDs red for 3 times on the first strip
+    for (int i = 0; i < 5; i++) {
+        ledManager.setMode(0, i, LEDManager::BLINK, LED_COLOR_RED, 3);
+    }
+    #else
+    // Set first LED to static green
+    ledManager.setMode(0, 0, LEDManager::STATIC, LED_COLOR_GREEN);
+    
+    // Blink second strip LED red
+    ledManager.setMode(1, 0, LEDManager::BLINK, LED_COLOR_RED, 3);
+    #endif
+
+    ledManager.update();
+    delay(100);
+}
+```
+
+## API Reference
+
+### Initialization and Setup
+
+```cpp
+LEDManager ledManager;
+ledManager.addLEDStrip(int pin, int numLeds);
+```
+
+### Setting LED Mode
+
+```cpp
+ledManager.setMode(int stripIndex, int ledIndex, Mode mode, uint32_t color, int durationOrBlinkCount = -1);
+```
+
+- `stripIndex`: Index of the LED strip (0-based)
+- `ledIndex`: LED index within the strip (0-based) or -1 for all LEDs in the strip (addressable LEDs only)
+- `mode`: `LEDManager::OFF`, `LEDManager::STATIC`, `LEDManager::BLINK`, or `LEDManager::PULSE`
+- `color`: Color value (use predefined colors from LEDColorDefinitions.h or custom 24-bit RGB values)
+- `durationOrBlinkCount`: Duration for STATIC mode (in milliseconds), blink/pulse count for BLINK/PULSE modes (-1 for infinite)
+
+### Setting Brightness
+
+```cpp
+ledManager.setBrightness(brightness);
+```
+
+- `brightness`: Global brightness value (0-255)
+
+### Updating LEDs
+
+Call this method in your main loop to update LED states:
+
+```cpp
+ledManager.update();
+```
+## Advanced Configuration
+
+You can customize the behavior of the LEDManager by defining the following build flags:
+
+- `BLINK_INTERVAL`: Sets the interval (in milliseconds) between blink states (default: 500)
+- `PULSE_INTERVAL`: Sets the interval (in milliseconds) between pulse updates (default: 30)
+- `FADE_AMOUNT`: Sets the increment/decrement value for pulsing (default: 5)
+
+## Contributing
+
+Contributions to the LEDManager library are welcome! Please feel free to submit a Pull Request.
+
+## License
+
+This library is released under the LGPL V3 License.
\ No newline at end of file
diff --git a/lib/TheengsUtils/TheengsUtils.cpp b/lib/TheengsUtils/TheengsUtils.cpp
new file mode 100644
index 0000000..bb96be2
--- /dev/null
+++ b/lib/TheengsUtils/TheengsUtils.cpp
@@ -0,0 +1,185 @@
+/*
+  Theengs - IoT Interoperability
+
+  Copyright: (c)Florian ROBERT
+
+    This file is part of Theengs products.
+
+    Theengs 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.
+
+    Theengs 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/>.
+*/
+
+#include "TheengsUtils.h"
+
+String TheengsUtils::toString(uint64_t input) {
+  String result = "";
+  uint8_t base = 10;
+
+  do {
+    char c = input % base;
+    input /= base;
+
+    if (c < 10)
+      c += '0';
+    else
+      c += 'A' - 10;
+    result = c + result;
+  } while (input);
+  return result;
+}
+
+/*
+* @brief Convert the spaces of the certificate into new lines
+*/
+std::string TheengsUtils::processCert(const char* cert) {
+  std::string certStr(cert);
+  size_t pos = 0;
+  while ((pos = certStr.find(' ', pos)) != std::string::npos) {
+    if (pos < 4 || (pos >= 27 && pos <= certStr.length() - 25) || pos >= certStr.length() - 4) {
+      certStr.replace(pos, 1, "\n");
+    }
+    pos++;
+  }
+  return certStr;
+}
+
+#ifdef ESP32
+#  include "mbedtls/sha256.h"
+
+std::string TheengsUtils::generateHash(const std::string& input) {
+  unsigned char hash[32];
+  mbedtls_sha256((unsigned char*)input.c_str(), input.length(), hash, 0);
+
+  char hashString[65]; // Room for null terminator
+  for (int i = 0; i < 32; ++i) {
+    sprintf(&hashString[i * 2], "%02x", hash[i]);
+  }
+
+  return std::string(hashString);
+}
+#else
+std::string TheengsUtils::generateHash(const std::string& input) {
+  return "Not implemented for ESP8266";
+}
+#endif
+
+unsigned long TheengsUtils::uptime() {
+  static unsigned long lastUptime = 0;
+  static unsigned long uptimeAdd = 0;
+  unsigned long uptime = millis() / 1000 + uptimeAdd;
+  if (uptime < lastUptime) {
+    uptime += 4294967;
+    uptimeAdd += 4294967;
+  }
+  lastUptime = uptime;
+  return uptime;
+}
+
+void TheengsUtils::syncNTP() {
+  configTime(0, 0, "pool.ntp.org");
+  time_t now = time(nullptr);
+  while (now < 8 * 3600 * 2) {
+    delay(500);
+    now = time(nullptr);
+  }
+}
+
+int TheengsUtils::unixtimestamp() {
+  return time(nullptr);
+}
+
+String TheengsUtils::UTCtimestamp() {
+  time_t now;
+  time(&now);
+  char buffer[sizeof "yyyy-MM-ddThh:mm:ssZ"];
+  strftime(buffer, sizeof buffer, "%FT%TZ", gmtime(&now));
+  return buffer;
+}
+
+void TheengsUtils::revert_hex_data(const char* in, char* out, int l) {
+  //reverting array 2 by 2 to get the data in good order
+  int i = l - 2, j = 0;
+  while (i != -2) {
+    if (i % 2 == 0)
+      out[j] = in[i + 1];
+    else
+      out[j] = in[i - 1];
+    j++;
+    i--;
+  }
+  out[l - 1] = '\0';
+}
+
+/**
+ * Retrieve an unsigned long value from a char array extract representing hexadecimal data, reversed or not,
+ * This value can represent a negative value if canBeNegative is set to true
+ */
+long TheengsUtils::value_from_hex_data(const char* service_data, int offset, int data_length, bool reverse, bool canBeNegative) {
+  char data[data_length + 1];
+  memcpy(data, &service_data[offset], data_length);
+  data[data_length] = '\0';
+  long value;
+  if (reverse) {
+    // reverse data order
+    char rev_data[data_length + 1];
+    revert_hex_data(data, rev_data, data_length + 1);
+    value = strtol(rev_data, NULL, 16);
+  } else {
+    value = strtol(data, NULL, 16);
+  }
+  if (value > 65000 && data_length <= 4 && canBeNegative)
+    value = value - 65535;
+  return value;
+}
+
+/*
+ rounds a number to 2 decimal places
+ example: round(3.14159) -> 3.14
+*/
+double TheengsUtils::round2(float value) {
+  return (int)(value * 100 + 0.5) / 100.0;
+}
+
+/*
+From a byte array to an hexa char array ("A220EE...", double the size)
+ */
+bool TheengsUtils::_rawToHex(byte* in, char* out, int rawSize) {
+  for (unsigned char p = 0; p < rawSize; p++) {
+    sprintf_P(&out[p * 2], PSTR("%02X\r"), in[p]);
+  }
+  return true;
+}
+
+/*
+From an hexa char array ("A220EE...") to a byte array (half the size)
+ */
+bool TheengsUtils::_hexToRaw(const char* in, byte* out, int rawSize) {
+  if (strlen(in) != rawSize * 2)
+    return false;
+  char tmp[3] = {0};
+  for (unsigned char p = 0; p < rawSize; p++) {
+    memcpy(tmp, &in[p * 2], 2);
+    out[p] = strtol(tmp, NULL, 16);
+  }
+  return true;
+}
+
+char* TheengsUtils::ip2CharArray(IPAddress ip) {
+  static char ipChar[16];
+  sprintf(ipChar, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+  return ipChar;
+}
+
+bool TheengsUtils::to_bool(String const& s) {
+  return s != "0" && s != "false" && s != "False" && s != "FALSE";
+}
\ No newline at end of file
diff --git a/lib/TheengsUtils/TheengsUtils.h b/lib/TheengsUtils/TheengsUtils.h
new file mode 100644
index 0000000..90b520e
--- /dev/null
+++ b/lib/TheengsUtils/TheengsUtils.h
@@ -0,0 +1,48 @@
+/*
+  Theengs - IoT Interoperability
+
+  Copyright: (c)Florian ROBERT
+
+    This file is part of Theengs products.
+
+    Theengs 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.
+
+    Theengs 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/>.
+*/
+
+#ifndef THEENGS_UTIL_H
+#define THEENGS_UTIL_H
+
+#include <Arduino.h>
+#include <time.h>
+#include <IPAddress.h>
+#include <string>
+
+class TheengsUtils {
+public:
+    static String toString(uint64_t input);
+    static std::string processCert(const char* cert);
+    static std::string generateHash(const std::string& input);
+    static unsigned long uptime();
+    static void syncNTP();
+    static int unixtimestamp();
+    static String UTCtimestamp();
+    static void revert_hex_data(const char* in, char* out, int l);
+    static long value_from_hex_data(const char* service_data, int offset, int data_length, bool reverse, bool canBeNegative = true);
+    static double round2(float value);
+    static bool _rawToHex(byte* in, char* out, int rawSize);
+    static bool _hexToRaw(const char* in, byte* out, int rawSize);
+    static char* ip2CharArray(IPAddress ip);
+    static bool to_bool(String const& s);
+};
+
+#endif
\ No newline at end of file
diff --git a/main/TheengsCommon.h b/main/TheengsCommon.h
new file mode 100644
index 0000000..44b9276
--- /dev/null
+++ b/main/TheengsCommon.h
@@ -0,0 +1,118 @@
+#pragma once
+
+#include "User_config.h"
+
+#define ARDUINOJSON_USE_LONG_LONG     1
+#define ARDUINOJSON_ENABLE_STD_STRING 1
+#include <ArduinoJson.h>
+#include <ArduinoLog.h>
+
+#if defined(ESP32)
+#  include <Preferences.h>
+extern Preferences preferences;
+#endif
+
+// Flags definition for white list, black list, discovery management
+#define device_flags_init     0 << 0
+#define device_flags_isDisc   1 << 0
+#define device_flags_isWhiteL 1 << 1
+#define device_flags_isBlackL 1 << 2
+#define device_flags_connect  1 << 3
+#define isWhite(device)       device->isWhtL
+#define isBlack(device)       device->isBlkL
+#define isDiscovered(device)  device->isDisc
+
+enum GatewayState {
+  WAITING_ONBOARDING,
+  ONBOARDING,
+  OFFLINE,
+  NTWK_CONNECTED,
+  BROKER_CONNECTED,
+  PROCESSING,
+  NTWK_DISCONNECTED,
+  BROKER_DISCONNECTED,
+  LOCAL_OTA_IN_PROGRESS,
+  REMOTE_OTA_IN_PROGRESS,
+  SLEEPING,
+  ERROR
+};
+
+enum PowerMode {
+  DEACTIVATED = -1,
+  ALWAYS_ON,
+  INTERVAL,
+  ACTION
+};
+
+struct SYSConfig_s {
+  bool mqtt; // if true the gateway will publish the received data on the MQTT broker
+  bool serial; // if true the gateway will publish the received data on the SERIAL
+  bool blufi; // if true the gateway will be accesible with blufi
+  bool offline;
+  bool discovery; // HA discovery convention
+#ifdef LED_ADDRESSABLE
+  int rgbbrightness; // brightness of the RGB LED
+#endif
+  enum PowerMode powerMode;
+};
+
+extern GatewayState gatewayState;
+extern SYSConfig_s SYSConfig;
+extern bool ready_to_sleep;
+extern char mqtt_topic[];
+extern char gateway_name[];
+extern unsigned long lastDiscovery; // Time of the last discovery to trigger automaticaly to off after DiscoveryAutoOffTimer
+
+#if BLEDecryptor
+extern char ble_aes[];
+extern StaticJsonDocument<JSON_BLE_AES_CUSTOM_KEYS> ble_aes_keys;
+#endif
+
+extern bool enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, int timeout);
+extern bool enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc);
+extern void buildTopicFromId(JsonObject& Jsondata, const char* origin);
+extern bool pubMQTT(const char* topic, const char* payload);
+extern bool pubMQTT(const char* topic, const char* payload, bool retainFlag);
+extern bool pubMQTT(String topic, const char* payload);
+extern bool pubMQTT(const char* topic, unsigned long payload);
+extern bool pubMQTT(const char* topic, unsigned long long payload);
+extern bool pubMQTT(const char* topic, String payload);
+extern bool pubMQTT(String topic, String payload);
+extern bool pubMQTT(String topic, int payload);
+extern bool pubMQTT(String topic, unsigned long long payload);
+extern bool pubMQTT(String topic, float payload);
+extern bool pubMQTT(const char* topic, float payload);
+extern bool pubMQTT(const char* topic, int payload);
+extern bool pubMQTT(const char* topic, unsigned int payload);
+extern bool pubMQTT(const char* topic, long payload);
+extern bool pubMQTT(const char* topic, double payload);
+extern bool pubMQTT(String topic, unsigned long payload);
+extern unsigned long uptime();
+extern bool cmpToMainTopic(const char*, const char*);
+extern bool pub(const char*, const char*, bool);
+extern bool pub(const char*, const char*);
+
+// Float-specific overload to log with the correct format specifier.
+inline void Config_update(JsonObject& data, const char* key, float& var) {
+  if (data.containsKey(key)) {
+    float newVal = data[key].as<float>();
+    if (var != newVal) {
+      var = newVal;
+      THEENGS_LOG_NOTICE(F("Config %s changed to: %F" CR), key, newVal);
+    } else {
+      THEENGS_LOG_NOTICE(F("Config %s unchanged, currently: %F" CR), key, newVal);
+    }
+  }
+}
+
+template <typename T>
+void Config_update(JsonObject& data, const char* key, T& var) {
+  if (data.containsKey(key)) {
+    if (var != data[key].as<T>()) {
+      var = data[key].as<T>();
+      THEENGS_LOG_NOTICE(F("Config %s changed to: %T" CR), key, data[key].as<T>());
+    } else {
+      THEENGS_LOG_NOTICE(F("Config %s unchanged, currently: %T" CR), key, data[key].as<T>());
+    }
+  }
+}
diff --git a/main/User_config.h b/main/User_config.h
index b80aa3c..bdd7792 100644
--- a/main/User_config.h
+++ b/main/User_config.h
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
   This program enables to:
@@ -29,7 +29,7 @@
 #define user_config_h
 /*-------------------VERSION----------------------*/
 #ifndef OMG_VERSION
-#  define OMG_VERSION "version_tag"
+#  define OMG_VERSION "edge"
 #endif
 
 /*-------------CONFIGURE WIFIMANAGER-------------(only ESP8266 & SONOFF RFBridge)*/
@@ -57,7 +57,7 @@
 #  define Gateway_Name "OpenMQTTGateway"
 #endif
 #ifndef Gateway_Short_Name
-#  define Gateway_Short_Name "OMG"
+#  define Gateway_Short_Name "OMG" // 3 characters maximum
 #endif
 
 #ifndef Base_Topic
@@ -82,12 +82,7 @@
 #  endif
 #endif
 
-#if defined(ESP8266) || defined(ESP32) // for nodemcu, weemos and esp8266
 //#  define ESPWifiManualSetup true //uncomment you don't want to use wifimanager for your credential settings on ESP
-#else // for arduino boards
-const byte ip[] = {192, 168, 1, 99};
-const byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0x54, 0x95}; //W5100 ethernet shield MAC address
-#endif
 
 //#define ESP32_ETHERNET=true // Uncomment to use Ethernet module on ESP32 Ethernet gateway and adapt the settings to your board below, the default parameter are for OLIMEX ESP32 gateway
 #ifdef ESP32_ETHERNET
@@ -140,28 +135,44 @@ const byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0x54, 0x95}; //W5100 ethernet shield
 #define maxConnectionRetryNetwork 5 //maximum Wifi connection attempts with existing credential at start (used to bypass ESP32 issue on wifi connect)
 #define maxRetryWatchDog          11 //maximum Wifi or MQTT re-connection attempts before restarting
 
+// WifiReconnectWatchDog: restart the ESP if the network can't be recovered after maxRetryWatchDog
+// consecutive reconnection attempts in the main loop. This allows the gateway to self-heal from a
+// wedged WiFi stack (e.g. the ESP32 driver getting stuck after a long uptime). Disable it on
+// environments where an unexpected reboot is undesirable (e.g. a smart plug that would lose its relay state).
+#ifndef WifiReconnectWatchDog
+#  define WifiReconnectWatchDog true
+#endif
+
 //set minimum quality of signal so it ignores AP's under that quality
 #define MinimumWifiSignalQuality 8
 
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 //MQTT Parameters definition
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-#  define parameters_size     65
-#  define mqtt_topic_max_size 150
-#  ifndef mqtt_max_packet_size
-#    ifdef MQTT_HTTPS_FW_UPDATE
-#      ifndef CHECK_OTA_UPDATE
-#        define CHECK_OTA_UPDATE true // enable to check for the presence of a new version for your environment on Github
-#      endif
-#      define mqtt_max_packet_size 2560
-#    else
-#      define mqtt_max_packet_size 1024
-#    endif
+#define parameters_size     65
+#define mqtt_topic_max_size 150
+#define mqtt_key_max_size   20
+#ifdef MQTT_HTTPS_FW_UPDATE
+#  ifndef CHECK_OTA_UPDATE
+#    define CHECK_OTA_UPDATE true // enable to check for the presence of a new version for your environment on Github
 #  endif
-#else
-#  define parameters_size      30
-#  define mqtt_topic_max_size  75
-#  define mqtt_max_packet_size 128
+#endif
+
+#ifndef JSON_MSG_BUFFER
+#  if defined(ESP32)
+#    define JSON_MSG_BUFFER 1024 // adjusted to minimum size covering largest home assistant discovery messages
+#    if MQTT_SECURE_DEFAULT
+#      define JSON_MSG_BUFFER_MAX 2048 // Json message buffer size increased to handle certificate changes through MQTT, used for the queue and the coming MQTT messages
+#    else
+#      define JSON_MSG_BUFFER_MAX 1024 // Minimum size for the cover MQTT discovery message
+#    endif
+#  elif defined(ESP8266)
+#    define JSON_MSG_BUFFER     512 // Json message max buffer size, don't put 768 or higher it is causing unexpected behaviour on ESP8266, certificates handling with ESP8266 is not tested
+#    define JSON_MSG_BUFFER_MAX 832 // Minimum size for MQTT discovery message
+#  endif
+#endif
+
+#ifndef mqtt_max_payload_size
+#  define mqtt_max_payload_size JSON_MSG_BUFFER_MAX + mqtt_topic_max_size + 10 // maximum size of the MQTT payload
 #endif
 
 #ifndef MQTT_USER
@@ -187,113 +198,120 @@ const byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0x54, 0x95}; //W5100 ethernet shield
 #  define QueueSemaphoreTimeOutLoop 100 // time out for semaphore retrieval from the loop
 #endif
 
-#if defined(ESP8266) || defined(ESP32)
 // Uncomment to use a device running TheengsGateway to decode BLE data. (https://github.com/theengs/gateway)
 // Set the topic to the subscribe topic configured in the TheengGateway
 // #define MQTTDecodeTopic "MQTTDecode"
 
-// The root ca certificate used for validating the MQTT broker
-// The certificate must be in PEM ascii format
-const char* certificate PROGMEM = R"EOF("
------BEGIN CERTIFICATE-----
-...
------END CERTIFICATE-----
-")EOF";
+#define ATTEMPTS_BEFORE_BG 10 // Number of wifi connection attempts before going to BG protocol
+#define ATTEMPTS_BEFORE_B  20 // Number of wifi connection attempts before going to B protocol
 
-#  define ATTEMPTS_BEFORE_BG 10 // Number of wifi connection attempts before going to BG protocol
-#  define ATTEMPTS_BEFORE_B  20 // Number of wifi connection attempts before going to B protocol
+#ifndef NTP_SERVER
+#  define NTP_SERVER "pool.ntp.org"
+#endif
 
-#  ifndef NTP_SERVER
-#    define NTP_SERVER "pool.ntp.org"
-#  endif
+#ifndef MQTT_SECURE_DEFAULT
+#  define MQTT_SECURE_DEFAULT false
+#endif
 
-#  ifndef MQTT_SECURE_DEFAULT
-#    define MQTT_SECURE_DEFAULT false
-#  endif
+#ifndef MQTT_CERT_VALIDATE_DEFAULT
+#  define MQTT_CERT_VALIDATE_DEFAULT false
+#endif
 
-#  ifndef MQTT_CERT_VALIDATE_DEFAULT
-#    define MQTT_CERT_VALIDATE_DEFAULT false
-#  endif
+#ifndef AWS_IOT
+#  define AWS_IOT false
+#endif
 
-#  ifndef AWS_IOT
-#    define AWS_IOT false
-#  endif
+#ifndef MQTT_BROKER_MODE
+#  define MQTT_BROKER_MODE false
+#endif
 
-#  if AWS_IOT
+#if MQTT_BROKER_MODE
+// In MQTT broker mode the MQTT web config is not needed
+#  define WIFIMNG_HIDE_MQTT_CONFIG true
+#endif
+
+#define GITHUB_OTA_SERVER_CERT_HASH "d4d211b4553af9fac371f24c2268d59d2b0fec6b9aa0fdbbde068f078d7daf86" // SHA256 fingerprint of the certificate used by the OTA server
+
+#if AWS_IOT
 // Enable the use of ALPN for AWS IoT Core with the port 443
-const char* alpnProtocols[] = {"x-amzn-mqtt-ca", NULL};
-#  endif
+#  define ALPN_PROTOCOLS \
+    { "x-amzn-mqtt-ca", NULL }
+#endif
 
 //#  define MQTT_HTTPS_FW_UPDATE //uncomment to enable updating via MQTT message.
 
-#  ifdef MQTT_HTTPS_FW_UPDATE
+#ifdef MQTT_HTTPS_FW_UPDATE
 // If used, this should be set to the root CA certificate of the server hosting the firmware.
-#    ifdef PRIVATE_CERTS
-#      include "certs/private_ota_cert.h"
-#    else
-#      include "certs/default_ota_cert.h"
-#    endif
+#  ifdef PRIVATE_CERTS
+#    include "certs/private_ota_cert.h"
+#  else
+#    include "certs/default_ota_cert.h"
+#  endif
 
-#    ifndef MQTT_HTTPS_FW_UPDATE_USE_PASSWORD
-#      define MQTT_HTTPS_FW_UPDATE_USE_PASSWORD 1 // Set this to 0 if not using TLS connection to MQTT broker to prevent clear text passwords being sent.
-#    endif
+#  ifndef MQTT_HTTPS_FW_UPDATE_USE_PASSWORD
+#    define MQTT_HTTPS_FW_UPDATE_USE_PASSWORD 1 // Set this to 0 if not using TLS connection to MQTT broker to prevent clear text passwords being sent.
+#  endif
+#  ifndef OTA_JSON_URL // may be overridden by a build flag to use another OTA server
 #    if DEVELOPMENTOTA
-#      define OTA_JSON_URL "https://github.com/1technophile/OpenMQTTGateway/raw/gh-pages/dev/firmware_build/latest_version_dev.json" //OTA url used to discover new versions of the firmware from development nightly builds
+#      define OTA_JSON_URL "https://ota.openmqttgateway.com/binaries/dev/latest_version_dev.json" //OTA url used to discover new versions of the firmware from development nightly builds
 #    else
-#      define OTA_JSON_URL "https://github.com/1technophile/OpenMQTTGateway/raw/gh-pages/firmware_build/latest_version.json" //OTA url used to discover new versions of the firmware
+#      define OTA_JSON_URL "https://ota.openmqttgateway.com/binaries/latest_version.json" //OTA url used to discover new versions of the firmware
 #    endif
-#    define ENTITY_PICTURE   "https://github.com/1technophile/OpenMQTTGateway/raw/development/docs/img/Openmqttgateway_logo_mini_margins.png"
-#    define RELEASE_LINK_DEV "https://github.com/1technophile/OpenMQTTGateway/raw/gh-pages/dev/firmware_build/"
-#    define RELEASE_LINK     "https://github.com/1technophile/OpenMQTTGateway/releases/download/"
 #  endif
+#  define ENTITY_PICTURE   "https://github.com/1technophile/OpenMQTTGateway/raw/development/docs/img/Openmqttgateway_logo_mini_margins.png"
+#  define RELEASE_LINK_DEV "https://ota.openmqttgateway.com/binaries/dev/"
+#  define RELEASE_LINK     "https://ota.openmqttgateway.com/binaries/"
+#else
+static const char* OTAserver_cert = "";
+#endif
 
-#  ifndef MQTT_SECURE_SELF_SIGNED
-#    define MQTT_SECURE_SELF_SIGNED 0
-#  endif
+#ifndef MQTT_SECURE_SIGNED_CLIENT
+#  define MQTT_SECURE_SIGNED_CLIENT 0 // If using a signed certificate for the broker and using client certificate/key set this to true or 1
+#endif
 
-#  ifndef MQTT_SECURE_SELF_SIGNED_CLIENT
-#    define MQTT_SECURE_SELF_SIGNED_CLIENT 1 // If using a self signed certificate for the broker and not using client certificates set this to false or 0
-#  endif
+#ifdef PRIVATE_CERTS
+#  include "certs/private_client_cert.h"
+#  include "certs/private_client_key.h"
+#  include "certs/private_server_cert.h"
+#else
+#  include "certs/default_client_cert.h"
+#  include "certs/default_client_key.h"
+#  include "certs/default_server_cert.h"
+#endif
 
-#  ifndef MQTT_SECURE_SELF_SIGNED_INDEX_DEFAULT
-#    define MQTT_SECURE_SELF_SIGNED_INDEX_DEFAULT 0
-#  endif
+#include <string>
 
-#  if MQTT_SECURE_SELF_SIGNED
-#    ifdef PRIVATE_CERTS
-#      include "certs/private_client_cert.h"
-#      include "certs/private_client_key.h"
-#      include "certs/private_server_cert.h"
-#    else
-#      include "certs/default_client_cert.h"
-#      include "certs/default_client_key.h"
-#      include "certs/default_server_cert.h"
-#    endif
+#ifndef CNT_DEFAULT_INDEX
+#  define CNT_DEFAULT_INDEX 0 // Default set of connection parameters
+#endif
 
-struct ss_certs {
-  const char* server_cert;
-  const char* client_cert;
-  const char* client_key;
+#if !MQTT_BROKER_MODE
+struct ss_cnt_parameters {
+  std::string server_cert;
+  std::string client_cert;
+  std::string client_key;
+  std::string ota_server_cert;
+  char mqtt_server[parameters_size];
+  char mqtt_port[6];
+  char mqtt_user[parameters_size];
+  char mqtt_pass[parameters_size];
+  bool isConnectionSecure;
+  bool isCertValidate;
+  bool validConnection;
 };
 
-struct ss_certs certs_array[2] = {
-    {ss_server_cert, ss_client_cert, ss_client_key},
-    {ss_server_cert, ss_client_cert, ss_client_key}};
+#  define CNT_PARAMS_ARR                                                                                                                                                     \
+    {                                                                                                                                                                        \
+      {ss_server_cert, ss_client_cert, ss_client_key, OTAserver_cert, MQTT_SERVER, MQTT_PORT, MQTT_USER, MQTT_PASS, MQTT_SECURE_DEFAULT, MQTT_CERT_VALIDATE_DEFAULT, false}, \
+          {"", "", "", "", MQTT_SERVER, MQTT_PORT, MQTT_USER, MQTT_PASS, MQTT_SECURE_DEFAULT, MQTT_CERT_VALIDATE_DEFAULT, false},                                            \
+      { "", "", "", "", MQTT_SERVER, MQTT_PORT, MQTT_USER, MQTT_PASS, MQTT_SECURE_DEFAULT, MQTT_CERT_VALIDATE_DEFAULT, false }                                               \
+    }
+#  define cnt_parameters_array_size 3
 
-static_assert(MQTT_SECURE_SELF_SIGNED_INDEX_DEFAULT < (sizeof(certs_array) / sizeof(ss_certs)),
-              "Invalid MQTT self signed default index");
-#  endif
+extern ss_cnt_parameters cnt_parameters_array[];
 #endif
 
-/**
- * Deep-sleep for the ESP8266.
- * Set the wake pin.
- */
-#if defined(DEEP_SLEEP_IN_US) && defined(ESP8266)
-#  ifndef ESP8266_DEEP_SLEEP_WAKE_PIN
-#    define ESP8266_DEEP_SLEEP_WAKE_PIN D0
-#  endif
-#endif
+#define MIN_CERT_LENGTH 200 // Minimum length of a certificate to be considered valid
 
 /**
  * Ext wake for Deep-sleep for the ESP32.
@@ -305,16 +323,23 @@ static_assert(MQTT_SECURE_SELF_SIGNED_INDEX_DEFAULT < (sizeof(certs_array) / siz
 #  endif
 #endif
 
-/*------------------DEEP SLEEP parameters ------------------*/
-//DEFAULT_LOW_POWER_MODE -1 to normal mode, low power mode can't be used on this build
-//DEFAULT_LOW_POWER_MODE 0 to normal mode (no power consumption optimisations)
-//DEFAULT_LOW_POWER_MODE 1 to activate deep sleep
-//DEFAULT_LOW_POWER_MODE 2 to activate deep sleep (LCD is turned OFF)
-#ifdef ESP32
-#  ifndef DEFAULT_LOW_POWER_MODE
-#    define DEFAULT_LOW_POWER_MODE -1
+#ifdef ESP32_EXT1_WAKE_PIN
+#  ifndef ESP32_EXT1_WAKE_PIN_STATE
+#    define ESP32_EXT1_WAKE_PIN_STATE 1
 #  endif
-int lowpowermode = DEFAULT_LOW_POWER_MODE;
+#endif
+
+#ifndef DEEP_SLEEP_IN_US
+#  define DEEP_SLEEP_IN_US 60000000 // 1 minute
+#endif
+
+/*------------------DEEP SLEEP parameters ------------------*/
+//DEFAULT_LOW_POWER_MODE DEACTIVATED low power mode can't be used on this build to prevent bricking devices that does not support low power mode
+//DEFAULT_LOW_POWER_MODE ALWAYS_ON normal mode (no power consumption optimisations)
+//DEFAULT_LOW_POWER_MODE INTERVAL to activate deep sleep with intervals and action wake up
+//DEFAULT_LOW_POWER_MODE ACTION to activate deep sleep with action wake up
+#ifndef DEFAULT_LOW_POWER_MODE
+#  define DEFAULT_LOW_POWER_MODE DEACTIVATED
 #endif
 
 /*-------------DEFINE THE MODULES YOU WANT BELOW----------------*/
@@ -357,7 +382,7 @@ int lowpowermode = DEFAULT_LOW_POWER_MODE;
 //#define ZactuatorPWM   "PWM"      //ESP8266, ESP32
 //#define ZsensorSHTC3 "SHTC3" //ESP8266, Arduino, ESP32,  Sonoff RF Bridge
 //#define ZactuatorSomfy "Somfy"    //ESP8266, Arduino, ESP32
-//#define ZgatewayRS232   "RS232"  //ESP8266, Arduino, ESP32
+//#define ZgatewaySERIAL   "SERIAL"  //ESP8266, Arduino, ESP32
 
 /*-------------DEFINE YOUR MQTT ADVANCED PARAMETERS BELOW----------------*/
 #ifndef will_Topic
@@ -421,226 +446,102 @@ int lowpowermode = DEFAULT_LOW_POWER_MODE;
 #  define ota_timeout_millis 30000
 #endif
 
-/*-------------ERRORS, INFOS, SEND RECEIVE Display through LED----------------*/
-#ifndef RGB_INDICATORS // Management of Errors, reception/emission and informations indicators with basic LED
-/*-------------DEFINE PINs FOR STATUS LEDs----------------*/
-#  ifndef LED_SEND_RECEIVE
-#    ifdef ESP8266
-//#      define LED_SEND_RECEIVE 40
-#    elif ESP32
-//#      define LED_SEND_RECEIVE 40
-#    elif __AVR_ATmega2560__ //arduino mega
-//#      define LED_SEND_RECEIVE 40
-#    else //arduino uno/nano
-//#      define LED_SEND_RECEIVE 40
-#    endif
-#  endif
-#  ifndef LED_SEND_RECEIVE_ON
-#    define LED_SEND_RECEIVE_ON HIGH
-#  endif
-#  ifndef LED_ERROR
-#    ifdef ESP8266
-//#      define LED_ERROR 42
-#    elif ESP32
-//#      define LED_ERROR 42
-#    elif __AVR_ATmega2560__ //arduino mega
-//#      define LED_ERROR 42
-#    else //arduino uno/nano
-//#      define LED_ERROR 42
-#    endif
-#  endif
-#  ifndef LED_ERROR_ON
-#    define LED_ERROR_ON HIGH
-#  endif
-#  ifndef LED_INFO
-#    ifdef ESP8266
-//#      define LED_INFO 44
-#    elif ESP32
-//#      define LED_INFO 44
-#    elif __AVR_ATmega2560__ //arduino mega
-//#      define LED_INFO 44
-#    else //arduino uno/nano
-//#      define LED_INFO 44
-#    endif
-#  endif
-#  ifndef LED_INFO_ON
-#    define LED_INFO_ON HIGH
-#  endif
+// LED index depending on state, each state can have a different LED index or be grouped if there is a limited number of LEDs
+#ifndef LED_ERROR
+#  define LED_ERROR 0
+#endif
+#ifndef LED_PROCESSING
+#  define LED_PROCESSING 0
+#endif
+#ifndef LED_BROKER
+#  define LED_BROKER 0
+#endif
+#ifndef LED_NETWORK
+#  define LED_NETWORK 0
+#endif
 
-#  ifdef LED_ERROR
-#    define SetupIndicatorError() \
-      pinMode(LED_ERROR, OUTPUT); \
-      ErrorIndicatorOFF();
-#    define ErrorIndicatorON()  digitalWrite(LED_ERROR, LED_ERROR_ON)
-#    define ErrorIndicatorOFF() digitalWrite(LED_ERROR, !LED_ERROR_ON)
-#  else
-#    define SetupIndicatorError()
-#    define ErrorIndicatorON()
-#    define ErrorIndicatorOFF()
-#  endif
-#  ifdef LED_SEND_RECEIVE
-#    define SetupIndicatorSendReceive()  \
-      pinMode(LED_SEND_RECEIVE, OUTPUT); \
-      SendReceiveIndicatorOFF();
-#    define SendReceiveIndicatorON()  digitalWrite(LED_SEND_RECEIVE, LED_SEND_RECEIVE_ON)
-#    define SendReceiveIndicatorOFF() digitalWrite(LED_SEND_RECEIVE, !LED_SEND_RECEIVE_ON)
-#  else
-#    define SetupIndicatorSendReceive()
-#    define SendReceiveIndicatorON()
-#    define SendReceiveIndicatorOFF()
-#  endif
-#  ifdef LED_INFO
-#    define SetupIndicatorInfo() \
-      pinMode(LED_INFO, OUTPUT); \
-      InfoIndicatorOFF();
-#    define InfoIndicatorON()  digitalWrite(LED_INFO, LED_INFO_ON)
-#    define InfoIndicatorOFF() digitalWrite(LED_INFO, !LED_INFO_ON)
-#  else
-#    define SetupIndicatorInfo()
-#    define InfoIndicatorON()
-#    define InfoIndicatorOFF()
-#  endif
-#  define CriticalIndicatorON() // Not used
-#  define PowerIndicatorON()    // Not used
-#  define PowerIndicatorOFF()   // Not used
-#  define SetupIndicators()     // Not used
-#else // Management of Errors, reception/emission and informations indicators with RGB LED
-#  include <Adafruit_NeoPixel.h>
-#  ifndef ANEOPIX_IND_TYPE // needs library constants
-#    define ANEOPIX_IND_TYPE NEO_GRB + NEO_KHZ800 // ws2812 and alike
-#  endif
-Adafruit_NeoPixel leds(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO, ANEOPIX_IND_TYPE);
-#  ifdef ANEOPIX_IND_DATA_GPIO2 // Only used for Critical Indicator
-// assume the same LED type
-Adafruit_NeoPixel leds2(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO2, ANEOPIX_IND_TYPE);
-#  endif
+// LED Strip index
+#ifndef STRIP_ERROR
+#  define STRIP_ERROR 0
+#endif
+#ifndef STRIP_PROCESSING
+#  define STRIP_PROCESSING 0
+#endif
+#ifndef STRIP_BROKER
+#  define STRIP_BROKER 0
+#endif
+#ifndef STRIP_NETWORK
+#  define STRIP_NETWORK 0
+#endif
+#ifndef STRIP_POWER
+#  define STRIP_POWER 0
+#endif
 
-#  ifndef RGB_LED_POWER
-#    define RGB_LED_POWER -1 // If the RGB Led is linked to GPIO pin for power define it here
+// Single standard LED pin
+#ifndef LED_PIN
+#  ifdef LED_BUILTIN
+#    define LED_PIN LED_BUILTIN
 #  endif
-#  ifndef ANEOPIX_BRIGHTNESS
-#    define ANEOPIX_BRIGHTNESS 20 // Set Default maximum RGB brightness to approx 10% (0-255 scale)
+#endif
+#ifndef LED_PIN_ON
+#  define LED_PIN_ON HIGH
+#endif
+#ifndef LED_ACTUATOR_ONOFF
+#  ifdef LED_BUILTIN
+#    define LED_ACTUATOR_ONOFF LED_BUILTIN
 #  endif
-#  ifndef DEFAULT_ADJ_BRIGHTNESS
-#    define DEFAULT_ADJ_BRIGHTNESS 255 // Set Default RGB adjustable brightness
-#  endif
-#  ifndef ANEOPIX_COLOR_SCHEME // allow for different color combinations
-#    define ANEOPIX_COLOR_SCHEME 0
-#  endif
-// Allow to set LED used (for example thingpulse gateway has 4 we use them independently)
-#  ifndef ANEOPIX_INFO_LED
-#    define ANEOPIX_INFO_LED 0 // First Led
-#  endif
-#  ifndef ANEOPIX_SEND_RECEIVE_LED
-#    define ANEOPIX_SEND_RECEIVE_LED 0 // First Led
-#  endif
-#  ifndef ANEOPIX_ERROR_LED
-#    define ANEOPIX_ERROR_LED 0 // First Led
-#  endif
-#  ifndef ANEOPIX_CRITICAL_LED
-#    define ANEOPIX_CRITICAL_LED 0 // First Led
-#  endif
-// compile time calculation of color values
-#  define ANEOPIX_RED     ((0xFF * ANEOPIX_BRIGHTNESS) >> 8) << 16
-#  define ANEOPIX_RED_DIM ((0x3F * ANEOPIX_BRIGHTNESS) >> 8) << 16 // dimmed /4
-#  define ANEOPIX_ORANGE  (((0xFF * ANEOPIX_BRIGHTNESS) >> 8) << 16) | \
-                             (((0xA5 * ANEOPIX_BRIGHTNESS) >> 8) << 8)
-#  define ANEOPIX_GOLD (((0xFF * ANEOPIX_BRIGHTNESS) >> 8) << 16) | \
-                           (((0xD7 * ANEOPIX_BRIGHTNESS) >> 8) << 8)
-#  define ANEOPIX_GREEN     ((0xFF * ANEOPIX_BRIGHTNESS) >> 8) << 8
-#  define ANEOPIX_GREEN_DIM ((0x3F * ANEOPIX_BRIGHTNESS) >> 8) << 8 // dimmed /4
-#  define ANEOPIX_AQUA      (((0xFF * ANEOPIX_BRIGHTNESS) >> 8) << 8) | \
-                           (0xFF * ANEOPIX_BRIGHTNESS) >> 8
-#  define ANEOPIX_BLUE     (0xFF * ANEOPIX_BRIGHTNESS) >> 8
-#  define ANEOPIX_BLUE_DIM (0x3F * ANEOPIX_BRIGHTNESS) >> 8 // dimmed /4
-#  define ANEOPIX_BLACK    0
+#endif
 
-#  if ANEOPIX_COLOR_SCHEME == 0
-// original color combination remains default
-#    define ANEOPIX_INFO        ANEOPIX_GREEN
-#    define ANEOPIX_ERROR       ANEOPIX_ORANGE
-#    define ANEOPIX_SENDRECEIVE ANEOPIX_BLUE
-#    define ANEOPIX_CRITICAL    ANEOPIX_RED // second led
-#    define ANEOPIX_POWER       ANEOPIX_GREEN // second led
-#    define ANEOPIX_BOOT        ANEOPIX_BLACK // unused
-#    define ANEOPIX_OFF         ANEOPIX_BLACK
-// color combinations tested for good visibility of onboard leds
-#  elif ANEOPIX_COLOR_SCHEME == 1
-#    define ANEOPIX_INFO        ANEOPIX_GREEN_DIM // dimmed green info background
-#    define ANEOPIX_ERROR       ANEOPIX_RED_DIM
-#    define ANEOPIX_SENDRECEIVE ANEOPIX_GOLD // bright gold  = sending
-#    define ANEOPIX_CRITICAL    ANEOPIX_BLACK // unused
-#    define ANEOPIX_POWER       ANEOPIX_BLACK // unused
-#    define ANEOPIX_BOOT        ANEOPIX_AQUA
-#    define ANEOPIX_OFF         ANEOPIX_BLACK
-#  else
-#    define ANEOPIX_INFO        ANEOPIX_BLUE_DIM // dimmed blue info background
-#    define ANEOPIX_ERROR       ANEOPIX_RED_DIM
-#    define ANEOPIX_SENDRECEIVE ANEOPIX_GOLD // bright gold  = sending
-#    define ANEOPIX_CRITICAL    ANEOPIX_BLACK // unused
-#    define ANEOPIX_POWER       ANEOPIX_BLACK // unused
-#    define ANEOPIX_BOOT        ANEOPIX_AQUA
-#    define ANEOPIX_OFF         ANEOPIX_BLACK
-#  endif
-#  ifndef ANEOPIX_IND_DATA_GPIO2
-// during boot the RGB LED is on to signal also reboots
-#    define SetupIndicators()                             \
-      pinMode(RGB_LED_POWER, OUTPUT);                     \
-      digitalWrite(RGB_LED_POWER, HIGH);                  \
-      leds.begin();                                       \
-      leds.setPixelColor(ANEOPIX_INFO_LED, ANEOPIX_BOOT); \
-      leds.show();
-#  else
-#    define SetupIndicators()            \
-      pinMode(RGB_LED_POWER, OUTPUT);    \
-      digitalWrite(RGB_LED_POWER, HIGH); \
-      leds.begin();                      \
-      leds2.begin();
-#  endif
-#  define ErrorIndicatorON()                              \
-    leds.setPixelColor(ANEOPIX_ERROR_LED, ANEOPIX_ERROR); \
-    leds.setBrightness(SYSConfig.rgbbrightness);          \
-    leds.show();
-#  define ErrorIndicatorOFF()                           \
-    leds.setPixelColor(ANEOPIX_ERROR_LED, ANEOPIX_OFF); \
-    leds.show();
-#  define SendReceiveIndicatorON()                                     \
-    leds.setPixelColor(ANEOPIX_SEND_RECEIVE_LED, ANEOPIX_SENDRECEIVE); \
-    leds.setBrightness(SYSConfig.rgbbrightness);                       \
-    leds.show();
-#  define SendReceiveIndicatorOFF()                            \
-    leds.setPixelColor(ANEOPIX_SEND_RECEIVE_LED, ANEOPIX_OFF); \
-    leds.show();
-#  define InfoIndicatorON()                             \
-    leds.setPixelColor(ANEOPIX_INFO_LED, ANEOPIX_INFO); \
-    leds.setBrightness(SYSConfig.rgbbrightness);        \
-    leds.show();
-#  define InfoIndicatorOFF()                           \
-    leds.setPixelColor(ANEOPIX_INFO_LED, ANEOPIX_OFF); \
-    leds.show();
-#  ifdef ANEOPIX_IND_DATA_GPIO2 // Used for relay power indicator
-// For the critical ON indicator there is no method to turn it off, the only way is to unplug the device
-// This enable to have persistence of the indicator to inform the user
-#    define CriticalIndicatorON()                              \
-      leds2.setPixelColor(ANEOPIX_INFO_LED, ANEOPIX_CRITICAL); \
-      leds2.setBrightness(255);                                \
-      leds2.show();
-#    define PowerIndicatorON()                             \
-      leds2.setPixelColor(ANEOPIX_INFO_LED, ANEOPIX_INFO); \
-      leds2.setBrightness(SYSConfig.rgbbrightness);        \
-      leds2.show();
-#    define PowerIndicatorOFF()                           \
-      leds2.setPixelColor(ANEOPIX_INFO_LED, ANEOPIX_OFF); \
-      leds2.show();
-#  endif
-#  define SetupIndicatorInfo()
-#  define SetupIndicatorSendReceive()
-#  define SetupIndicatorError()
+#ifndef DEFAULT_ADJ_BRIGHTNESS
+#  define DEFAULT_ADJ_BRIGHTNESS 255 // Set Default RGB adjustable brightness
+#endif
+
+#ifndef LED_POWER_COLOR
+#  define LED_POWER_COLOR 0x00FF00 // Green
+#endif
+#ifndef LED_PROCESSING_COLOR
+#  define LED_PROCESSING_COLOR 0x0000FF // Blue
+#endif
+#ifndef LED_WAITING_ONBOARD_COLOR
+#  define LED_WAITING_ONBOARD_COLOR 0xFFA500 // Orange
+#endif
+#ifndef LED_ONBOARD_COLOR
+#  define LED_ONBOARD_COLOR 0xFFFF00 // Yellow
+#endif
+#ifndef LED_NETWORK_OK_COLOR
+#  define LED_NETWORK_OK_COLOR 0x00FF00 // Green
+#endif
+#ifndef LED_NETWORK_ERROR_COLOR
+#  define LED_NETWORK_ERROR_COLOR 0xFFA500 // Orange
+#endif
+#ifndef LED_BROKER_OK_COLOR
+#  define LED_BROKER_OK_COLOR 0x00FF00 // Green
+#endif
+#ifndef LED_BROKER_ERROR_COLOR
+#  define LED_BROKER_ERROR_COLOR 0xFFA500 // Orange
+#endif
+#ifndef LED_OFFLINE_COLOR
+#  define LED_OFFLINE_COLOR 0x0000FF // Blue
+#endif
+#ifndef LED_OTA_LOCAL_COLOR
+#  define LED_OTA_LOCAL_COLOR 0xFF00FF // Magenta
+#endif
+#ifndef LED_OTA_REMOTE_COLOR
+#  define LED_OTA_REMOTE_COLOR 0x8000FF // Purple
+#endif
+#ifndef LED_ERROR_COLOR
+#  define LED_ERROR_COLOR 0xFF0000 // Red
+#endif
+#ifndef LED_ACTUATOR_ONOFF_COLOR
+#  define LED_ACTUATOR_ONOFF_COLOR 0x00FF00 // Green
+#endif
+#ifndef LED_COLOR_BLACK
+#  define LED_COLOR_BLACK 0x000000
 #endif
 
 #ifdef ESP8266
 //#  define TRIGGER_GPIO 14 // pin D5 as full reset button (long press >10s)
-#elif ESP32
+#elif defined(ESP32)
 //#  define TRIGGER_GPIO 0 // boot button as full reset button (long press >10s)
 //#  define NO_INT_TEMP_READING true //Define if we don't want internal temperature reading for the ESP32
 #endif
@@ -660,9 +561,15 @@ Adafruit_NeoPixel leds2(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO2, ANEOPIX_IN
 #endif
 /*--------------MQTT general topics-----------------*/
 // global MQTT subject listened by the gateway to execute commands (send RF, IR or others)
-#define subjectMQTTtoX     "/commands/#"
-#define subjectMultiGTWKey "toMQTT"
-#define subjectGTWSendKey  "MQTTto"
+#ifndef subjectMQTTtoX
+#  define subjectMQTTtoX "/commands/#"
+#endif
+#ifndef subjectMultiGTWKey
+#  define subjectMultiGTWKey "toMQTT"
+#endif
+#ifndef subjectGTWSendKey
+#  define subjectGTWSendKey "MQTTto"
+#endif
 
 // key used for launching commands to the gateway
 #define restartCmd "restart"
@@ -673,24 +580,6 @@ Adafruit_NeoPixel leds2(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO2, ANEOPIX_IN
 #  define valueAsATopic false // define true to integrate msg value into the subject when receiving
 #endif
 
-#if defined(ESP32)
-#  define JSON_MSG_BUFFER    816 // adjusted to minimum size covering largest Theengs device JSON properties (RuuviTag_RAWv2)
-#  define SIGNAL_SIZE_UL_ULL uint64_t
-#  define STRTO_UL_ULL       strtoull
-#elif defined(ESP8266)
-#  define JSON_MSG_BUFFER    512 // Json message max buffer size, don't put 768 or higher it is causing unexpected behaviour on ESP8266
-#  define SIGNAL_SIZE_UL_ULL uint64_t
-#  define STRTO_UL_ULL       strtoull
-#elif defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-#  define JSON_MSG_BUFFER    512 // Json message max buffer size, don't put 1024 or higher
-#  define SIGNAL_SIZE_UL_ULL uint64_t
-#  define STRTO_UL_ULL       strtoul
-#else // boards with smaller memory
-#  define JSON_MSG_BUFFER    64 // Json message max buffer size, don't put 1024 or higher
-#  define SIGNAL_SIZE_UL_ULL uint32_t
-#  define STRTO_UL_ULL       strtoul
-#endif
-
 #if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) || defined(ZgatewayRTL_433)
 // variable to avoid duplicates
 #  ifndef time_avoid_duplicate
@@ -698,21 +587,69 @@ Adafruit_NeoPixel leds2(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO2, ANEOPIX_IN
 #  endif
 #endif
 
-#define TimeBetweenReadingSYS        120 // time between (s) system readings (like memory)
+#ifndef TimeBetweenReadingSYS
+#  define TimeBetweenReadingSYS 120 // time between (s) system readings (like memory)
+#endif
 #define TimeBetweenCheckingSYS       3600 // time between (s) system checkings (like updates)
 #define TimeLedON                    1 // time LED are ON
 #define InitialMQTTConnectionTimeout 10 // time estimated (s) before the board is connected to MQTT
-#define subjectSYStoMQTT             "/SYStoMQTT" // system parameters
-#define subjectLOGtoMQTT             "/LOGtoMQTT" // log informations
-#define subjectRLStoMQTT             "/RLStoMQTT" // latest release information
-#define subjectMQTTtoSYSset          "/commands/MQTTtoSYS/config"
-#define subjectMQTTtoSYSupdate       "/commands/MQTTtoSYS/firmware_update"
-#define TimeToResetAtStart           5000 // Time we allow the user at start for the reset command by button press
+#ifndef subjectSYStoMQTT
+#  define subjectSYStoMQTT "/SYStoMQTT" // system parameters
+#endif
+#ifndef subjectLOGtoMQTT
+#  define subjectLOGtoMQTT "/LOGtoMQTT" // log informations
+#endif
+#ifndef subjectRLStoMQTT
+#  define subjectRLStoMQTT "/RLStoMQTT" // latest release information
+#endif
+#ifndef subjectMQTTtoSYSset
+#  define subjectMQTTtoSYSset "/commands/MQTTtoSYS/config"
+#endif
+#ifndef subjectMQTTtoSYSupdate
+#  define subjectMQTTtoSYSupdate "/commands/MQTTtoSYS/firmware_update"
+#endif
+#define TimeToResetAtStart 5000 // Time we allow the user at start for the reset command by button press
+
+#include <ArduinoLog.h>
+
 /*-------------------DEFINE LOG LEVEL----------------------*/
 #ifndef LOG_LEVEL
 #  define LOG_LEVEL LOG_LEVEL_NOTICE
 #endif
 
+/*-------------------SIMPLIFIED LOGGING MACROS----------------------*/
+// ArduinoLog levels: SILENT=0, FATAL=1, ERROR=2, WARNING=3, NOTICE=4, TRACE=5, VERBOSE=6
+#if LOG_LEVEL >= LOG_LEVEL_VERBOSE
+#  define THEENGS_LOG_VERBOSE(...) Log.verbose(__VA_ARGS__)
+#else
+#  define THEENGS_LOG_VERBOSE(...) ((void)0)
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_TRACE
+#  define THEENGS_LOG_TRACE(...) Log.trace(__VA_ARGS__)
+#else
+#  define THEENGS_LOG_TRACE(...) ((void)0)
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_NOTICE
+#  define THEENGS_LOG_NOTICE(...) Log.notice(__VA_ARGS__)
+#else
+#  define THEENGS_LOG_NOTICE(...) ((void)0)
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_WARNING
+#  define THEENGS_LOG_WARNING(...) Log.warning(__VA_ARGS__)
+#else
+#  define THEENGS_LOG_WARNING(...) ((void)0)
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_ERROR
+#  define THEENGS_LOG_ERROR(...) Log.error(__VA_ARGS__)
+#else
+#  define THEENGS_LOG_ERROR(...) ((void)0)
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_FATAL
+#  define LOG_FATAL(...) Log.fatal(__VA_ARGS__)
+#else
+#  define LOG_FATAL(...) ((void)0)
+#endif
+
 /*-------------------ESP Wifi band and tx power ---------------------*/
 //Certain sensors are sensitive to Wifi which can cause interference with their normal operation
 //For example it can cause false triggers on a PIR HC-SR501
@@ -731,72 +668,55 @@ Adafruit_NeoPixel leds2(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO2, ANEOPIX_IN
 
 /*-----------PLACEHOLDERS FOR OLED/LCD DISPLAY--------------*/
 // The real definitions are in config_M5.h / config_SSD1306.h
-#define pubOled(...)        // display the published message onto the OLED display
 #define displayPrint(...)   // only print if not in low power mode
 #define lpDisplayPrint(...) // print in low power mode
 
-/*----------- SHARED WITH OMG MODULES --------------*/
-
-char mqtt_topic[parameters_size + 1] = Base_Topic;
-char gateway_name[parameters_size + 1] = Gateway_Name;
-
-void connectMQTT();
-#ifndef ESPWifiManualSetup
-void saveConfig();
-#endif
-
-unsigned long uptime();
-bool cmpToMainTopic(const char*, const char*);
-void pub(const char*, const char*, bool);
-// void pub(const char*, JsonObject&);
-void pub(const char*, const char*);
-// void pub_custom_topic(const char*, JsonObject&, boolean);
-
-#if defined(ESP32)
-#  include <Preferences.h>
-Preferences preferences;
-#endif
-
-#ifdef ZmqttDiscovery
-unsigned long lastDiscovery = 0; // Time of the last discovery to trigger automaticaly to off after DiscoveryAutoOffTimer
-#endif
-
-#if defined(ESP8266) || defined(ESP32)
-#  include <vector>
-// Flags definition for white list, black list, discovery management
-#  define device_flags_init     0 << 0
-#  define device_flags_isDisc   1 << 0
-#  define device_flags_isWhiteL 1 << 1
-#  define device_flags_isBlackL 1 << 2
-#  define device_flags_connect  1 << 3
-#  define isWhite(device)       device->isWhtL
-#  define isBlack(device)       device->isBlkL
-#  define isDiscovered(device)  device->isDisc
-
 /*--------------------Minimum freeHeap--------------------*/
 // Below this parameter we trigger a restart, this avoid stuck boards like seen in https://github.com/1technophile/OpenMQTTGateway/issues/1693
-#  define MinimumMemory 40000
+#define MinimumMemory 40000
 
 /*----------------CONFIGURABLE PARAMETERS-----------------*/
-struct SYSConfig_s {
-  bool discovery; // HA discovery convention
-  bool ohdiscovery; // OH discovery specificities
-#  ifdef RGB_INDICATORS
-  int rgbbrightness; // brightness of the RGB LED
-#  endif
-};
+#ifndef DEFAULT_DISCOVERY
+#  define DEFAULT_DISCOVERY true
+#endif
 
+#ifndef DEFAULT_MQTT
+#  define DEFAULT_MQTT true
+#endif
+#ifndef DEFAULT_SERIAL
+#  define DEFAULT_SERIAL false
+#endif
+#ifndef DEFAULT_BLUFI
+#  define DEFAULT_BLUFI true
+#endif
+#ifndef DEFAULT_OFFLINE
+#  define DEFAULT_OFFLINE false
 #endif
 
 #if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) || defined(ZgatewayRTL_433)
-bool isAduplicateSignal(SIGNAL_SIZE_UL_ULL);
-void storeSignalValue(SIGNAL_SIZE_UL_ULL);
+bool isAduplicateSignal(uint64_t);
+void storeSignalValue(uint64_t);
 #endif
 
-// Origin topics
-#define subjectBTtoMQTT "/BTtoMQTT"
+#ifdef ZgatewayBT
+#  ifndef BLEDecryptor
+#    define BLEDecryptor true //true if decrypt encrypted PVVX, BTHome v2 or Victron Energy broadcast data
+#    ifndef JSON_BLE_AES_CUSTOM_KEYS
+#      define JSON_BLE_AES_CUSTOM_KEYS 256 // 42 byte BLE Custom Key * 6 rounded up to 256.
+#    endif
+// Runtime default for ble_aes[]. Empty = no default; override at build time
+// with -DBLE_AES='"<32-hex-key>"' to ship a stock key.
+#    ifndef BLE_AES
+#      define BLE_AES ""
+#    endif
+#  endif
+#endif
 
 #define convertTemp_CtoF(c) ((c * 1.8) + 32)
 #define convertTemp_FtoC(f) ((f - 32) * 5 / 9)
 
+#ifndef QueueSize
+#  define QueueSize 18
+#endif
+
 #endif
diff --git a/main/Zblufi.ino b/main/Zblufi.ino
deleted file mode 100644
index f76f378..0000000
--- a/main/Zblufi.ino
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
-
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
-   Send and receiving command by MQTT
-
-  This program enables to:
- - receive MQTT data from a topic and send signal (RF, IR, BLE, GSM)  corresponding to the received MQTT data
- - publish MQTT data to a different topic related to received signals (RF, IR, BLE, GSM)
-
-  Copyright: (c)Florian ROBERT
-
-    This file is part of OpenMQTTGateway.
-
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#if defined(ESP32) && defined(USE_BLUFI)
-
-#  include "esp_blufi_api.h"
-
-extern "C" {
-#  include "esp_blufi.h"
-}
-
-/* store the station info for send back to phone */
-//static bool gl_sta_connected = false;
-bool omg_blufi_ble_connected = false;
-static uint8_t gl_sta_bssid[6];
-static uint8_t gl_sta_ssid[32];
-static uint8_t gl_sta_passwd[64];
-static int gl_sta_ssid_len;
-static bool gl_sta_is_connecting = false;
-static esp_blufi_extra_info_t gl_sta_conn_info;
-
-static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_param_t* param);
-void wifi_event_handler(arduino_event_id_t event);
-esp_err_t blufi_security_init(void);
-void blufi_dh_negotiate_data_handler(uint8_t* data, int len, uint8_t** output_data, int* output_len, bool* need_free);
-int blufi_aes_encrypt(uint8_t iv8, uint8_t* crypt_data, int crypt_len);
-int blufi_aes_decrypt(uint8_t iv8, uint8_t* crypt_data, int crypt_len);
-uint16_t blufi_crc_checksum(uint8_t iv8, uint8_t* data, int len);
-void blufi_security_deinit(void);
-
-static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_param_t* param) {
-  /* actually, should post to blufi_task handle the procedure,
-     * now, as a example, we do it more simply */
-  switch (event) {
-    case ESP_BLUFI_EVENT_INIT_FINISH:
-      Log.notice(F("BLUFI init finish" CR));
-      esp_blufi_adv_start();
-      break;
-    case ESP_BLUFI_EVENT_DEINIT_FINISH:
-      Log.notice(F("BLUFI deinit finish" CR));
-      NimBLEDevice::deinit(true);
-      break;
-    case ESP_BLUFI_EVENT_BLE_CONNECT:
-      omg_blufi_ble_connected = true;
-      esp_blufi_adv_stop();
-      blufi_security_init();
-      break;
-    case ESP_BLUFI_EVENT_BLE_DISCONNECT:
-      omg_blufi_ble_connected = false;
-      blufi_security_deinit();
-      if (WiFi.isConnected()) {
-        esp_blufi_deinit();
-      } else {
-        esp_blufi_adv_start();
-      }
-      break;
-    case ESP_BLUFI_EVENT_REQ_CONNECT_TO_AP:
-      Log.notice(F("BLUFI requset wifi connect to AP" CR));
-      WiFi.begin((char*)gl_sta_ssid, (char*)gl_sta_passwd);
-      gl_sta_is_connecting = true;
-      break;
-    case ESP_BLUFI_EVENT_REQ_DISCONNECT_FROM_AP:
-      Log.notice(F("BLUFI requset wifi disconnect from AP\n" CR));
-      WiFi.disconnect();
-      break;
-    case ESP_BLUFI_EVENT_REPORT_ERROR:
-      Log.notice(F("BLUFI report error, error code %d\n" CR), param->report_error.state);
-      esp_blufi_send_error_info(param->report_error.state);
-      break;
-    case ESP_BLUFI_EVENT_GET_WIFI_STATUS: {
-      esp_blufi_extra_info_t info;
-      if (WiFi.isConnected()) {
-        memset(&info, 0, sizeof(esp_blufi_extra_info_t));
-        memcpy(info.sta_bssid, gl_sta_bssid, 6);
-        info.sta_bssid_set = true;
-        info.sta_ssid = gl_sta_ssid;
-        info.sta_ssid_len = gl_sta_ssid_len;
-        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONN_SUCCESS, 0, &info);
-      } else if (gl_sta_is_connecting) {
-        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONNECTING, 0, &gl_sta_conn_info);
-      } else {
-        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONN_FAIL, 0, &gl_sta_conn_info);
-      }
-
-      break;
-    }
-    case ESP_BLUFI_EVENT_RECV_SLAVE_DISCONNECT_BLE:
-      esp_blufi_disconnect();
-      break;
-    case ESP_BLUFI_EVENT_RECV_STA_SSID:
-      strncpy((char*)gl_sta_ssid, (char*)param->sta_ssid.ssid, param->sta_ssid.ssid_len);
-      gl_sta_ssid[param->sta_ssid.ssid_len] = '\0';
-      Log.notice(F("Recv STA SSID %s" CR), gl_sta_ssid);
-      break;
-    case ESP_BLUFI_EVENT_RECV_STA_PASSWD:
-      strncpy((char*)gl_sta_passwd, (char*)param->sta_passwd.passwd, param->sta_passwd.passwd_len);
-      gl_sta_passwd[param->sta_passwd.passwd_len] = '\0';
-      Log.notice(F("Recv STA PASSWORD %s" CR), gl_sta_passwd);
-      break;
-    case ESP_BLUFI_EVENT_GET_WIFI_LIST: {
-      WiFi.scanNetworks(true);
-      break;
-    }
-    case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA: {
-      Log.notice(F("Recv Custom Data %" PRIu32 CR), param->custom_data.data_len);
-      esp_log_buffer_hex("Custom Data", param->custom_data.data, param->custom_data.data_len);
-
-      DynamicJsonDocument json(1024);
-      auto error = deserializeJson(json, param->custom_data.data);
-      if (error) {
-        Log.error(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
-        break;
-      }
-      if (!json.isNull()) {
-        Log.trace(F("\nparsed json, size: %u" CR), json.memoryUsage());
-        if (json.containsKey("mqtt_server"))
-          strcpy(mqtt_server, json["mqtt_server"]);
-        if (json.containsKey("mqtt_port"))
-          strcpy(mqtt_port, json["mqtt_port"]);
-        if (json.containsKey("mqtt_user"))
-          strcpy(mqtt_user, json["mqtt_user"]);
-        if (json.containsKey("mqtt_pass"))
-          strcpy(mqtt_pass, json["mqtt_pass"]);
-        if (json.containsKey("mqtt_topic"))
-          strcpy(mqtt_topic, json["mqtt_topic"]);
-        if (json.containsKey("mqtt_broker_secure"))
-          mqtt_secure = json["mqtt_broker_secure"].as<bool>();
-        if (json.containsKey("gateway_name"))
-          strcpy(gateway_name, json["gateway_name"]);
-        saveConfig();
-      }
-      break;
-    }
-    case ESP_BLUFI_EVENT_RECV_USERNAME:
-      break;
-    case ESP_BLUFI_EVENT_RECV_CA_CERT:
-      break;
-    case ESP_BLUFI_EVENT_RECV_CLIENT_CERT:
-      break;
-    case ESP_BLUFI_EVENT_RECV_SERVER_CERT:
-      break;
-    case ESP_BLUFI_EVENT_RECV_CLIENT_PRIV_KEY:
-      break;
-      ;
-    case ESP_BLUFI_EVENT_RECV_SERVER_PRIV_KEY:
-      break;
-    default:
-      break;
-  }
-}
-
-void wifi_event_handler(arduino_event_id_t event) {
-  switch (event) {
-    case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
-    case ARDUINO_EVENT_WIFI_STA_GOT_IP: {
-      gl_sta_is_connecting = false;
-      esp_blufi_extra_info_t info;
-      memset(&info, 0, sizeof(esp_blufi_extra_info_t));
-      memcpy(info.sta_bssid, gl_sta_bssid, 6);
-      info.sta_bssid_set = true;
-      info.sta_ssid = gl_sta_ssid;
-      info.sta_ssid_len = gl_sta_ssid_len;
-      if (omg_blufi_ble_connected == true) {
-        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONN_SUCCESS, 0, &info);
-      }
-
-      break;
-    }
-    case ARDUINO_EVENT_WIFI_SCAN_DONE: {
-      uint16_t apCount = WiFi.scanComplete();
-      if (apCount == 0) {
-        Log.notice(F("No AP found" CR));
-        break;
-      }
-      wifi_ap_record_t* ap_list = (wifi_ap_record_t*)malloc(sizeof(wifi_ap_record_t) * apCount);
-      if (!ap_list) {
-        Log.error(F("malloc error, ap_list is NULL"));
-        break;
-      }
-      ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&apCount, ap_list));
-      esp_blufi_ap_record_t* blufi_ap_list = (esp_blufi_ap_record_t*)malloc(apCount * sizeof(esp_blufi_ap_record_t));
-      if (!blufi_ap_list) {
-        if (ap_list) {
-          free(ap_list);
-        }
-        Log.error(F("malloc error, blufi_ap_list is NULL" CR));
-        break;
-      }
-      for (int i = 0; i < apCount; ++i) {
-        blufi_ap_list[i].rssi = ap_list[i].rssi;
-        memcpy(blufi_ap_list[i].ssid, ap_list[i].ssid, sizeof(ap_list[i].ssid));
-      }
-
-      if (omg_blufi_ble_connected == true) {
-        esp_blufi_send_wifi_list(apCount, blufi_ap_list);
-      }
-
-      free(ap_list);
-      free(blufi_ap_list);
-      break;
-    }
-    default:
-      break;
-  }
-  return;
-}
-
-static esp_blufi_callbacks_t example_callbacks = {
-    .event_cb = example_event_callback,
-    .negotiate_data_handler = blufi_dh_negotiate_data_handler,
-    .encrypt_func = blufi_aes_encrypt,
-    .decrypt_func = blufi_aes_decrypt,
-    .checksum_func = blufi_crc_checksum,
-};
-
-bool startBlufi() {
-  esp_err_t ret = ESP_OK;
-  WiFi.onEvent(wifi_event_handler);
-
-  ret = esp_blufi_register_callbacks(&example_callbacks);
-  if (ret) {
-    Log.error(F("%s blufi register failed, error code = %x" CR), __func__, ret);
-    return false;
-  }
-
-  if (NimBLEDevice::getInitialized()) {
-    NimBLEDevice::deinit(true);
-    delay(50);
-  }
-  esp_blufi_btc_init();
-  uint8_t mac[6];
-  esp_read_mac(mac, ESP_MAC_WIFI_STA);
-  char advName[20] = {0};
-  snprintf(advName, sizeof(advName), "OMGBFI_%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-  NimBLEDevice::init(advName);
-  esp_blufi_gatt_svr_init();
-  ble_gatts_start();
-  return esp_blufi_profile_init() == ESP_OK;
-}
-
-#endif // defined(ESP32) && defined(USE_BLUFI)
diff --git a/main/ZcommonRF.ino b/main/ZcommonRF.ino
deleted file mode 100644
index 2d5a41e..0000000
--- a/main/ZcommonRF.ino
+++ /dev/null
@@ -1,339 +0,0 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
-
-   Act as a wifi or ethernet gateway between your BLE/433mhz/infrared IR signal and an MQTT broker 
-   Send and receiving command by MQTT
-  
-    Copyright: (c)Florian ROBERT
-  
-    This file is part of OpenMQTTGateway.
-    
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-
-#include "User_config.h"
-
-#if defined(ZgatewayRF) || defined(ZgatewayPilight) || defined(ZgatewayRTL_433) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
-#  ifndef ARDUINO_AVR_UNO
-
-#    ifdef ZradioCC1101
-#      include <ELECHOUSE_CC1101_SRC_DRV.h>
-#    endif
-
-void initCC1101() {
-#    ifdef ZradioCC1101 //receiving with CC1101
-  // Loop on getCC1101() until it returns true and break after 10 attempts
-  int delayMS = 16;
-  int delayMaxMS = 500;
-  for (int i = 0; i < 10; i++) {
-    if (ELECHOUSE_cc1101.getCC1101()) {
-      Log.notice(F("C1101 spi Connection OK" CR));
-      ELECHOUSE_cc1101.Init();
-      ELECHOUSE_cc1101.SetRx(RFConfig.frequency);
-      break;
-    } else {
-      Log.error(F("C1101 spi Connection Error" CR));
-      delay(delayMS);
-    }
-    // truncated exponential backoff
-    delayMS = delayMS * 2;
-    if (delayMS > delayMaxMS) delayMS = delayMaxMS;
-  }
-#    endif
-}
-
-void setupCommonRF() {
-  RFConfig_init();
-  RFConfig_load();
-}
-
-bool validFrequency(float mhz) {
-  //  CC1101 valid frequencies 300-348 MHZ, 387-464MHZ and 779-928MHZ.
-  if (mhz >= 300 && mhz <= 348)
-    return true;
-  if (mhz >= 387 && mhz <= 464)
-    return true;
-  if (mhz >= 779 && mhz <= 928)
-    return true;
-  return false;
-}
-
-int currentReceiver = ACTIVE_NONE;
-
-#    if !defined(ZgatewayRFM69) && !defined(ZactuatorSomfy)
-#      if defined(ESP8266) || defined(ESP32)
-// Check if a receiver is available
-bool validReceiver(int receiver) {
-  switch (receiver) {
-#        ifdef ZgatewayPilight
-    case ACTIVE_PILIGHT:
-      return true;
-#        endif
-#        ifdef ZgatewayRF
-    case ACTIVE_RF:
-      return true;
-#        endif
-#        ifdef ZgatewayRTL_433
-    case ACTIVE_RTL:
-      return true;
-#        endif
-#        ifdef ZgatewayRF2
-    case ACTIVE_RF2:
-      return true;
-#        endif
-    default:
-      Log.error(F("ERROR: stored receiver %d not available" CR), receiver);
-  }
-  return false;
-}
-#      endif
-#    endif
-
-void disableCurrentReceiver() {
-  Log.trace(F("disableCurrentReceiver: %d" CR), currentReceiver);
-  switch (currentReceiver) {
-    case ACTIVE_NONE:
-      break;
-#    ifdef ZgatewayPilight
-    case ACTIVE_PILIGHT:
-      disablePilightReceive();
-      break;
-#    endif
-#    ifdef ZgatewayRF
-    case ACTIVE_RF:
-      disableRFReceive();
-      break;
-#    endif
-#    ifdef ZgatewayRTL_433
-    case ACTIVE_RTL:
-      disableRTLreceive();
-      break;
-#    endif
-#    ifdef ZgatewayRF2
-    case ACTIVE_RF2:
-      disableRF2Receive();
-      break;
-#    endif
-#    ifndef ARDUINO_AVR_UNO // Space issues with the UNO
-    default:
-      Log.error(F("ERROR: unsupported receiver %d" CR), RFConfig.activeReceiver);
-#    endif
-  }
-}
-
-void enableActiveReceiver() {
-  Log.trace(F("enableActiveReceiver: %d" CR), RFConfig.activeReceiver);
-  switch (RFConfig.activeReceiver) {
-#    ifdef ZgatewayPilight
-    case ACTIVE_PILIGHT:
-      initCC1101();
-      enablePilightReceive();
-      currentReceiver = ACTIVE_PILIGHT;
-      break;
-#    endif
-#    ifdef ZgatewayRF
-    case ACTIVE_RF:
-      initCC1101();
-      enableRFReceive();
-      currentReceiver = ACTIVE_RF;
-      break;
-#    endif
-#    ifdef ZgatewayRTL_433
-    case ACTIVE_RTL:
-      initCC1101();
-      enableRTLreceive();
-      currentReceiver = ACTIVE_RTL;
-      break;
-#    endif
-#    ifdef ZgatewayRF2
-    case ACTIVE_RF2:
-      initCC1101();
-      enableRF2Receive();
-      currentReceiver = ACTIVE_RF2;
-      break;
-#    endif
-    case ACTIVE_RECERROR:
-      Log.error(F("ERROR: no receiver selected" CR));
-      break;
-#    ifndef ARDUINO_AVR_UNO // Space issues with the UNO
-    default:
-      Log.error(F("ERROR: unsupported receiver %d" CR), RFConfig.activeReceiver);
-#    endif
-  }
-}
-
-String stateRFMeasures() {
-  //Publish RTL_433 state
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  JsonObject RFdata = jsonBuffer.to<JsonObject>();
-  RFdata["active"] = RFConfig.activeReceiver;
-#    if defined(ZradioCC1101) || defined(ZradioSX127x)
-  RFdata["frequency"] = RFConfig.frequency;
-  if (RFConfig.activeReceiver == ACTIVE_RTL) {
-#      ifdef ZgatewayRTL_433
-    RFdata["rssithreshold"] = (int)getRTLrssiThreshold();
-    RFdata["rssi"] = (int)getRTLCurrentRSSI();
-    RFdata["avgrssi"] = (int)getRTLAverageRSSI();
-    RFdata["count"] = (int)getRTLMessageCount();
-#      endif
-#      ifdef ZradioSX127x
-    RFdata["ookthreshold"] = (int)getOOKThresh();
-#      endif
-  }
-#    endif
-  pub(subjectcommonRFtoMQTT, RFdata);
-
-  String output;
-  serializeJson(RFdata, output);
-  return output;
-}
-
-void RFConfig_fromJson(JsonObject& RFdata) {
-  bool success = false;
-  if (RFdata.containsKey("frequency") && validFrequency(RFdata["frequency"])) {
-    Config_update(RFdata, "frequency", RFConfig.frequency);
-    Log.notice(F("RF Receive mhz: %F" CR), RFConfig.frequency);
-    success = true;
-  }
-  if (RFdata.containsKey("active")) {
-    Log.notice(F("RF receiver active: %d" CR), RFConfig.activeReceiver);
-    Config_update(RFdata, "active", RFConfig.activeReceiver);
-    success = true;
-  }
-#    ifdef ZgatewayRTL_433
-  if (RFdata.containsKey("rssithreshold")) {
-    Log.notice(F("RTL_433 RSSI Threshold : %d " CR), RFConfig.rssiThreshold);
-    Config_update(RFdata, "rssithreshold", RFConfig.rssiThreshold);
-    rtl_433.setRSSIThreshold(RFConfig.rssiThreshold);
-    success = true;
-  }
-#      if defined(RF_SX1276) || defined(RF_SX1278)
-  if (RFdata.containsKey("ookthreshold")) {
-    Config_update(RFdata, "ookthreshold", RFConfig.newOokThreshold);
-    Log.notice(F("RTL_433 ookThreshold %d" CR), RFConfig.newOokThreshold);
-    rtl_433.setOOKThreshold(RFConfig.newOokThreshold);
-    success = true;
-  }
-#      endif
-  if (RFdata.containsKey("status")) {
-    Log.notice(F("RF get status:" CR));
-    rtl_433.getStatus();
-    success = true;
-  }
-  if (!success) {
-    Log.error(F("MQTTtoRF Fail json" CR));
-  }
-#    endif
-  disableCurrentReceiver();
-  enableActiveReceiver();
-#    ifdef ESP32
-  if (RFdata.containsKey("erase") && RFdata["erase"].as<bool>()) {
-    // Erase config from NVS (non-volatile storage)
-    preferences.begin(Gateway_Short_Name, false);
-    if (preferences.isKey("RFConfig")) {
-      int result = preferences.remove("RFConfig");
-      Log.notice(F("RF config erase result: %d" CR), result);
-      preferences.end();
-      return; // Erase prevails on save, so skipping save
-    } else {
-      Log.notice(F("RF config not found" CR));
-      preferences.end();
-    }
-  }
-  if (RFdata.containsKey("save") && RFdata["save"].as<bool>()) {
-    StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-    JsonObject jo = jsonBuffer.to<JsonObject>();
-    jo["frequency"] = RFConfig.frequency;
-    jo["active"] = RFConfig.activeReceiver;
-// Don't save those for now, need to be tested
-#      ifdef ZgatewayRTL_433
-//jo["rssithreshold"] = RFConfig.rssiThreshold;
-//jo["ookthreshold"] = RFConfig.newOokThreshold;
-#      endif
-    // Save config into NVS (non-volatile storage)
-    String conf = "";
-    serializeJson(jsonBuffer, conf);
-    preferences.begin(Gateway_Short_Name, false);
-    int result = preferences.putString("RFConfig", conf);
-    preferences.end();
-    Log.notice(F("RF Config_save: %s, result: %d" CR), conf.c_str(), result);
-  }
-#    endif
-}
-
-void RFConfig_init() {
-  RFConfig.frequency = RF_FREQUENCY;
-  RFConfig.activeReceiver = ACTIVE_RECEIVER;
-  RFConfig.rssiThreshold = 0;
-  RFConfig.newOokThreshold = 0;
-}
-
-void RFConfig_load() {
-#    ifdef ESP32
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  preferences.begin(Gateway_Short_Name, true);
-  if (preferences.isKey("RFConfig")) {
-    auto error = deserializeJson(jsonBuffer, preferences.getString("RFConfig", "{}"));
-    preferences.end();
-    if (error) {
-      Log.error(F("RF Config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
-      return;
-    }
-    if (jsonBuffer.isNull()) {
-      Log.warning(F("RF Config is null" CR));
-      return;
-    }
-    JsonObject jo = jsonBuffer.as<JsonObject>();
-    RFConfig_fromJson(jo);
-    Log.notice(F("RF Config loaded" CR));
-  } else {
-    preferences.end();
-    Log.notice(F("RF Config not found using default" CR));
-    enableActiveReceiver();
-  }
-#    else
-  enableActiveReceiver();
-#    endif
-}
-
-void MQTTtoRFset(char* topicOri, JsonObject& RFdata) {
-  if (cmpToMainTopic(topicOri, subjectMQTTtoRFset)) {
-    Log.trace(F("MQTTtoRF json set" CR));
-
-    /*
-     * Configuration modifications priorities:
-     *  First `init=true` and `load=true` commands are executed (if both are present, INIT prevails on LOAD)
-     *  Then parameters included in json are taken in account
-     *  Finally `erase=true` and `save=true` commands are executed (if both are present, ERASE prevails on SAVE)
-     */
-    if (RFdata.containsKey("init") && RFdata["init"].as<bool>()) {
-      // Restore the default (initial) configuration
-      RFConfig_init();
-    } else if (RFdata.containsKey("load") && RFdata["load"].as<bool>()) {
-      // Load the saved configuration, if not initialised
-      RFConfig_load();
-    }
-
-    // Load config from json if available
-    RFConfig_fromJson(RFdata);
-    stateRFMeasures();
-  }
-}
-#  else
-void RFConfig_init() {}
-void RFConfig_load() {}
-void MQTTtoRFset(char* topicOri, JsonObject& RFdata) {}
-void enableActiveReceiver() {}
-#  endif
-#endif
diff --git a/main/ZgatewayBLEConnect.ino b/main/ZgatewayBLEConnect.ino
deleted file mode 100644
index 50d878b..0000000
--- a/main/ZgatewayBLEConnect.ino
+++ /dev/null
@@ -1,502 +0,0 @@
-#ifdef ESP32
-#  include "User_config.h"
-#  ifdef ZgatewayBT
-#    include "ArduinoJson.h"
-#    include "ArduinoLog.h"
-#    include "ZgatewayBLEConnect.h"
-#    define convertTemp_CtoF(c) ((c * 1.8) + 32)
-
-extern std::vector<BLEdevice*> devices;
-
-NimBLERemoteCharacteristic* zBLEConnect::getCharacteristic(const NimBLEUUID& service,
-                                                           const NimBLEUUID& characteristic) {
-  BLERemoteCharacteristic* pRemoteCharacteristic = nullptr;
-  if (!m_pClient) {
-    Log.error(F("No BLE client" CR));
-  } else if (!m_pClient->isConnected() && !m_pClient->connect()) {
-    Log.error(F("Connect to: %s failed" CR), m_pClient->getPeerAddress().toString().c_str());
-  } else {
-    BLERemoteService* pRemoteService = m_pClient->getService(service);
-    if (!pRemoteService) {
-      Log.notice(F("Failed to find service UUID: %s" CR), service.toString().c_str());
-    } else {
-      Log.trace(F("Found service: %s" CR), service.toString().c_str());
-      Log.trace(F("Client isConnected, freeHeap: %d" CR), ESP.getFreeHeap());
-      pRemoteCharacteristic = pRemoteService->getCharacteristic(characteristic);
-      if (!pRemoteCharacteristic) {
-        Log.notice(F("Failed to find characteristic UUID: %s" CR), characteristic.toString().c_str());
-      }
-    }
-  }
-
-  return pRemoteCharacteristic;
-}
-
-bool zBLEConnect::writeData(BLEAction* action) {
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(action->service, action->characteristic);
-  if (pChar && (pChar->canWrite() || pChar->canWriteNoResponse())) {
-    switch (action->value_type) {
-      case BLE_VAL_HEX: {
-        int len = action->value.length();
-        if (len % 2) {
-          Log.error(F("Invalid HEX value length" CR));
-          return false;
-        }
-
-        std::vector<uint8_t> buf;
-        for (auto i = 0; i < len; i += 2) {
-          std::string temp = action->value.substr(i, 2);
-          buf.push_back((uint8_t)strtoul(temp.c_str(), nullptr, 16));
-        }
-        return pChar->writeValue((const uint8_t*)&buf[0], buf.size(), !pChar->canWriteNoResponse());
-      }
-      case BLE_VAL_INT:
-        return pChar->writeValue(strtol(action->value.c_str(), nullptr, 0), !pChar->canWriteNoResponse());
-      case BLE_VAL_FLOAT:
-        return pChar->writeValue(strtod(action->value.c_str(), nullptr), !pChar->canWriteNoResponse());
-      default:
-        return pChar->writeValue(action->value, !pChar->canWriteNoResponse());
-    }
-  }
-  return false;
-}
-
-bool zBLEConnect::readData(BLEAction* action) {
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(action->service, action->characteristic);
-
-  if (pChar && pChar->canRead()) {
-    action->value = pChar->readValue();
-    if (action->value != "") {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool zBLEConnect::processActions(std::vector<BLEAction>& actions) {
-  bool result = false;
-  if (actions.size() > 0) {
-    for (auto& it : actions) {
-      if (NimBLEAddress(it.addr) == m_pClient->getPeerAddress()) {
-        DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
-        JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-        BLEdata["id"] = it.addr;
-        BLEdata["service"] = it.service.toString();
-        BLEdata["characteristic"] = it.characteristic.toString();
-
-        if (it.write) {
-          Log.trace(F("processing BLE write" CR));
-          BLEdata["write"] = it.value;
-          result = writeData(&it);
-        } else {
-          Log.trace(F("processing BLE read" CR));
-          result = readData(&it);
-          if (result) {
-            switch (it.value_type) {
-              case BLE_VAL_HEX: {
-                char* pHex = NimBLEUtils::buildHexData(nullptr, (uint8_t*)it.value.c_str(), it.value.length());
-                BLEdata["read"] = pHex;
-                free(pHex);
-                break;
-              }
-              case BLE_VAL_INT: {
-                int ival = *(int*)it.value.data();
-                BLEdata["read"] = ival;
-                break;
-              }
-              case BLE_VAL_FLOAT: {
-                float fval = *(double*)it.value.data();
-                BLEdata["read"] = fval;
-                break;
-              }
-              default:
-                BLEdata["read"] = it.value.c_str();
-                break;
-            }
-          }
-        }
-
-        it.complete = result;
-        BLEdata["success"] = result;
-        if (result || it.ttl <= 1) {
-          buildTopicFromId(BLEdata, subjectBTtoMQTT);
-          handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-        }
-      }
-    }
-  }
-
-  return result;
-}
-
-/*-----------------------LYWSD03MMC && MHO_C401 HANDLING-----------------------*/
-void LYWSD03MMC_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-  if (m_taskHandle == nullptr) {
-    return; // unexpected notification
-  }
-  if (!BTProcessLock) {
-    Log.trace(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
-
-    if (length == 5) {
-      Log.trace(F("Device identified creating BLE buffer" CR));
-      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
-      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      String mac_address = m_pClient->getPeerAddress().toString().c_str();
-      mac_address.toUpperCase();
-      for (std::vector<BLEdevice*>::iterator it = devices.begin(); it != devices.end(); ++it) {
-        BLEdevice* p = *it;
-        if ((strcmp(p->macAdr, (char*)mac_address.c_str()) == 0)) {
-          if (p->sensorModel_id == BLEconectable::id::LYWSD03MMC)
-            BLEdata["model"] = "LYWSD03MMC";
-          else if (p->sensorModel_id == BLEconectable::id::MHO_C401)
-            BLEdata["model"] = "MHO-C401";
-        }
-      }
-      BLEdata["id"] = (char*)mac_address.c_str();
-      Log.trace(F("Device identified in CB: %s" CR), (char*)mac_address.c_str());
-      BLEdata["tempc"] = (float)((pData[0] | (pData[1] << 8)) * 0.01);
-      BLEdata["tempf"] = (float)(convertTemp_CtoF((pData[0] | (pData[1] << 8)) * 0.01));
-      BLEdata["hum"] = (float)(pData[2]);
-      BLEdata["volt"] = (float)(((pData[4] * 256) + pData[3]) / 1000.0);
-      BLEdata["batt"] = (float)(((((pData[4] * 256) + pData[3]) / 1000.0) - 2.1) * 100);
-      buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-    } else {
-      Log.notice(F("Invalid notification data" CR));
-      return;
-    }
-  } else {
-    Log.trace(F("Callback process canceled by BTProcessLock" CR));
-  }
-
-  xTaskNotifyGive(m_taskHandle);
-}
-
-void LYWSD03MMC_connect::publishData() {
-  NimBLEUUID serviceUUID("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6");
-  NimBLEUUID charUUID("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6");
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
-
-  if (pChar && pChar->canNotify()) {
-    Log.trace(F("Registering notification" CR));
-    if (pChar->subscribe(true, std::bind(&LYWSD03MMC_connect::notifyCB, this,
-                                         std::placeholders::_1, std::placeholders::_2,
-                                         std::placeholders::_3, std::placeholders::_4))) {
-      m_taskHandle = xTaskGetCurrentTaskHandle();
-      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
-        m_taskHandle = nullptr;
-      }
-    } else {
-      Log.notice(F("Failed registering notification" CR));
-    }
-  }
-}
-
-/*-----------------------DT24 HANDLING-----------------------*/
-void DT24_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-  if (m_taskHandle == nullptr) {
-    return; // unexpected notification
-  }
-
-  if (!BTProcessLock) {
-    Log.trace(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
-    if (length == 20) {
-      m_data.assign(pData, pData + length);
-      return;
-    } else if (m_data.size() == 20 && length == 16) {
-      m_data.insert(m_data.end(), pData, pData + length);
-
-      // DT24-BLE data format
-      // https://github.com/NiceLabs/atorch-console/blob/master/docs/protocol-design.md#dc-meter-report
-      // Data comes as two packets ( 20 and 16 ), and am only processing first
-      Log.trace(F("Device identified creating BLE buffer" CR));
-      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
-      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      String mac_address = m_pClient->getPeerAddress().toString().c_str();
-      mac_address.toUpperCase();
-      BLEdata["model"] = "DT24";
-      BLEdata["id"] = (char*)mac_address.c_str();
-      Log.trace(F("Device identified in CB: %s" CR), (char*)mac_address.c_str());
-      BLEdata["volt"] = (float)(((m_data[4] * 256 * 256) + (m_data[5] * 256) + m_data[6]) / 10.0);
-      BLEdata["current"] = (float)(((m_data[7] * 256 * 256) + (m_data[8] * 256) + m_data[9]) / 1000.0);
-      BLEdata["power"] = (float)(((m_data[10] * 256 * 256) + (m_data[11] * 256) + m_data[12]) / 10.0);
-      BLEdata["energy"] = (float)(((m_data[13] * 256 * 256 * 256) + (m_data[14] * 256 * 256) + (m_data[15] * 256) + m_data[16]) / 100.0);
-      BLEdata["price"] = (float)(((m_data[17] * 256 * 256) + (m_data[18] * 256) + m_data[19]) / 100.0);
-      BLEdata["tempc"] = (float)(m_data[24] * 256) + m_data[25];
-      BLEdata["tempf"] = (float)(convertTemp_CtoF((m_data[24] * 256) + m_data[25]));
-      buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-    } else {
-      Log.notice(F("Invalid notification data" CR));
-      return;
-    }
-  } else {
-    Log.trace(F("Callback process canceled by BTProcessLock" CR));
-  }
-
-  xTaskNotifyGive(m_taskHandle);
-}
-
-void DT24_connect::publishData() {
-  NimBLEUUID serviceUUID("ffe0");
-  NimBLEUUID charUUID("ffe1");
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
-
-  if (pChar && pChar->canNotify()) {
-    Log.trace(F("Registering notification" CR));
-    if (pChar->subscribe(true, std::bind(&DT24_connect::notifyCB, this,
-                                         std::placeholders::_1, std::placeholders::_2,
-                                         std::placeholders::_3, std::placeholders::_4))) {
-      m_taskHandle = xTaskGetCurrentTaskHandle();
-      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
-        m_taskHandle = nullptr;
-      }
-    } else {
-      Log.notice(F("Failed registering notification" CR));
-    }
-  }
-}
-
-/*-----------------------BM2 HANDLING-----------------------*/
-void BM2_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-  if (m_taskHandle == nullptr) {
-    return; // unexpected notification
-  }
-
-  if (!BTProcessLock) {
-    Log.trace(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
-    if (length == 16) {
-      Log.trace(F("Device identified creating BLE buffer" CR));
-      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
-      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      String mac_address = m_pClient->getPeerAddress().toString().c_str();
-      mac_address.toUpperCase();
-      BLEdata["model"] = "BM2 Battery Monitor";
-      BLEdata["id"] = (char*)mac_address.c_str();
-      mbedtls_aes_context aes;
-      mbedtls_aes_init(&aes);
-      unsigned char output[16];
-      unsigned char iv[16] = {};
-      unsigned char key[16] = {
-          108,
-          101,
-          97,
-          103,
-          101,
-          110,
-          100,
-          255,
-          254,
-          49,
-          56,
-          56,
-          50,
-          52,
-          54,
-          54,
-      };
-      mbedtls_aes_setkey_dec(&aes, key, 128);
-      mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, 16, iv, (uint8_t*)&pData[0], output);
-      mbedtls_aes_free(&aes);
-      float volt = ((output[2] | (output[1] << 8)) >> 4) / 100.0f;
-      BLEdata["volt"] = volt;
-      Log.trace(F("volt: %F" CR), volt);
-      buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-    } else {
-      Log.notice(F("Invalid notification data" CR));
-      return;
-    }
-  } else {
-    Log.trace(F("Callback process canceled by BTProcessLock" CR));
-  }
-
-  xTaskNotifyGive(m_taskHandle);
-}
-
-void BM2_connect::publishData() {
-  NimBLEUUID serviceUUID("fff0");
-  NimBLEUUID charUUID("fff4");
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
-
-  if (pChar && pChar->canNotify()) {
-    Log.trace(F("Registering notification" CR));
-    if (pChar->subscribe(true, std::bind(&BM2_connect::notifyCB, this,
-                                         std::placeholders::_1, std::placeholders::_2,
-                                         std::placeholders::_3, std::placeholders::_4))) {
-      m_taskHandle = xTaskGetCurrentTaskHandle();
-      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
-        m_taskHandle = nullptr;
-      }
-    } else {
-      Log.notice(F("Failed registering notification" CR));
-    }
-  }
-}
-
-/*-----------------------HHCCJCY01HHCC HANDLING-----------------------*/
-void HHCCJCY01HHCC_connect::publishData() {
-  NimBLEUUID serviceUUID("00001204-0000-1000-8000-00805f9b34fb");
-  NimBLEUUID charUUID("00001a00-0000-1000-8000-00805f9b34fb");
-  NimBLEUUID charUUID2("00001a02-0000-1000-8000-00805f9b34fb");
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
-
-  if (pChar) {
-    Log.trace(F("Read mode" CR));
-    uint8_t buf[2] = {0xA0, 0x1F};
-    pChar->writeValue(buf, 2, true);
-    int batteryValue = -1;
-    NimBLERemoteCharacteristic* pChar2 = getCharacteristic(serviceUUID, charUUID2);
-    if (pChar2) {
-      std::string value;
-      value = pChar2->readValue();
-      const char* val2 = value.c_str();
-      batteryValue = val2[0];
-      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
-      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      String mac_address = m_pClient->getPeerAddress().toString().c_str();
-      mac_address.toUpperCase();
-      BLEdata["model"] = "HHCCJCY01HHCC";
-      BLEdata["id"] = (char*)mac_address.c_str();
-      BLEdata["batt"] = (int)batteryValue;
-      buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-    } else {
-      Log.notice(F("Failed getting characteristic" CR));
-    }
-  } else {
-    Log.notice(F("Failed getting characteristic" CR));
-  }
-}
-
-/*-----------------------XMWSDJ04MMC HANDLING-----------------------*/
-void XMWSDJ04MMC_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-  if (m_taskHandle == nullptr) {
-    return; // unexpected notification
-  }
-  if (!BTProcessLock) {
-    Log.trace(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
-
-    if (length == 6) {
-      Log.trace(F("Device identified creating BLE buffer" CR));
-      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
-      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      String mac_address = m_pClient->getPeerAddress().toString().c_str();
-      mac_address.toUpperCase();
-      BLEdata["model"] = "XMWSDJ04MMC";
-      BLEdata["id"] = (char*)mac_address.c_str();
-      Log.trace(F("Device identified in CB: %s" CR), (char*)mac_address.c_str());
-      BLEdata["tempc"] = (float)((pData[0] | (pData[1] << 8)) * 0.1);
-      BLEdata["tempf"] = (float)(convertTemp_CtoF((pData[0] | (pData[1] << 8)) * 0.1));
-      BLEdata["hum"] = (float)((pData[2] | (pData[3] << 8)) * 0.1);
-      BLEdata["volt"] = (float)((pData[4] | (pData[5] << 8)) / 1000.0);
-      BLEdata["batt"] = (float)((((pData[4] | (pData[5] << 8)) / 1000.0) - 2.1) * 100);
-      buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-    } else {
-      Log.notice(F("Invalid notification data" CR));
-      return;
-    }
-  } else {
-    Log.trace(F("Callback process canceled by BTProcessLock" CR));
-  }
-
-  xTaskNotifyGive(m_taskHandle);
-}
-
-void XMWSDJ04MMC_connect::publishData() {
-  NimBLEUUID serviceUUID("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6");
-  NimBLEUUID charUUID("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6");
-  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
-
-  if (pChar && pChar->canNotify()) {
-    Log.trace(F("Registering notification" CR));
-    if (pChar->subscribe(true, std::bind(&XMWSDJ04MMC_connect::notifyCB, this,
-                                         std::placeholders::_1, std::placeholders::_2,
-                                         std::placeholders::_3, std::placeholders::_4))) {
-      m_taskHandle = xTaskGetCurrentTaskHandle();
-      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
-        m_taskHandle = nullptr;
-      }
-    } else {
-      Log.notice(F("Failed registering notification" CR));
-    }
-  }
-}
-
-/*-----------------------SBS1 HANDLING-----------------------*/
-void SBS1_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-  if (m_taskHandle == nullptr) {
-    return; // unexpected notification
-  }
-  if (!BTProcessLock) {
-    Log.trace(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
-
-    if (length) {
-      m_notifyVal = *pData;
-    } else {
-      Log.notice(F("Invalid notification data" CR));
-      return;
-    }
-  } else {
-    Log.trace(F("Callback process canceled by BTProcessLock" CR));
-  }
-
-  xTaskNotifyGive(m_taskHandle);
-}
-
-bool SBS1_connect::processActions(std::vector<BLEAction>& actions) {
-  NimBLEUUID serviceUUID("cba20d00-224d-11e6-9fb8-0002a5d5c51b");
-  NimBLEUUID charUUID("cba20002-224d-11e6-9fb8-0002a5d5c51b");
-  NimBLEUUID notifyCharUUID("cba20003-224d-11e6-9fb8-0002a5d5c51b");
-  static byte ON[] = {0x57, 0x01, 0x01};
-  static byte OFF[] = {0x57, 0x01, 0x02};
-
-  bool result = false;
-  if (actions.size() > 0) {
-    for (auto& it : actions) {
-      if (NimBLEAddress(it.addr) == m_pClient->getPeerAddress()) {
-        NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
-        NimBLERemoteCharacteristic* pNotifyChar = getCharacteristic(serviceUUID, notifyCharUUID);
-
-        if (it.write && pChar && pNotifyChar) {
-          Log.trace(F("processing Switchbot %s" CR), it.value.c_str());
-          if (pNotifyChar->subscribe(true,
-                                     std::bind(&SBS1_connect::notifyCB,
-                                               this, std::placeholders::_1, std::placeholders::_2,
-                                               std::placeholders::_3, std::placeholders::_4),
-                                     true)) {
-            if (it.value == "on") {
-              result = pChar->writeValue(ON, 3, false);
-            } else {
-              result = pChar->writeValue(OFF, 3, false);
-            }
-
-            if (result) {
-              m_taskHandle = xTaskGetCurrentTaskHandle();
-              if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
-                m_taskHandle = nullptr;
-              }
-              result = m_notifyVal == 0x01;
-            }
-          }
-        }
-
-        it.complete = result;
-        if (result || it.ttl <= 1) {
-          StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
-          JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-          BLEdata["id"] = it.addr;
-          BLEdata["state"] = result ? it.value : it.value == "on" ? "off" : "on";
-          buildTopicFromId(BLEdata, subjectBTtoMQTT);
-          handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-        }
-      }
-    }
-  }
-
-  return result;
-}
-
-#  endif //ZgatewayBT
-#endif //ESP32
diff --git a/main/ZgatewayRF.ino b/main/ZgatewayRF.ino
deleted file mode 100644
index 823359b..0000000
--- a/main/ZgatewayRF.ino
+++ /dev/null
@@ -1,288 +0,0 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
-
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
-   Send and receiving command by MQTT
- 
-  This gateway enables to:
- - receive MQTT data from a topic and send RF 433Mhz signal corresponding to the received MQTT data
- - publish MQTT data to a different topic related to received 433Mhz signal
-
-    Copyright: (c)Florian ROBERT
-  
-    This file is part of OpenMQTTGateway.
-    
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#include "User_config.h"
-
-#ifdef ZgatewayRF
-
-#  ifdef ZradioCC1101
-#    include <ELECHOUSE_CC1101_SRC_DRV.h>
-#  endif
-
-#  include <RCSwitch.h> // library for controling Radio frequency switch
-
-RCSwitch mySwitch = RCSwitch();
-
-//SOME CONVERSION function from https://github.com/sui77/rc-switch/tree/master/examples/ReceiveDemo_Advanced
-static const char* bin2tristate(const char* bin) {
-  static char returnValue[50];
-  int pos = 0;
-  int pos2 = 0;
-  while (bin[pos] != '\0' && bin[pos + 1] != '\0') {
-    if (bin[pos] == '0' && bin[pos + 1] == '0') {
-      returnValue[pos2] = '0';
-    } else if (bin[pos] == '1' && bin[pos + 1] == '1') {
-      returnValue[pos2] = '1';
-    } else if (bin[pos] == '0' && bin[pos + 1] == '1') {
-      returnValue[pos2] = 'F';
-    } else {
-      return "-";
-    }
-    pos = pos + 2;
-    pos2++;
-  }
-  returnValue[pos2] = '\0';
-  return returnValue;
-}
-
-static char* dec2binWzerofill(unsigned long Dec, unsigned int bitLength) {
-  static char bin[64];
-  unsigned int i = 0;
-
-  while (Dec > 0) {
-    bin[32 + i++] = ((Dec & 1) > 0) ? '1' : '0';
-    Dec = Dec >> 1;
-  }
-
-  for (unsigned int j = 0; j < bitLength; j++) {
-    if (j >= bitLength - i) {
-      bin[j] = bin[31 + i - (j - (bitLength - i))];
-    } else {
-      bin[j] = '0';
-    }
-  }
-  bin[bitLength] = '\0';
-
-  return bin;
-}
-
-#  if defined(ZmqttDiscovery) && !defined(RF_DISABLE_TRANSMIT) && defined(RFmqttDiscovery)
-
-void RFtoMQTTdiscovery(SIGNAL_SIZE_UL_ULL MQTTvalue) {
-  //on the fly switch creation from received RF values
-  char val[11];
-  sprintf(val, "%lu", MQTTvalue);
-  Log.trace(F("RF Entity Discovered, create HA Discovery CFG" CR));
-  char* switchRF[2] = {val, "RF"};
-  Log.trace(F("CreateDiscoverySwitch: %s" CR), switchRF[1]);
-#    if valueAsATopic
-  String discovery_topic = String(subjectRFtoMQTT) + "/" + String(switchRF[0]);
-#    else
-  String discovery_topic = String(subjectRFtoMQTT);
-#    endif
-
-  String theUniqueId = getUniqueId("-" + String(switchRF[0]), "-" + String(switchRF[1]));
-
-  announceDeviceTrigger(
-      false,
-      (char*)discovery_topic.c_str(),
-      "", "",
-      (char*)theUniqueId.c_str(),
-      "", "", "", "");
-}
-#  endif
-
-void RFtoMQTT() {
-  if (mySwitch.available()) {
-    StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
-    JsonObject RFdata = RFdataBuffer.to<JsonObject>();
-    Log.trace(F("Rcv. RF" CR));
-#  ifdef ESP32
-    Log.trace(F("RF Task running on core :%d" CR), xPortGetCoreID());
-#  endif
-    SIGNAL_SIZE_UL_ULL MQTTvalue = mySwitch.getReceivedValue();
-    int length = mySwitch.getReceivedBitlength();
-    const char* binary = dec2binWzerofill(MQTTvalue, length);
-
-    RFdata["value"] = (SIGNAL_SIZE_UL_ULL)MQTTvalue;
-    RFdata["protocol"] = (int)mySwitch.getReceivedProtocol();
-    RFdata["length"] = (int)mySwitch.getReceivedBitlength();
-    RFdata["delay"] = (int)mySwitch.getReceivedDelay();
-    RFdata["tre_state"] = bin2tristate(binary);
-    RFdata["binary"] = binary;
-
-#  if defined(ESP32) || defined(ESP8266)
-    unsigned int* raw = mySwitch.getReceivedRawdata();
-    std::string rawDump;
-    for (unsigned int i = 0; i < length * 2; i++) {
-      if (i != 0)
-        rawDump += ",";
-      rawDump += std::to_string(raw[i]);
-    }
-    RFdata["raw"] = rawDump;
-#  endif
-#  ifdef ZradioCC1101 // set Receive off and Transmitt on
-    RFdata["frequency"] = RFConfig.frequency;
-#  endif
-    mySwitch.resetAvailable();
-
-    if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of RF -->MQTT
-#  if defined(ZmqttDiscovery) && !defined(RF_DISABLE_TRANSMIT) && defined(RFmqttDiscovery) //component creation for HA
-      if (SYSConfig.discovery)
-        RFtoMQTTdiscovery(MQTTvalue);
-#  endif
-      RFdata["origin"] = subjectRFtoMQTT;
-      handleJsonEnqueue(RFdata);
-      // Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
-      Log.trace(F("Store val: %u" CR), (unsigned long)MQTTvalue);
-      storeSignalValue(MQTTvalue);
-      if (repeatRFwMQTT) {
-        Log.trace(F("Pub RF for rpt" CR));
-        RFdata["origin"] = subjectMQTTtoRF;
-        handleJsonEnqueue(RFdata);
-      }
-    }
-  }
-}
-
-#  if simpleReceiving
-void MQTTtoRF(char* topicOri, char* datacallback) {
-#    ifdef ZradioCC1101 // set Receive off and Transmitt on
-  disableCurrentReceiver();
-  ELECHOUSE_cc1101.SetTx(RFConfig.frequency);
-  Log.notice(F("Transmit frequency: %F" CR), RFConfig.frequency);
-#    endif
-  mySwitch.disableReceive();
-  mySwitch.enableTransmit(RF_EMITTER_GPIO);
-  SIGNAL_SIZE_UL_ULL data = STRTO_UL_ULL(datacallback, NULL, 10); // we will not be able to pass values > 4294967295 on Arduino boards
-
-  // RF DATA ANALYSIS
-  //We look into the subject to see if a special RF protocol is defined
-  String topic = topicOri;
-  int valuePRT = 0;
-  int valuePLSL = 0;
-  int valueBITS = 0;
-  int pos = topic.lastIndexOf(RFprotocolKey);
-  if (pos != -1) {
-    pos = pos + +strlen(RFprotocolKey);
-    valuePRT = (topic.substring(pos, pos + 1)).toInt();
-  }
-  //We look into the subject to see if a special RF pulselength is defined
-  int pos2 = topic.lastIndexOf(RFpulselengthKey);
-  if (pos2 != -1) {
-    pos2 = pos2 + strlen(RFpulselengthKey);
-    valuePLSL = (topic.substring(pos2, pos2 + 3)).toInt();
-  }
-  int pos3 = topic.lastIndexOf(RFbitsKey);
-  if (pos3 != -1) {
-    pos3 = pos3 + strlen(RFbitsKey);
-    valueBITS = (topic.substring(pos3, pos3 + 2)).toInt();
-  }
-
-  if ((cmpToMainTopic(topicOri, subjectMQTTtoRF)) && (valuePRT == 0) && (valuePLSL == 0) && (valueBITS == 0)) {
-    Log.trace(F("MQTTtoRF dflt" CR));
-    mySwitch.setProtocol(1, 350);
-    mySwitch.send(data, 24);
-    // Acknowledgement to the GTWRF topic
-    pub(subjectGTWRFtoMQTT, datacallback);
-  } else if ((valuePRT != 0) || (valuePLSL != 0) || (valueBITS != 0)) {
-    Log.trace(F("MQTTtoRF usr par." CR));
-    if (valuePRT == 0)
-      valuePRT = 1;
-    if (valuePLSL == 0)
-      valuePLSL = 350;
-    if (valueBITS == 0)
-      valueBITS = 24;
-    Log.notice(F("RF Protocol:%d" CR), valuePRT);
-    Log.notice(F("RF Pulse Lgth: %d" CR), valuePLSL);
-    Log.notice(F("Bits nb: %d" CR), valueBITS);
-    mySwitch.setProtocol(valuePRT, valuePLSL);
-    mySwitch.send(data, valueBITS);
-    // Acknowledgement to the GTWRF topic
-    pub(subjectGTWRFtoMQTT, datacallback); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
-  }
-#    ifdef ZradioCC1101 // set Receive on and Transmitt off
-  ELECHOUSE_cc1101.SetRx(RFConfig.frequency);
-  mySwitch.disableTransmit();
-  mySwitch.enableReceive(RF_RECEIVER_GPIO);
-#    endif
-}
-#  endif
-
-#  if jsonReceiving
-void MQTTtoRF(char* topicOri, JsonObject& RFdata) { // json object decoding
-  if (cmpToMainTopic(topicOri, subjectMQTTtoRF)) {
-    Log.trace(F("MQTTtoRF json" CR));
-    SIGNAL_SIZE_UL_ULL data = RFdata["value"];
-    if (data != 0) {
-      int valuePRT = RFdata["protocol"] | 1;
-      int valuePLSL = RFdata["delay"] | 350;
-      int valueBITS = RFdata["length"] | 24;
-      int valueRPT = RFdata["repeat"] | RF_EMITTER_REPEAT;
-      Log.notice(F("RF Protocol:%d" CR), valuePRT);
-      Log.notice(F("RF Pulse Lgth: %d" CR), valuePLSL);
-      Log.notice(F("Bits nb: %d" CR), valueBITS);
-#    ifdef ZradioCC1101
-      disableCurrentReceiver();
-      initCC1101();
-      int txPower = RFdata["txpower"] | RF_CC1101_TXPOWER;
-      ELECHOUSE_cc1101.setPA((int)txPower);
-      Log.notice(F("CC1101 TX Power: %d" CR), txPower);
-      float txFrequency = RFdata["frequency"] | RFConfig.frequency;
-      ELECHOUSE_cc1101.SetTx(txFrequency);
-      Log.notice(F("Transmit frequency: %F" CR), txFrequency);
-#    endif
-      mySwitch.enableTransmit(RF_EMITTER_GPIO);
-      mySwitch.setRepeatTransmit(valueRPT);
-      mySwitch.setProtocol(valuePRT, valuePLSL);
-      mySwitch.send(data, valueBITS);
-      Log.notice(F("MQTTtoRF OK" CR));
-      // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
-      pub(subjectGTWRFtoMQTT, RFdata);
-      mySwitch.setRepeatTransmit(RF_EMITTER_REPEAT); // Restore the default value
-    }
-
-    enableActiveReceiver();
-  }
-}
-#  endif
-
-int receiveInterupt = -1;
-
-void disableRFReceive() {
-  Log.trace(F("disableRFReceive %d" CR), receiveInterupt);
-  mySwitch.disableReceive();
-}
-
-void enableRFReceive() {
-  Log.notice(F("Enable RF Receiver: %FMhz" CR), RFConfig.frequency);
-  //RF init parameters
-  Log.notice(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
-  Log.notice(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);
-
-#  ifdef RF_DISABLE_TRANSMIT
-  mySwitch.disableTransmit();
-#  else
-  mySwitch.enableTransmit(RF_EMITTER_GPIO);
-#  endif
-  receiveInterupt = RF_RECEIVER_GPIO;
-  mySwitch.setRepeatTransmit(RF_EMITTER_REPEAT);
-  mySwitch.enableReceive(receiveInterupt);
-  Log.trace(F("ZgatewayRF command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoRF);
-  Log.trace(F("ZgatewayRF setup done" CR));
-}
-#endif
diff --git a/main/ZgatewayRS232.ino b/main/ZgatewayRS232.ino
deleted file mode 100644
index f6da25e..0000000
--- a/main/ZgatewayRS232.ino
+++ /dev/null
@@ -1,209 +0,0 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
-
-   Act as a wifi or ethernet gateway between your RS232 device and a MQTT broker 
-   Send and receiving command by MQTT
- 
-  This gateway enables to:
- - receive MQTT data from a topic and send RS232 signal corresponding to the received MQTT data
- - publish MQTT data to a different topic related to received RS232 signal
-
-    Copyright: (c)Florian ROBERT
-  
-    This file is part of OpenMQTTGateway.
-    
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#include "User_config.h"
-
-#ifdef ZgatewayRS232
-
-#  ifndef RS232_UART // software serial mode
-#    include <SoftwareSerial.h>
-SoftwareSerial RS232SoftSerial(RS232_RX_GPIO, RS232_TX_GPIO); // RX, TX
-#  endif
-
-// use pointer to stream class for serial communication to make code
-// compatible with both softwareSerial as hardwareSerial.
-Stream* RS232Stream = NULL;
-
-void setupRS232() {
-//Initalize serial port
-#  ifdef RS232_UART // Hardware serial
-#    if RS232_UART == 0 // init UART0
-  Serial.end(); // stop if already initialized
-#      ifdef ESP32
-  Serial.begin(RS232Baud, SERIAL_8N1, RS232_RX_GPIO, RS232_TX_GPIO);
-#      else
-  Serial.begin(RS232Baud, SERIAL_8N1);
-#      endif
-#      if defined(ESP8266) && defined(RS232_UART0_SWAP)
-  Serial.swap(); // swap UART0 ports from (GPIO1,GPIO3) to (GPIO15,GPIO13)
-#      endif
-  RS232Stream = &Serial;
-  Log.notice(F("RS232 HW UART0" CR));
-
-#    elif RS232_UART == 1 // init UART1
-  Serial1.end(); // stop if already initialized
-#      ifdef ESP32
-  Serial1.begin(RS232Baud, SERIAL_8N1, RS232_RX_GPIO, RS232_TX_GPIO);
-#      else
-  Serial1.begin(RS232Baud, SERIAL_8N1);
-#      endif
-  RS232Stream = &Serial1;
-  Log.notice(F("RS232 HW UART1" CR));
-
-#    elif RS232_UART == 2 // init UART2
-  Serial2.end(); // stop if already initialized
-#      ifdef ESP32
-  Serial2.begin(RS232Baud, SERIAL_8N1, RS232_RX_GPIO, RS232_TX_GPIO);
-#      else
-  Serial2.begin(RS232Baud, SERIAL_8N1);
-#      endif
-  RS232Stream = &Serial2;
-  Log.notice(F("RS232 HW UART2" CR));
-
-#    elif RS232_UART == 3 // init UART3
-  Serial3.end(); // stop if already initialized
-  Serial3.begin(RS232Baud, SERIAL_8N1);
-  RS232Stream = &Serial3;
-  Log.notice(F("RS232 HW UART3" CR));
-#    endif
-
-#  else // Software serial
-  // define pin modes for RX, TX:
-  pinMode(RS232_RX_GPIO, INPUT);
-  pinMode(RS232_TX_GPIO, OUTPUT);
-  RS232SoftSerial.begin(RS232Baud);
-  RS232Stream = &RS232SoftSerial; // get stream of serial
-
-  Log.notice(F("RS232_RX_GPIO: %d" CR), RS232_RX_GPIO);
-  Log.notice(F("RS232_TX_GPIO: %d" CR), RS232_TX_GPIO);
-#  endif
-
-  // Flush all bytes in the "link" serial port buffer
-  while (RS232Stream->available() > 0)
-    RS232Stream->read();
-
-  Log.notice(F("RS232Baud: %d" CR), RS232Baud);
-  Log.trace(F("ZgatewayRS232 setup done" CR));
-}
-
-#  if RS232toMQTTmode == 0 // Convert received data to single MQTT topic
-void RS232toMQTT() {
-  // Send all RS232 output (up to RS232InPost char revieved) as MQTT message
-  //This function is Blocking, but there should only ever be a few bytes, usually an ACK or a NACK.
-  if (RS232Stream->available()) {
-    Log.trace(F("RS232toMQTT" CR));
-    static char RS232data[MAX_INPUT];
-    static unsigned int input_pos = 0;
-    static char inChar;
-    do {
-      if (RS232Stream->available()) {
-        inChar = RS232Stream->read();
-        RS232data[input_pos] = inChar;
-        input_pos++;
-        Log.trace(F("Received %c" CR), inChar);
-      }
-    } while (inChar != RS232InPost && input_pos < MAX_INPUT);
-    RS232data[input_pos] = 0;
-    input_pos = 0;
-    Log.trace(F("Publish %s" CR), RS232data);
-    char* output = RS232data + sizeof(RS232Pre) - 1;
-    pub(subjectRS232toMQTT, output);
-  }
-}
-
-#  elif RS232toMQTTmode == 1 // Convert recievee JSON data to multiple MQTT topics based (nested) keys
-void RS232toMQTT() {
-  // Assumes valid JSON data at RS232 interface. Use (nested) keys to split JSON data in separate
-  // sub-MQTT-topics up to the defined nesting level.
-  if (RS232Stream->available()) {
-    Log.trace(F("RS232toMQTT" CR));
-
-    // Allocate the JSON document
-    StaticJsonDocument<RS232JSONDocSize> doc;
-
-    // Read the JSON document from the "link" serial port
-    DeserializationError err = deserializeJson(doc, *RS232Stream);
-
-    if (err == DeserializationError::Ok) {
-      // JSON received, send as MQTT topics
-      char topic[mqtt_topic_max_size + 1] = subjectRS232toMQTT;
-      sendMQTTfromNestedJson(doc.as<JsonVariant>(), topic, 0, RS232maxJSONlevel);
-    } else {
-      // Print error to serial log
-      Log.error(F("Error in RS232JSONtoMQTT, deserializeJson() returned %s"), err.c_str());
-
-      // Flush all bytes in the "link" serial port buffer
-      while (RS232Stream->available() > 0)
-        RS232Stream->read();
-    }
-  }
-}
-
-void sendMQTTfromNestedJson(JsonVariant obj, char* topic, int level, int maxLevel) {
-  // recursively step through JSON data and send MQTT messages
-  if (level < maxLevel && obj.is<JsonObject>()) {
-    int topicLength = strlen(topic);
-    // loop over fields
-    for (JsonPair pair : obj.as<JsonObject>()) {
-      // check if new key still fits in topic cstring
-      const char* key = pair.key().c_str();
-      Log.trace(F("level=%d, key='%s'" CR), level, pair.key().c_str());
-      if (topicLength + 2 + strlen(key) <= mqtt_topic_max_size) {
-        // add new level to existing topic cstring
-        topic[topicLength] = '/'; // add slash
-        topic[topicLength + 1] = '\0'; // terminate
-        strncat(topic + topicLength, key, mqtt_topic_max_size - topicLength - 2);
-
-        // step recursively into next level
-        sendMQTTfromNestedJson(pair.value(), topic, level + 1, maxLevel);
-
-        // restore topic
-        topic[topicLength] = '\0';
-      } else {
-        Log.error(F("Nested key '%s' at level %d does not fit within max topic length of %d, skipping"),
-                  key, level, mqtt_topic_max_size);
-      }
-    }
-
-  } else {
-    // output value at current json level
-    char output[MAX_INPUT + 1];
-    serializeJson(obj, output, MAX_INPUT);
-    Log.notice(F("level=%d, topic=%s, value: %s\n"), level, topic, output);
-
-    // send MQTT message
-    pub(topic, &output[0]);
-  }
-}
-#  endif
-
-void MQTTtoRS232(char* topicOri, JsonObject& RS232data) {
-  Log.trace(F("json" CR));
-  if (cmpToMainTopic(topicOri, subjectMQTTtoRS232)) {
-    Log.trace(F("MQTTtoRS232 json" CR));
-    const char* data = RS232data["value"];
-    const char* prefix = RS232data["prefix"] | RS232Pre;
-    const char* postfix = RS232data["postfix"] | RS232Post;
-    Log.trace(F("Value set: %s" CR), data);
-    Log.trace(F("Prefix set: %s" CR), prefix);
-    Log.trace(F("Postfix set: %s" CR), postfix);
-    RS232Stream->print(prefix);
-    RS232Stream->print(data);
-    RS232Stream->print(postfix);
-  }
-}
-#endif
\ No newline at end of file
diff --git a/main/ZmqttDiscovery.ino b/main/ZmqttDiscovery.ino
deleted file mode 100644
index 4d531ec..0000000
--- a/main/ZmqttDiscovery.ino
+++ /dev/null
@@ -1,1305 +0,0 @@
-/*
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
-
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
-   Send and receiving command by MQTT
-
-   This is the Home Assistant MQTT Discovery addon.
-
-    Copyright: (c) Rafal Herok
-
-    This file is part of OpenMQTTGateway.
-
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#include "User_config.h"
-
-#ifdef ZmqttDiscovery
-
-String getMacAddress() {
-  uint8_t baseMac[6];
-  char baseMacChr[13] = {0};
-#  if defined(ESP8266)
-  WiFi.macAddress(baseMac);
-  sprintf(baseMacChr, "%02X%02X%02X%02X%02X%02X", baseMac[0], baseMac[1], baseMac[2], baseMac[3], baseMac[4], baseMac[5]);
-#  elif defined(ESP32)
-  esp_read_mac(baseMac, ESP_MAC_WIFI_STA);
-  sprintf(baseMacChr, "%02X%02X%02X%02X%02X%02X", baseMac[0], baseMac[1], baseMac[2], baseMac[3], baseMac[4], baseMac[5]);
-#  else
-  sprintf(baseMacChr, "%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-#  endif
-  return String(baseMacChr);
-}
-
-String getUniqueId(String name, String sufix) {
-  String uniqueId = (String)getMacAddress() + "-" + name + sufix;
-  return String(uniqueId);
-}
-
-#  ifdef ZgatewayBT
-/**
- * Create a discover messages form a list of attribute
- * 
- * @param mac the MAC address
- * @param sensorList[][0] = component type
- * @param sensorList[][1] = name
- * @param sensorList[][2] = availability topic
- * @param sensorList[][3] = device class
- * @param sensorList[][4] = value template
- * @param sensorList[][5] = payload on
- * @param sensorList[][6] = payload off
- * @param sensorList[][7] = unit of measurement
- * @param sensorList[][8] = unit of measurement
- * @param sensorCount number of sensor
- * @param device_name name of sensors
- * @param device_manufacturer name of manufacturer
- * @param device_model the model
- * */
-void createDiscoveryFromList(const char* mac,
-                             const char* sensorList[][9],
-                             int sensorCount,
-                             const char* device_name,
-                             const char* device_manufacturer,
-                             const char* device_model) {
-  for (int i = 0; i < sensorCount; i++) {
-    String discovery_topic = String(subjectBTtoMQTT) + "/" + String(mac);
-    String unique_id = String(mac) + "-" + sensorList[i][1];
-
-    createDiscovery(sensorList[i][0],
-                    discovery_topic.c_str(), sensorList[i][1], unique_id.c_str(),
-                    will_Topic, sensorList[i][3], sensorList[i][4],
-                    sensorList[i][5], sensorList[i][6], sensorList[i][7],
-                    0, "", "", false, "",
-                    device_name, device_manufacturer, device_model, mac, false,
-                    sensorList[i][8] //The state class
-    );
-  }
-}
-#  endif
-
-/**
- * @brief Create a message for Discovery Device Trigger. For HA @see https://www.home-assistant.io/integrations/device_trigger.mqtt/
- * @param use_gateway_info      Boolean where true mean use the OMG information as Device Information
- * @param topic                 The Topic  where the trigger will publish the content
- * @param type                  The type of the trigger, e.g. button_short_press. Entries supported by the HA Frontend: button_short_press, button_short_release, button_long_press, button_long_release, button_double_press, button_triple_press, button_quadruple_press, button_quintuple_press. If set to an unsupported value, will render as subtype type, e.g. button_1 spammed with type set to spammed and subtype set to button_1
- * @param subtype               The subtype of the trigger, e.g. button_1. Entries supported by the HA frontend: turn_on, turn_off, button_1, button_2, button_3, button_4, button_5, button_6. If set to an unsupported value, will render as subtype type, e.g. left_button pressed with type set to button_short_press and subtype set to left_button
- * @param unique_id             Valid only if gateway entry is false, The IDs that uniquely identify the device. For example a serial number.
- * @param device_name           Valid only if gateway entry is false, The name of the device.
- * @param device_manufacturer   Valid only if gateway entry is false, The manufacturer of the device.
- * @param device_model          Valid only if gateway entry is false, The model of the device.
- * @param device_id            Valid only if gateway entry is false, The connection of the device to the outside world
- */
-void announceDeviceTrigger(bool use_gateway_info, char* topic, char* type, char* subtype, char* unique_id, char* device_name, char* device_manufacturer, char* device_model, char* device_id) {
-  //Create The Json
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  JsonObject sensor = jsonBuffer.to<JsonObject>();
-
-  // SET Default Configuration
-  sensor["automation_type"] = "trigger"; // The type of automation, must be ‘trigger’.
-
-  //SET TYPE
-  if (type && type[0] != 0) {
-    sensor["type"] = type;
-  } else {
-    sensor["type"] = "button_short_press";
-  }
-
-  //SET SUBTYPE
-  if (subtype && subtype[0] != 0) {
-    sensor["subtype"] = subtype;
-  } else {
-    sensor["subtype"] = "turn_on";
-  }
-
-  /* Set The topic */
-  if (topic && topic[0]) {
-    char state_topic[mqtt_topic_max_size];
-
-    strcpy(state_topic, mqtt_topic);
-    strcat(state_topic, gateway_name);
-
-    strcat(state_topic, topic);
-    sensor["topic"] = state_topic;
-  }
-
-  /* Set The Devices */
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonDeviceBuffer;
-  JsonObject device = jsonDeviceBuffer.to<JsonObject>();
-  JsonArray identifiers = device.createNestedArray("identifiers");
-
-  if (use_gateway_info) {
-    device["name"] = gateway_name;
-#  ifndef GATEWAY_MODEL
-    String model = "";
-    serializeJson(modules, model);
-    device["model"] = model;
-#  else
-    device["model"] = GATEWAY_MODEL;
-#  endif
-
-    device["manufacturer"] = GATEWAY_MANUFACTURER;
-    device["sw_version"] = OMG_VERSION;
-    identifiers.add(getMacAddress());
-
-  } else {
-    char deviceid[13];
-    memcpy(deviceid, &unique_id[0], 12);
-    deviceid[12] = '\0';
-
-    identifiers.add(deviceid);
-
-    /*Set Connection */
-    if (device_id && device_id[0] != 0) {
-      JsonArray connections = device.createNestedArray("connections");
-      JsonArray connection_mac = connections.createNestedArray();
-      connection_mac.add("mac");
-      connection_mac.add(device_id);
-    }
-
-    //Set manufacturer
-    if (device_manufacturer && device_manufacturer[0]) {
-      device["manufacturer"] = device_manufacturer;
-    }
-
-    //Set name
-    if (device_name && device_name[0]) {
-      device["name"] = device_name;
-    }
-
-    // set The Model
-    if (device_model && device_model[0]) {
-      device["model"] = device_model;
-    }
-
-    device["via_device"] = gateway_name; //device name of the board
-  }
-  sensor["device"] = device; //device representing the board
-
-  /* Publish on the topic */
-  String topic_to_publish = String(discovery_Topic) + "/device_automation/" + String(unique_id) + "/config";
-  Log.trace(F("Announce Device Trigger  %s" CR), topic_to_publish.c_str());
-  pub_custom_topic((char*)topic_to_publish.c_str(), sensor, true);
-}
-
-/*
-  * Remove a substring p from a given string s
-*/
-std::string remove_substring(std::string s, const std::string& p) {
-  std::string::size_type n = p.length();
-
-  for (std::string::size_type i = s.find(p);
-       i != std::string::npos;
-       i = s.find(p))
-    s.erase(i, n);
-
-  return s;
-}
-
-/**
- * @brief Generate message and publish it on an MQTT discovery explorer. For HA @see https://www.home-assistant.io/docs/mqtt/discovery/
- * 
- * @param sensor_type the Type
- * @param st_topic set state topic,
- * @param s_name set name,
- * @param unique_id set uniqueId
- * @param availability_topic set availability_topic,
- * @param device_class set device_class,
- * @param value_template set value_template,
- * @param payload_on set payload_on,
- * @param payload_off set payload_off,
- * @param unit_of_meas set unit_of_meas,
- * @param off_delay set off_delay
- * @param payload_available set payload_available,
- * @param payload_not_available set payload_not_available
- * @param gateway_entity set is a gateway entity, 
- * @param cmd_topic set command topic
- * @param device_name set device name, 
- * @param device_manufacturer set device manufacturer, 
- * @param device_model set device model, 
- * @param device_id set device(BLE)/entity(RTL_433) identification, 
- * @param retainCmd set retain
- * @param state_class set state class
- * 
- * */
-void createDiscovery(const char* sensor_type,
-                     const char* st_topic, const char* s_name, const char* unique_id,
-                     const char* availability_topic, const char* device_class, const char* value_template,
-                     const char* payload_on, const char* payload_off, const char* unit_of_meas,
-                     int off_delay,
-                     const char* payload_available, const char* payload_not_available, bool gateway_entity, const char* cmd_topic,
-                     const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_id, bool retainCmd,
-                     const char* state_class, const char* state_off, const char* state_on, const char* enum_options) {
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  JsonObject sensor = jsonBuffer.to<JsonObject>();
-
-  // If a component cannot render it's state (f.i. KAKU relays) no state topic
-  // should be added. Without a state topic HA will use optimistic mode for the
-  // component by default. The Home Assistant UI for optimistic switches
-  // (separate on and off icons) allows for multiple
-  // subsequent on commands. This is required for dimming on KAKU relays like
-  // the ACM-300.
-  if (st_topic[0]) {
-    char state_topic[mqtt_topic_max_size];
-    // If not an entity belonging to the gateway we put wild card for the location and gateway name
-    // allowing to have the entity detected by several gateways and a consistent discovery topic among the gateways
-    if (gateway_entity) {
-      strcpy(state_topic, mqtt_topic);
-      strcat(state_topic, gateway_name);
-    } else {
-      strcpy(state_topic, "+/+");
-    }
-    strcat(state_topic, st_topic);
-    sensor["stat_t"] = state_topic;
-  }
-
-  if (availability_topic[0] && gateway_entity) {
-    char avty_topic[mqtt_topic_max_size];
-    strcpy(avty_topic, mqtt_topic);
-    strcat(avty_topic, gateway_name);
-    strcat(avty_topic, availability_topic);
-    sensor["avty_t"] = avty_topic;
-  }
-
-  if (device_class[0]) {
-    // We check if the class belongs to HAAS classes list
-    int num_classes = sizeof(availableHASSClasses) / sizeof(availableHASSClasses[0]);
-    for (int i = 0; i < num_classes; i++) { // see class list and size into config_mqttDiscovery.h
-      if (strcmp(availableHASSClasses[i], device_class) == 0) {
-        sensor["dev_cla"] = device_class; //device_class
-      }
-    }
-  }
-
-  if (unit_of_meas[0]) {
-    // We check if the class belongs to HAAS units list
-    int num_units = sizeof(availableHASSUnits) / sizeof(availableHASSUnits[0]);
-    for (int i = 0; i < num_units; i++) { // see units list and size into config_mqttDiscovery.h
-      if (strcmp(availableHASSUnits[i], unit_of_meas) == 0) {
-        sensor["unit_of_meas"] = unit_of_meas; //unit_of_measurement*/
-      }
-    }
-  }
-  sensor["name"] = s_name; //name
-  sensor["uniq_id"] = unique_id; //unique_id
-  if (retainCmd)
-    sensor["retain"] = retainCmd; // Retain command
-  if (value_template[0]) {
-    if (strstr(value_template, " | is_defined") != NULL && SYSConfig.ohdiscovery) {
-      sensor["val_tpl"] = remove_substring(value_template, " | is_defined"); //OpenHAB compatible HA auto discovery
-    } else {
-      sensor["val_tpl"] = value_template; //HA Auto discovery
-    }
-  }
-  if (payload_on[0]) {
-    if (strcmp(sensor_type, "button") == 0) {
-      sensor["pl_prs"] = payload_on; // payload_press for a button press
-    } else if (strcmp(sensor_type, "number") == 0) {
-      sensor["cmd_tpl"] = payload_on; // payload_on for a switch
-    } else if (strcmp(sensor_type, "update") == 0) {
-      sensor["payload_install"] = payload_on; // payload_install for update
-    } else {
-      sensor["pl_on"] = payload_on; // payload_on for the rest
-    }
-  }
-  if (payload_off[0])
-    sensor["pl_off"] = payload_off; //payload_off
-  if (strcmp(sensor_type, "device_tracker") == 0)
-    sensor["source_type"] = "bluetooth_le"; // payload_install for update
-  if (off_delay != 0)
-    sensor["off_delay"] = off_delay; //off_delay
-  if (payload_available[0])
-    sensor["pl_avail"] = payload_available; // payload_on
-  if (payload_not_available[0])
-    sensor["pl_not_avail"] = payload_not_available; //payload_off
-  if (state_class && state_class[0])
-    sensor["state_class"] = state_class; //add the state class on the sensors ( https://developers.home-assistant.io/docs/core/entity/sensor/#available-state-classes )
-  if (state_on != nullptr)
-    if (strcmp(state_on, "true") == 0) {
-      sensor["stat_on"] = true;
-    } else {
-      sensor["stat_on"] = state_on;
-    }
-  if (state_off != nullptr)
-    if (strcmp(state_off, "false") == 0) {
-      sensor["stat_off"] = false;
-    } else {
-      sensor["stat_off"] = state_off;
-    }
-  if (cmd_topic[0]) {
-    char command_topic[mqtt_topic_max_size];
-    strcpy(command_topic, mqtt_topic);
-    strcat(command_topic, gateway_name);
-    strcat(command_topic, cmd_topic);
-    sensor["cmd_t"] = command_topic; //command_topic
-  }
-
-  if (enum_options != nullptr) {
-    sensor["options"] = enum_options;
-  }
-
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonDeviceBuffer;
-  JsonObject device = jsonDeviceBuffer.to<JsonObject>();
-  JsonArray identifiers = device.createNestedArray("ids");
-
-  if (gateway_entity) {
-    //device representing the board
-    device["name"] = String(gateway_name);
-#  ifndef GATEWAY_MODEL
-    String model = "";
-    serializeJson(modules, model);
-    device["mdl"] = model;
-#  else
-    device["mdl"] = GATEWAY_MODEL;
-#  endif
-    device["mf"] = GATEWAY_MANUFACTURER;
-    if (ethConnected) {
-#  ifdef ESP32_ETHERNET
-      device["cu"] = String("http://") + String(ETH.localIP().toString()) + String("/"); //configuration_url
-#  endif
-    } else {
-      device["cu"] = String("http://") + String(WiFi.localIP().toString()) + String("/"); //configuration_url
-    }
-
-    device["sw"] = OMG_VERSION;
-    identifiers.add(String(getMacAddress()));
-  } else {
-    //The Connections
-    if (device_id[0]) {
-      JsonArray connections = device.createNestedArray("cns");
-      JsonArray connection_mac = connections.createNestedArray();
-      connection_mac.add("mac");
-      connection_mac.add(device_id);
-      //Device representing the actual sensor/switch device
-      //The Device ID
-      identifiers.add(device_id);
-    }
-
-    if (device_manufacturer[0]) {
-      device["mf"] = device_manufacturer;
-    }
-
-    if (device_model[0]) {
-      device["mdl"] = device_model;
-    }
-
-    // generate unique device name by adding the second half of the device_id only if device_name and device_id are different
-    if (device_name[0]) {
-      if (strcmp(device_id, device_name) != 0 && device_id[0]) {
-        device["name"] = device_name + String("-") + String(device_id + 6);
-      } else {
-        device["name"] = device_name;
-      }
-    }
-
-    device["via_device"] = String(gateway_name); //device name of the board
-  }
-
-  sensor["device"] = device;
-
-  String topic = String(discovery_Topic) + "/" + String(sensor_type) + "/" + String(unique_id) + "/config";
-  Log.trace(F("Announce Device %s on  %s" CR), String(sensor_type).c_str(), topic.c_str());
-  pub_custom_topic((char*)topic.c_str(), sensor, true);
-}
-
-void eraseTopic(const char* sensor_type, const char* unique_id) {
-  if (sensor_type == NULL || unique_id == NULL) {
-    return;
-  }
-  String topic = String(discovery_Topic) + "/" + String(sensor_type) + "/" + String(unique_id) + "/config";
-  Log.trace(F("Erase entity discovery %s on  %s" CR), String(sensor_type).c_str(), topic.c_str());
-  pubMQTT((char*)topic.c_str(), "", true);
-}
-
-#  ifdef ZgatewayBT
-void btPresenceParametersDiscovery() {
-  if (BTConfig.presenceEnable) {
-    createDiscovery("number", //set Type
-                    subjectBTtoMQTT, "BT: Presence detection timer", (char*)getUniqueId("presenceawaytimer", "").c_str(), //set state_topic,name,uniqueId
-                    will_Topic, "", "{{ value_json.presenceawaytimer/60000 }}", //set availability_topic,device_class,value_template,
-                    "{\"presenceawaytimer\":{{value*60000}},\"save\":true}", "", "min", //set,payload_on,payload_off,unit_of_meas,
-                    0, //set  off_delay
-                    Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain,
-                    stateClassNone //State Class
-    );
-  }
-}
-
-void btScanParametersDiscovery() {
-  if (!BTConfig.adaptiveScan) {
-    createDiscovery("number", //set Type
-                    subjectBTtoMQTT, "BT: Interval between scans", (char*)getUniqueId("interval", "").c_str(), //set state_topic,name,uniqueId
-                    will_Topic, "", "{{ value_json.interval/1000 }}", //set availability_topic,device_class,value_template,
-                    "{\"interval\":{{value*1000}},\"save\":true}", "", "s", //set,payload_on,payload_off,unit_of_meas,
-                    0, //set  off_delay
-                    Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain,
-                    stateClassNone //State Class
-    );
-    createDiscovery("number", //set Type
-                    subjectBTtoMQTT, "BT: Interval between active scans", (char*)getUniqueId("intervalacts", "").c_str(), //set state_topic,name,uniqueId
-                    will_Topic, "", "{{ value_json.intervalacts/1000 }}", //set availability_topic,device_class,value_template,
-                    "{\"intervalacts\":{{value*1000}},\"save\":true}", "", "s", //set,payload_on,payload_off,unit_of_meas,
-                    0, //set  off_delay
-                    Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain,
-                    stateClassNone //State Class
-    );
-  }
-}
-#  endif
-
-void pubMqttDiscovery() {
-  Log.trace(F("omgStatusDiscovery" CR));
-  createDiscovery("binary_sensor", //set Type
-                  will_Topic, "SYS: Connectivity", (char*)getUniqueId("connectivity", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "connectivity", "", //set availability_topic,device_class,value_template,
-                  Gateway_AnnouncementMsg, will_Message, "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Uptime", (char*)getUniqueId("uptime", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "duration", "{{ value_json.uptime }}", //set availability_topic,device_class,value_template,
-                  "", "", "s", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassMeasurement //State Class
-  );
-#  if defined(ESP8266) || defined(ESP32)
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Free memory", (char*)getUniqueId("freemem", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "data_size", "{{ value_json.freemem }}", //set availability_topic,device_class,value_template,
-                  "", "", "B", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassMeasurement //State Class
-  );
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: IP", (char*)getUniqueId("ip", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.ip }}", //set availability_topic,device_class,value_template,
-                  "", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("switch", //set Type
-                  subjectSYStoMQTT, "SYS: Auto discovery", (char*)getUniqueId("disc", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.disc }}", //set availability_topic,device_class,value_template,
-                  "{\"disc\":true,\"save\":true}", "{\"disc\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_avalaible,payload_not avalaible   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain,
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("switch", //set Type
-                  subjectSYStoMQTT, "SYS: OpenHAB discovery", (char*)getUniqueId("ohdisc", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.ohdisc }}", //set availability_topic,device_class,value_template,
-                  "{\"ohdisc\":true,\"save\":true}", "{\"ohdisc\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_avalaible,payload_not avalaible   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain,
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-#    ifdef RGB_INDICATORS
-  createDiscovery("number", //set Type
-                  subjectSYStoMQTT, "SYS: LED Brightness", (char*)getUniqueId("rgbb", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ (value_json.rgbb/2.55) | round(0) }}", //set availability_topic,device_class,value_template,
-                  "{\"rgbb\":{{ (value*2.55) | round(0) }},\"save\":true}", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain,
-                  stateClassNone //State Class
-  );
-#    endif
-
-#    ifdef ZdisplaySSD1306
-  createDiscovery("switch", //set Type
-                  subjectSSD1306toMQTT, "SSD1306: Control", (char*)getUniqueId("onstate", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.onstate }}", //set availability_topic,device_class,value_template,
-                  "{\"onstate\":true,\"save\":true}", "{\"onstate\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSSD1306set, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("switch", //set Type
-                  subjectWebUItoMQTT, "SSD1306: Display metric", (char*)getUniqueId("displayMetric", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.displayMetric }}", //set availability_topic,device_class,value_template,
-                  "{\"displayMetric\":true,\"save\":true}", "{\"displayMetric\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoWebUIset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("number", //set Type
-                  subjectSSD1306toMQTT, "SSD1306: Brightness", (char*)getUniqueId("brightness", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.brightness }}", //set availability_topic,device_class,value_template,
-                  "{\"brightness\":{{value}},\"save\":true}", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSSD1306set, //set,payload_available,payload_not available,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#    endif
-
-#    ifndef ESP32_ETHERNET
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: RSSI", (char*)getUniqueId("rssi", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "signal_strength", "{{ value_json.rssi }}", //set availability_topic,device_class,value_template,
-                  "", "", "dB", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#    endif
-#  endif
-#  if defined(ESP32) && !defined(NO_INT_TEMP_READING)
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Internal temperature", (char*)getUniqueId("tempc", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "temperature", "{{ value_json.tempc  | round(1)}}", //set availability_topic,device_class,value_template,
-                  "", "", "°C", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_avalaible,payload_not avalaible   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC
-                  stateClassMeasurement //State Class
-  );
-#    if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Bat voltage", (char*)getUniqueId("m5batvoltage", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "voltage", "{{ value_json.m5batvoltage }}", //set availability_topic,device_class,value_template,
-                  "", "", "V", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Bat current", (char*)getUniqueId("m5batcurrent", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "current", "{{ value_json.m5batcurrent }}", //set availability_topic,device_class,value_template,
-                  "", "", "A", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Vin voltage", (char*)getUniqueId("m5vinvoltage", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "voltage", "{{ value_json.m5vinvoltage }}", //set availability_topic,device_class,value_template,
-                  "", "", "V", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Vin current", (char*)getUniqueId("m5vincurrent", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "current", "{{ value_json.m5vincurrent }}", //set availability_topic,device_class,value_template,
-                  "", "", "A", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#    endif
-#    ifdef ZboardM5STACK
-  createDiscovery("sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Batt level", (char*)getUniqueId("m5battlevel", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "battery", "{{ value_json.m5battlevel }}", //set availability_topic,device_class,value_template,
-                  "", "", "%", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("binary_sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Is Charging", (char*)getUniqueId("m5ischarging", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "{{ value_json.m5ischarging }}", "", //set availability_topic,device_class,value_template,
-                  "", "", "%", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("binary_sensor", //set Type
-                  subjectSYStoMQTT, "SYS: Is Charge Full", (char*)getUniqueId("m5ischargefull", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "{{ value_json.m5ischargefull }}", "", //set availability_topic,device_class,value_template,
-                  "", "", "%", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, "", //set,payload_available,payload_not available   ,is a child device, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#    endif
-#  endif
-  createDiscovery("button", //set Type
-                  will_Topic, "SYS: Restart gateway", (char*)getUniqueId("restart", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "restart", "", //set availability_topic,device_class,value_template,
-                  "{\"cmd\":\"restart\"}", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("button", //set Type
-                  will_Topic, "SYS: Erase credentials", (char*)getUniqueId("erase", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "", //set availability_topic,device_class,value_template,
-                  "{\"cmd\":\"erase\"}", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("update", //set Type
-                  subjectRLStoMQTT, "SYS: Firmware Update", (char*)getUniqueId("update", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "firmware", "", //set availability_topic,device_class,value_template,
-                  LATEST_OR_DEV, "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSupdate, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  ifdef ZsensorBME280
-#    define BMEparametersCount 5
-  Log.trace(F("bme280Discovery" CR));
-  char* BMEsensor[BMEparametersCount][8] = {
-      {"sensor", "temp", "bme", "temperature", jsonTempc, "", "", "°C"},
-      {"sensor", "pa", "bme", "pressure", jsonPa, "", "", "hPa"},
-      {"sensor", "hum", "bme", "humidity", jsonHum, "", "", "%"},
-      {"sensor", "altim", "bme", "", jsonAltim, "", "", "m"},
-      {"sensor", "altift", "bme", "", jsonAltif, "", "", "ft"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < BMEparametersCount; i++) {
-    createDiscovery(BMEsensor[i][0],
-                    BMETOPIC, BMEsensor[i][1], (char*)getUniqueId(BMEsensor[i][1], BMEsensor[i][2]).c_str(),
-                    will_Topic, BMEsensor[i][3], BMEsensor[i][4],
-                    BMEsensor[i][5], BMEsensor[i][6], BMEsensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassNone //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorHTU21
-#    define HTUparametersCount 2
-  Log.trace(F("htu21Discovery" CR));
-  char* HTUsensor[HTUparametersCount][8] = {
-      {"sensor", "temp", "htu", "temperature", jsonTempc, "", "", "°C"},
-      {"sensor", "hum", "htu", "humidity", jsonHum, "", "", "%"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < HTUparametersCount; i++) {
-    //trc(HTUsensor[i][1]);
-    createDiscovery(HTUsensor[i][0],
-                    HTUTOPIC, HTUsensor[i][1], (char*)getUniqueId(HTUsensor[i][1], HTUsensor[i][2]).c_str(),
-                    will_Topic, HTUsensor[i][3], HTUsensor[i][4],
-                    HTUsensor[i][5], HTUsensor[i][6], HTUsensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorLM75
-  Log.trace(F("LM75Discovery" CR));
-  char* LM75sensor[8] = {"sensor", "temp", "htu", "temperature", jsonTempc, "", "", "°C"};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  createDiscovery(LM75sensor[0],
-                  LM75TOPIC, LM75sensor[1], (char*)getUniqueId(LM75sensor[1], LM75sensor[2]).c_str(),
-                  will_Topic, LM75sensor[3], LM75sensor[4],
-                  LM75sensor[5], LM75sensor[6], LM75sensor[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassMeasurement //State Class
-  );
-#  endif
-
-#  ifdef ZsensorAHTx0
-#    define AHTparametersCount 2
-  Log.trace(F("AHTx0Discovery" CR));
-  char* AHTsensor[AHTparametersCount][8] = {
-      {"sensor", "temp", "aht", "temperature", jsonTempc, "", "", "°C"},
-      {"sensor", "hum", "aht", "humidity", jsonHum, "", "", "%"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < AHTparametersCount; i++) {
-    createDiscovery(AHTsensor[i][0],
-                    AHTTOPIC, AHTsensor[i][1], (char*)getUniqueId(AHTsensor[i][1], AHTsensor[i][2]).c_str(),
-                    will_Topic, AHTsensor[i][3], AHTsensor[i][4],
-                    AHTsensor[i][5], AHTsensor[i][6], AHTsensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorDHT
-#    define DHTparametersCount 2
-  Log.trace(F("DHTDiscovery" CR));
-  char* DHTsensor[DHTparametersCount][8] = {
-      {"sensor", "temp", "dht", "temperature", jsonTempc, "", "", "°C"},
-      {"sensor", "hum", "dht", "humidity", jsonHum, "", "", "%"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < DHTparametersCount; i++) {
-    //trc(DHTsensor[i][1]);
-    createDiscovery(DHTsensor[i][0],
-                    DHTTOPIC, DHTsensor[i][1], (char*)getUniqueId(DHTsensor[i][1], DHTsensor[i][2]).c_str(),
-                    will_Topic, DHTsensor[i][3], DHTsensor[i][4],
-                    DHTsensor[i][5], DHTsensor[i][6], DHTsensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorADC
-  Log.trace(F("ADCDiscovery" CR));
-  char* ADCsensor[8] = {"sensor", "adc", "", "", jsonAdc, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(ADCsensor[1]);
-  createDiscovery(ADCsensor[0],
-                  ADCTOPIC, ADCsensor[1], (char*)getUniqueId(ADCsensor[1], ADCsensor[2]).c_str(),
-                  will_Topic, ADCsensor[3], ADCsensor[4],
-                  ADCsensor[5], ADCsensor[6], ADCsensor[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZsensorBH1750
-#    define BH1750parametersCount 3
-  Log.trace(F("BH1750Discovery" CR));
-  char* BH1750sensor[BH1750parametersCount][8] = {
-      {"sensor", "lux", "BH1750", "illuminance", jsonLux, "", "", "lx"},
-      {"sensor", "ftCd", "BH1750", "irradiance", jsonFtcd, "", "", ""},
-      {"sensor", "wattsm2", "BH1750", "irradiance", jsonWm2, "", "", "wm²"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < BH1750parametersCount; i++) {
-    //trc(BH1750sensor[i][1]);
-    createDiscovery(BH1750sensor[i][0],
-                    subjectBH1750toMQTT, BH1750sensor[i][1], (char*)getUniqueId(BH1750sensor[i][1], BH1750sensor[i][2]).c_str(),
-                    will_Topic, BH1750sensor[i][3], BH1750sensor[i][4],
-                    BH1750sensor[i][5], BH1750sensor[i][6], BH1750sensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorMQ2
-#    define MQ2parametersCount 2
-  Log.trace(F("MQ2Discovery" CR));
-  char* MQ2sensor[MQ2parametersCount][8] = {
-      {"sensor", "gas", "MQ2", "gas", jsonVal, "", "", "ppm"},
-      {"binary_sensor", "MQ2", "", "gas", jsonPresence, "true", "false", ""}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < MQ2parametersCount; i++) {
-    createDiscovery(MQ2sensor[i][0],
-                    subjectMQ2toMQTT, MQ2sensor[i][1], (char*)getUniqueId(MQ2sensor[i][1], MQ2sensor[i][2]).c_str(),
-                    will_Topic, MQ2sensor[i][3], MQ2sensor[i][4],
-                    MQ2sensor[i][5], MQ2sensor[i][6], MQ2sensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassNone //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorTEMT6000
-#    define TEMT6000parametersCount 3
-  Log.trace(F("TEMT6000Discovery" CR));
-  char* TEMT6000sensor[TEMT6000parametersCount][8] = {
-      {"sensor", "lux", "TEMT6000", "illuminance", jsonLux, "", "", "lx"},
-      {"sensor", "ftcd", "TEMT6000", "irradiance", jsonFtcd, "", "", ""},
-      {"sensor", "wattsm2", "TEMT6000", "irradiance", jsonWm2, "", "", "wm²"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < TEMT6000parametersCount; i++) {
-    //trc(TEMT6000sensor[i][1]);
-    createDiscovery(TEMT6000sensor[i][0],
-                    subjectTEMT6000toMQTT, TEMT6000sensor[i][1], (char*)getUniqueId(TEMT6000sensor[i][1], TEMT6000sensor[i][2]).c_str(),
-                    will_Topic, TEMT6000sensor[i][3], TEMT6000sensor[i][4],
-                    TEMT6000sensor[i][5], TEMT6000sensor[i][6], TEMT6000sensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorTSL2561
-#    define TSL2561parametersCount 3
-  Log.trace(F("TSL2561Discovery" CR));
-  char* TSL2561sensor[TSL2561parametersCount][8] = {
-      {"sensor", "lux", "TSL2561", "illuminance", jsonLux, "", "", "lx"},
-      {"sensor", "ftcd", "TSL2561", "irradiance", jsonFtcd, "", "", ""},
-      {"sensor", "wattsm2", "TSL2561", "irradiance", jsonWm2, "", "", "wm²"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < TSL2561parametersCount; i++) {
-    //trc(TSL2561sensor[i][1]);
-    createDiscovery(TSL2561sensor[i][0],
-                    subjectTSL12561toMQTT, TSL2561sensor[i][1], (char*)getUniqueId(TSL2561sensor[i][1], TSL2561sensor[i][2]).c_str(),
-                    will_Topic, TSL2561sensor[i][3], TSL2561sensor[i][4],
-                    TSL2561sensor[i][5], TSL2561sensor[i][6], TSL2561sensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorHCSR501
-  Log.trace(F("HCSR501Discovery" CR));
-  char* HCSR501sensor[8] = {"binary_sensor", "hcsr501", "", "motion", jsonPresence, "true", "false", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(HCSR501sensor[1]);
-  createDiscovery(HCSR501sensor[0],
-                  subjectHCSR501toMQTT, HCSR501sensor[1], (char*)getUniqueId(HCSR501sensor[1], HCSR501sensor[2]).c_str(),
-                  will_Topic, HCSR501sensor[3], HCSR501sensor[4],
-                  HCSR501sensor[5], HCSR501sensor[6], HCSR501sensor[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZsensorGPIOInput
-  Log.trace(F("GPIOInputDiscovery" CR));
-  char* GPIOInputsensor[8] = {"binary_sensor", "GPIOInput", "", "", jsonGpio, INPUT_GPIO_ON_VALUE, INPUT_GPIO_OFF_VALUE, ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(GPIOInputsensor[1]);
-  createDiscovery(GPIOInputsensor[0],
-                  subjectGPIOInputtoMQTT, GPIOInputsensor[1], (char*)getUniqueId(GPIOInputsensor[1], GPIOInputsensor[2]).c_str(),
-                  will_Topic, GPIOInputsensor[3], GPIOInputsensor[4],
-                  GPIOInputsensor[5], GPIOInputsensor[6], GPIOInputsensor[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZsensorINA226
-#    define INA226parametersCount 3
-  Log.trace(F("INA226Discovery" CR));
-  char* INA226sensor[INA226parametersCount][8] = {
-      {"sensor", "volt", "INA226", "voltage", jsonVolt, "", "", "V"},
-      {"sensor", "current", "INA226", "current", jsonCurrent, "", "", "A"},
-      {"sensor", "power", "INA226", "power", jsonPower, "", "", "W"}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < INA226parametersCount; i++) {
-    //trc(INA226sensor[i][1]);
-    createDiscovery(INA226sensor[i][0],
-                    subjectINA226toMQTT, INA226sensor[i][1], (char*)getUniqueId(INA226sensor[i][1], INA226sensor[i][2]).c_str(),
-                    will_Topic, INA226sensor[i][3], INA226sensor[i][4],
-                    INA226sensor[i][5], INA226sensor[i][6], INA226sensor[i][7],
-                    0, Gateway_AnnouncementMsg, will_Message, true, "",
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZsensorDS1820
-  // Publish any DS1820 sensors found on the OneWire bus
-  pubOneWire_HADiscovery();
-#  endif
-
-#  ifdef ZactuatorONOFF
-  Log.trace(F("actuatorONOFFDiscovery" CR));
-  char* actuatorONOFF[8] = {"switch", "actuatorONOFF", "", "", "{{ value_json.cmd }}", "{\"cmd\":1}", "{\"cmd\":0}", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(actuatorONOFF[1]);
-  createDiscovery(actuatorONOFF[0],
-                  subjectGTWONOFFtoMQTT, actuatorONOFF[1], (char*)getUniqueId(actuatorONOFF[1], actuatorONOFF[2]).c_str(),
-                  will_Topic, actuatorONOFF[3], actuatorONOFF[4],
-                  actuatorONOFF[5], actuatorONOFF[6], actuatorONOFF[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoONOFF,
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone, //State Class
-                  "0", "1" //state_off, state_on
-  );
-#  endif
-
-#  ifdef ZsensorRN8209
-#    define RN8209parametersCount 4
-  Log.trace(F("RN8209Discovery" CR));
-  char* RN8209sensor[RN8209parametersCount][8] = {
-      {"sensor", "volt", "RN8209", "voltage", jsonVolt, "", "", "V"},
-      {"sensor", "current", "RN8209", "current", jsonCurrent, "", "", "A"},
-      {"sensor", "power", "RN8209", "power", jsonPower, "", "", "W"},
-      {"binary_sensor", "inUse", "RN8209", "power", jsonInuseRN8209, "on", "off", ""}
-      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-  };
-
-  for (int i = 0; i < RN8209parametersCount; i++) {
-    String name = "NRG: " + String(RN8209sensor[i][1]);
-    createDiscovery(RN8209sensor[i][0],
-                    subjectRN8209toMQTT, (char*)name.c_str(), (char*)getUniqueId(RN8209sensor[i][1], RN8209sensor[i][2]).c_str(), //set state_topic,name,uniqueId
-                    will_Topic, RN8209sensor[i][3], RN8209sensor[i][4], //set availability_topic,device_class,value_template,
-                    RN8209sensor[i][5], RN8209sensor[i][6], RN8209sensor[i][7], //set,payload_on,payload_off,unit_of_meas
-                    0, Gateway_AnnouncementMsg, will_Message, true, "", //set  off_delay,payload_available,payload_not available   ,is a gateway entity, command topic
-                    "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                    stateClassMeasurement //State Class
-    );
-  }
-#  endif
-
-#  ifdef ZgatewayRF
-  // Sensor to display RF received value
-  Log.trace(F("gatewayRFDiscovery" CR));
-  char* gatewayRF[8] = {"sensor", "gatewayRF", "", "", jsonVal, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewayRF[1]);
-  createDiscovery(gatewayRF[0],
-                  subjectRFtoMQTT, gatewayRF[1], (char*)getUniqueId(gatewayRF[1], gatewayRF[2]).c_str(),
-                  will_Topic, gatewayRF[3], gatewayRF[4],
-                  gatewayRF[5], gatewayRF[6], gatewayRF[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-
-#  endif
-
-#  ifdef ZgatewayRF2
-  // Sensor to display RF received value
-  Log.trace(F("gatewayRF2Discovery" CR));
-  char* gatewayRF2[8] = {"sensor", "gatewayRF2", "", "", jsonAddress, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewayRF2[1]);
-  createDiscovery(gatewayRF2[0],
-                  subjectRF2toMQTT, gatewayRF2[1], (char*)getUniqueId(gatewayRF2[1], gatewayRF2[2]).c_str(),
-                  will_Topic, gatewayRF2[3], gatewayRF2[4],
-                  gatewayRF2[5], gatewayRF2[6], gatewayRF2[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZgatewayRFM69
-  // Sensor to display RF received value
-  Log.trace(F("gatewayRFM69Discovery" CR));
-  char* gatewayRFM69[8] = {"sensor", "gatewayRFM69", "", "", jsonVal, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewayRFM69[1]);
-  createDiscovery(gatewayRFM69[0],
-                  subjectRFM69toMQTT, gatewayRFM69[1], (char*)getUniqueId(gatewayRFM69[1], gatewayRFM69[2]).c_str(),
-                  will_Topic, gatewayRFM69[3], gatewayRFM69[4],
-                  gatewayRFM69[5], gatewayRFM69[6], gatewayRFM69[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZgatewayLORA
-  // Sensor to display RF received value
-  Log.trace(F("gatewayLORADiscovery" CR));
-  char* gatewayLORA[8] = {"sensor", "gatewayLORA", "", "", jsonMsg, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewayLORA[1]);
-  createDiscovery(gatewayLORA[0],
-                  subjectLORAtoMQTT, gatewayLORA[1], (char*)getUniqueId(gatewayLORA[1], gatewayLORA[2]).c_str(),
-                  will_Topic, gatewayLORA[3], gatewayLORA[4],
-                  gatewayLORA[5], gatewayLORA[6], gatewayLORA[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-
-  createDiscovery("switch", //set Type
-                  subjectLORAtoMQTT, "LORA: CRC", (char*)getUniqueId("enablecrc", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.enablecrc }}", //set availability_topic,device_class,value_template,
-                  "{\"enablecrc\":true,\"save\":true}", "{\"enablecrc\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoLORAset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-
-  createDiscovery("switch", //set Type
-                  subjectLORAtoMQTT, "LORA: Invert IQ", (char*)getUniqueId("invertiq", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.invertiq }}", //set availability_topic,device_class,value_template,
-                  "{\"invertiq\":true,\"save\":true}", "{\"invertiq\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoLORAset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-
-  createDiscovery("switch", //set Type
-                  subjectLORAtoMQTT, "LORA: Only Known", (char*)getUniqueId("onlyknown", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.onlyknown }}", //set availability_topic,device_class,value_template,
-                  "{\"onlyknown\":true,\"save\":true}", "{\"onlyknown\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoLORAset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-#  endif
-
-#  ifdef ZgatewaySRFB
-  // Sensor to display RF received value
-  Log.trace(F("gatewaySRFBDiscovery" CR));
-  char* gatewaySRFB[8] = {"sensor", "gatewaySRFB", "", "", jsonVal, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewaySRFB[1]);
-  createDiscovery(gatewaySRFB[0],
-                  subjectSRFBtoMQTT, gatewaySRFB[1], (char*)getUniqueId(gatewaySRFB[1], gatewaySRFB[2]).c_str(),
-                  will_Topic, gatewaySRFB[3], gatewaySRFB[4],
-                  gatewaySRFB[5], gatewaySRFB[6], gatewaySRFB[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZgatewayPilight
-  // Sensor to display RF received value
-  Log.trace(F("gatewayPilightDiscovery" CR));
-  char* gatewayPilight[8] = {"sensor", "gatewayPilight", "", "", jsonMsg, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewayPilight[1]);
-  createDiscovery(gatewayPilight[0],
-                  subjectPilighttoMQTT, gatewayPilight[1], (char*)getUniqueId(gatewayPilight[1], gatewayPilight[2]).c_str(),
-                  will_Topic, gatewayPilight[3], gatewayPilight[4],
-                  gatewayPilight[5], gatewayPilight[6], gatewayPilight[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZgatewayIR
-  // Sensor to display IR received value
-  Log.trace(F("gatewayIRDiscovery" CR));
-  char* gatewayIR[8] = {"sensor", "gatewayIR", "", "", jsonVal, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gatewayIR[1]);
-  createDiscovery(gatewayIR[0],
-                  subjectIRtoMQTT, gatewayIR[1], (char*)getUniqueId(gatewayIR[1], gatewayIR[2]).c_str(),
-                  will_Topic, gatewayIR[3], gatewayIR[4],
-                  gatewayIR[5], gatewayIR[6], gatewayIR[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef Zgateway2G
-  // Sensor to display 2G received value
-  Log.trace(F("gateway2GDiscovery" CR));
-  char* gateway2G[8] = {"sensor", "gateway2G", "", "", jsonMsg, "", "", ""};
-  //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
-
-  //trc(gateway2G[1]);
-  createDiscovery(gateway2G[0],
-                  subject2GtoMQTT, gateway2G[1], (char*)getUniqueId(gateway2G[1], gateway2G[2]).c_str(),
-                  will_Topic, gateway2G[3], gateway2G[4],
-                  gateway2G[5], gateway2G[6], gateway2G[7],
-                  0, Gateway_AnnouncementMsg, will_Message, true, "",
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-#  endif
-
-#  ifdef ZgatewayBT
-#    ifdef ESP32
-
-  createDiscovery("number", //set Type
-                  subjectBTtoMQTT, "BT: Connect interval", (char*)getUniqueId("intervalcnct", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.intervalcnct/60000 }}", //set availability_topic,device_class,value_template,
-                  "{\"intervalcnct\":{{value*60000}},\"save\":true}", "", "min", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("number", //set Type
-                  subjectBTtoMQTT, "BT: Scan duration", (char*)getUniqueId("scanduration", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.scanduration/1000 }}", //set availability_topic,device_class,value_template,
-                  "{\"scanduration\":{{value*1000}},\"save\":true}", "", "s", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("button", //set Type
-                  will_Topic, "BT: Force scan", (char*)getUniqueId("force_scan", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "", //set availability_topic,device_class,value_template,
-                  "{\"interval\":0}", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("button", //set Type
-                  will_Topic, "BT: Erase config", (char*)getUniqueId("erase_bt_config", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "", //set availability_topic,device_class,value_template,
-                  "{\"erase\":true}", "", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone //State Class
-  );
-  createDiscovery("switch", //set Type
-                  subjectBTtoMQTT, "BT: Publish only sensors", (char*)getUniqueId("only_sensors", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.onlysensors }}", //set availability_topic,device_class,value_template,
-                  "{\"onlysensors\":true,\"save\":true}", "{\"onlysensors\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("switch", //set Type
-                  subjectBTtoMQTT, "BT: Adaptive scan", (char*)getUniqueId("adaptive_scan", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.adaptivescan }}", //set availability_topic,device_class,value_template,
-                  "{\"adaptivescan\":true,\"save\":true}", "{\"adaptivescan\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("switch", //set Type
-                  subjectBTtoMQTT, "BT: Enabled", (char*)getUniqueId("enabled", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.enabled }}", //set availability_topic,device_class,value_template,
-                  "{\"enabled\":true,\"save\":true}", "{\"enabled\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-
-#      define EntitiesCount 9
-  const char* obsoleteEntities[EntitiesCount][2] = {
-      // Remove previously created entities for version < 1.4.0
-      {"switch", "active_scan"}, // Replaced by adaptive scan
-      // Remove previously created entities for version < 1.3.0
-      {"number", "scanbcnct"}, // Now a connect interval
-      // Remove previously created entities for version < 1.2.0
-      {"switch", "restart"}, // Now a button
-      {"switch", "erase"}, // Now a button
-      {"switch", "force_scan"}, // Now a button
-      {"sensor", "interval"}, // Now a number
-      {"sensor", "scanbcnct"}, // Now a number
-      {"switch", "ohdiscovery"}, // Now a new key
-      {"switch", "discovery"}}; // Now a new key
-
-  for (int i = 0; i < EntitiesCount; i++) {
-    eraseTopic(obsoleteEntities[i][0], (char*)getUniqueId(obsoleteEntities[i][1], "").c_str());
-  }
-
-  btScanParametersDiscovery();
-
-  btPresenceParametersDiscovery();
-
-  createDiscovery("switch", //set Type
-                  subjectBTtoMQTT, "BT: Publish HASS presence", (char*)getUniqueId("hasspresence", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.hasspresence }}", //set availability_topic,device_class,value_template,
-                  "{\"hasspresence\":true,\"save\":true}", "{\"hasspresence\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("switch", //set Type
-                  subjectBTtoMQTT, "BT: Publish Advertisement data", (char*)getUniqueId("pubadvdata", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.pubadvdata }}", //set availability_topic,device_class,value_template,
-                  "{\"pubadvdata\":true,\"save\":true}", "{\"pubadvdata\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-  createDiscovery("switch", //set Type
-                  subjectBTtoMQTT, "BT: Connect to devices", (char*)getUniqueId("bleconnect", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.bleconnect }}", //set availability_topic,device_class,value_template,
-                  "{\"bleconnect\":true,\"save\":true}", "{\"bleconnect\":false,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set  off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
-                  "", "", "", "", false, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-#      if DEFAULT_LOW_POWER_MODE != -1
-  createDiscovery("switch", //set Type
-                  subjectSYStoMQTT, "SYS: Low Power Mode command", (char*)getUniqueId("lowpowermode", "").c_str(), //set state_topic,name,uniqueId
-                  will_Topic, "", "{{ value_json.lowpowermode | bool }}", //set availability_topic,device_class,value_template,
-                  "{\"lowpowermode\":2}", "{\"lowpowermode\":0}", "", //set,payload_on,payload_off,unit_of_meas,
-                  0, //set off_delay
-                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available,is a gateway entity, command topic
-                  "", "", "", "", true, // device name, device manufacturer, device model, device MAC, retain
-                  stateClassNone, //State Class
-                  "false", "true" //state_off, state_on
-  );
-#      else
-  // Remove previously created switch for version < 1.4.0
-  eraseTopic("switch", (char*)getUniqueId("lowpowermode", "").c_str());
-#      endif
-#    endif
-#  endif
-}
-#endif
diff --git a/main/ZactuatorFASTLED.ino b/main/actuatorFASTLED.cpp
similarity index 88%
rename from main/ZactuatorFASTLED.ino
rename to main/actuatorFASTLED.cpp
index b75dabf..324561f 100644
--- a/main/ZactuatorFASTLED.ino
+++ b/main/actuatorFASTLED.cpp
@@ -1,5 +1,5 @@
 /*
-  OpenMQTTGateway - ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
   This gateway enables to use RGBLED strips like WS2812
 
@@ -26,6 +26,8 @@
 
 #  include <FastLED.h>
 
+#  include "config_FASTLED.h"
+
 enum LEDState {
   OFF,
   FIRE,
@@ -41,10 +43,12 @@ const long blinkInterval = 300;
 const long fireUpdate = 10;
 CRGBPalette16 gPal;
 
+void Fire2012WithPalette();
+
 void setupFASTLED() {
-  Log.notice(F("FASTLED_DATA_GPIO: %d" CR), FASTLED_DATA_GPIO);
-  Log.notice(F("FASTLED_NUM_LEDS: %d" CR), FASTLED_NUM_LEDS);
-  Log.trace(F("ZactuatorFASTLED setup done " CR));
+  THEENGS_LOG_NOTICE(F("FASTLED_DATA_GPIO: %d" CR), FASTLED_DATA_GPIO);
+  THEENGS_LOG_NOTICE(F("FASTLED_NUM_LEDS: %d" CR), FASTLED_NUM_LEDS);
+  THEENGS_LOG_TRACE(F("actuatorFASTLED setup done " CR));
   FastLED.addLeds<FASTLED_TYPE, FASTLED_DATA_GPIO>(leds, FASTLED_NUM_LEDS);
 }
 
@@ -94,26 +98,26 @@ void FASTLEDLoop() {
   FastLED.show();
 }
 
-boolean FASTLEDtoMQTT() {
+boolean FASTLEDtoX() {
   return false;
 }
 #  if jsonReceiving
-void MQTTtoFASTLED(char* topicOri, JsonObject& jsonData) {
+void XtoFASTLED(const char* topicOri, JsonObject& jsonData) {
   currentLEDState = GENERAL;
   //trc(topicOri);
   //number = (long)strtol(&datacallback[1], NULL, 16);
 
   if (cmpToMainTopic(topicOri, subjectMQTTtoFASTLEDsetled)) {
-    Log.trace(F("MQTTtoFASTLED JSON analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoFASTLED JSON analysis" CR));
     int ledNr = jsonData["led"];
-    Log.notice(F("Led numero: %d" CR), ledNr);
+    THEENGS_LOG_NOTICE(F("Led numero: %d" CR), ledNr);
     const char* color = jsonData["hex"];
-    Log.notice(F("Color hex: %s" CR), color);
+    THEENGS_LOG_NOTICE(F("Color hex: %s" CR), color);
 
     long number = (long)strtol(color, NULL, 16);
     bool blink = jsonData["blink"];
     if (ledNr <= FASTLED_NUM_LEDS) {
-      Log.notice(F("Blink: %d" CR), blink);
+      THEENGS_LOG_NOTICE(F("Blink: %d" CR), blink);
       blinkLED[ledNr] = blink;
       leds[ledNr] = number;
     }
@@ -122,25 +126,25 @@ void MQTTtoFASTLED(char* topicOri, JsonObject& jsonData) {
 #  endif
 
 #  if simpleReceiving
-void MQTTtoFASTLED(char* topicOri, char* datacallback) {
-  Log.trace(F("MQTTtoFASTLED: " CR));
+void XtoFASTLED(const char* topicOri, const char* datacallback) {
+  THEENGS_LOG_TRACE(F("MQTTtoFASTLED: " CR));
   currentLEDState = GENERAL;
   long number = 0;
   if (cmpToMainTopic(topicOri, subjectMQTTtoFASTLED)) {
     number = (long)strtol(&datacallback[1], NULL, 16);
-    Log.notice(F("Number: %l" CR), number);
+    THEENGS_LOG_NOTICE(F("Number: %l" CR), number);
     for (int i = 0; i < FASTLED_NUM_LEDS; i++) {
       leds[i] = number;
     }
     FastLED.show();
   } else if (cmpToMainTopic(topicOri, subjectMQTTtoFASTLEDsetbrightness)) {
     number = (long)strtol(&datacallback[1], NULL, 16);
-    Log.notice(F("Number: %l" CR), number);
+    THEENGS_LOG_NOTICE(F("Number: %l" CR), number);
     FastLED.setBrightness(number);
     FastLED.show();
   } else if (cmpToMainTopic(topicOri, subjectMQTTtoFASTLEDsetanimation)) {
     String payload = datacallback;
-    Log.notice(F("Datacallback: %s" CR), datacallback);
+    THEENGS_LOG_NOTICE(F("Datacallback: %s" CR), datacallback);
     if (strstr(datacallback, "fire") != NULL) {
       currentLEDState = FIRE;
       gPal = HeatColors_p;
diff --git a/main/ZactuatorONOFF.ino b/main/actuatorONOFF.cpp
similarity index 69%
rename from main/ZactuatorONOFF.ino
rename to main/actuatorONOFF.cpp
index be00845..de7af8c 100644
--- a/main/ZactuatorONOFF.ino
+++ b/main/actuatorONOFF.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker  
    Send and receiving command by MQTT
  
     Output GPIO defined to High or Low
@@ -30,7 +30,15 @@
 
 #ifdef ZactuatorONOFF
 
+#  include "LEDManager.h"
+#  include "TheengsCommon.h"
+#  include "config_ONOFF.h"
+
+extern LEDManager ledManager;
+extern void ActuatorTrigger();
+
 #  ifdef ESP32
+
 // Global struct to store live ONOFF configuration data
 ONOFFConfig_s ONOFFConfig;
 
@@ -48,11 +56,11 @@ void ONOFFConfig_fromJson(JsonObject& ONOFFdata) {
     preferences.begin(Gateway_Short_Name, false);
     if (preferences.isKey("ONOFFConfig")) {
       int result = preferences.remove("ONOFFConfig");
-      Log.notice(F("ONOFF config erase result: %d" CR), result);
+      THEENGS_LOG_NOTICE(F("ONOFF config erase result: %d" CR), result);
       preferences.end();
       return; // Erase prevails on save, so skipping save
     } else {
-      Log.notice(F("ONOFF config not found" CR));
+      THEENGS_LOG_NOTICE(F("ONOFF config not found" CR));
       preferences.end();
     }
   }
@@ -67,7 +75,7 @@ void ONOFFConfig_fromJson(JsonObject& ONOFFdata) {
     preferences.begin(Gateway_Short_Name, false);
     int result = preferences.putString("ONOFFConfig", conf);
     preferences.end();
-    Log.notice(F("ONOFF Config_save: %s, result: %d" CR), conf.c_str(), result);
+    THEENGS_LOG_NOTICE(F("ONOFF Config_save: %s, result: %d" CR), conf.c_str(), result);
   }
 }
 
@@ -78,35 +86,64 @@ void ONOFFConfig_load() {
     auto error = deserializeJson(jsonBuffer, preferences.getString("ONOFFConfig", "{}"));
     preferences.end();
     if (error) {
-      Log.error(F("ONOFF config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      THEENGS_LOG_ERROR(F("ONOFF config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
       return;
     }
     if (jsonBuffer.isNull()) {
-      Log.warning(F("ONOFF config is null" CR));
+      THEENGS_LOG_WARNING(F("ONOFF config is null" CR));
       return;
     }
     JsonObject jo = jsonBuffer.as<JsonObject>();
     ONOFFConfig_fromJson(jo);
-    Log.notice(F("ONOFF config loaded" CR));
+    THEENGS_LOG_NOTICE(F("ONOFF config loaded" CR));
   } else {
     preferences.end();
-    Log.notice(F("ONOFF config not found" CR));
+    THEENGS_LOG_NOTICE(F("ONOFF config not found" CR));
   }
 }
 #  else
-void ONOFFConfig_init(){};
-void ONOFFConfig_fromJson(JsonObject& ONOFFdata){};
-void ONOFFConfig_load(){};
+void ONOFFConfig_init() {};
+void ONOFFConfig_fromJson(JsonObject& ONOFFdata) {};
+void ONOFFConfig_load() {};
 #  endif
 
 void updatePowerIndicator() {
+#  ifdef LED_ACTUATOR_ONOFF
   if (digitalRead(ACTUATOR_ONOFF_GPIO) == ACTUATOR_ON) {
-    PowerIndicatorON();
+    ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_ACTUATOR_ONOFF_COLOR);
   } else {
-    PowerIndicatorOFF();
+    ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_COLOR_BLACK);
   }
+#  endif
 }
 
+//Check regularly temperature of the ESP32 board and switch OFF the relay if temperature is more than MAX_TEMP_ACTUATOR
+#  ifdef MAX_TEMP_ACTUATOR
+extern float intTemperatureRead();
+
+void overLimitTemp(void* pvParameters) {
+#    if defined(ESP32) && !defined(NO_INT_TEMP_READING)
+  for (;;) {
+    static float previousInternalTempc = 0;
+    float internalTempc = intTemperatureRead();
+    THEENGS_LOG_TRACE(F("Internal temperature of the ESP32 %F" CR), internalTempc);
+    // We switch OFF the actuator if the temperature of the ESP32 is more than MAX_TEMP_ACTUATOR two consecutive times, so as to avoid false single readings to trigger the relay OFF.
+    if (internalTempc > MAX_TEMP_ACTUATOR && previousInternalTempc > MAX_TEMP_ACTUATOR) {
+      if (digitalRead(ACTUATOR_ONOFF_GPIO) == ACTUATOR_ON) { // This could be with the previous condition, but it is better to trigger the digitalRead only if the previous condition is met to avoid the digitalRead
+        THEENGS_LOG_ERROR(F("[ActuatorONOFF] OverTemperature detected ( %F > %F ) switching OFF Actuator" CR), internalTempc, MAX_TEMP_ACTUATOR);
+        ActuatorTrigger();
+#      ifdef LED_ACTUATOR_ONOFF
+        ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_ERROR_COLOR, -1);
+#      endif
+      }
+    }
+    previousInternalTempc = internalTempc;
+    vTaskDelay(TimeBetweenReadingIntTemp);
+  }
+#    endif
+}
+#  endif
+
 void setupONOFF() {
 #  ifdef MAX_TEMP_ACTUATOR
   xTaskCreate(overLimitTemp, "overLimitTemp", 4000, NULL, 10, NULL);
@@ -114,8 +151,8 @@ void setupONOFF() {
 #  ifdef ESP32
   ONOFFConfig_init();
   ONOFFConfig_load();
-  Log.notice(F("Target state on restart: %T" CR), ONOFFConfig.ONOFFState);
-  Log.notice(F("Use last state on restart: %T" CR), ONOFFConfig.useLastStateOnStart);
+  THEENGS_LOG_NOTICE(F("Target state on restart: %T" CR), ONOFFConfig.ONOFFState);
+  THEENGS_LOG_NOTICE(F("Use last state on restart: %T" CR), ONOFFConfig.useLastStateOnStart);
 #  endif
   pinMode(ACTUATOR_ONOFF_GPIO, OUTPUT);
 #  ifdef ACTUATOR_ONOFF_DEFAULT
@@ -128,25 +165,27 @@ void setupONOFF() {
   }
 #  endif
   updatePowerIndicator();
-  Log.trace(F("ZactuatorONOFF setup done" CR));
+  THEENGS_LOG_TRACE(F("actuatorONOFF setup done" CR));
 }
 
 #  if jsonReceiving
-void MQTTtoONOFF(char* topicOri, JsonObject& ONOFFdata) {
+void XtoONOFF(const char* topicOri, JsonObject& ONOFFdata) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoONOFF)) {
-    Log.trace(F("MQTTtoONOFF json data analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoONOFF json data analysis" CR));
     int boolSWITCHTYPE = ONOFFdata["cmd"] | 99;
     int gpio = ONOFFdata["gpio"] | ACTUATOR_ONOFF_GPIO;
     if (boolSWITCHTYPE != 99) {
-      Log.notice(F("MQTTtoONOFF boolSWITCHTYPE ok: %d" CR), boolSWITCHTYPE);
-      Log.notice(F("GPIO number: %d" CR), gpio);
+      THEENGS_LOG_NOTICE(F("MQTTtoONOFF boolSWITCHTYPE ok: %d" CR), boolSWITCHTYPE);
+      THEENGS_LOG_NOTICE(F("GPIO number: %d" CR), gpio);
       pinMode(gpio, OUTPUT);
       digitalWrite(gpio, boolSWITCHTYPE);
+#    ifdef LED_ACTUATOR_ONOFF
       if (boolSWITCHTYPE == ACTUATOR_ON) {
-        PowerIndicatorON();
+        ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_ACTUATOR_ONOFF_COLOR);
       } else {
-        PowerIndicatorOFF();
+        ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_COLOR_BLACK);
       }
+#    endif
 #    ifdef ESP32
       if (ONOFFConfig.useLastStateOnStart) {
         ONOFFdata["save"] = true;
@@ -157,30 +196,30 @@ void MQTTtoONOFF(char* topicOri, JsonObject& ONOFFdata) {
       stateONOFFMeasures();
     } else {
       if (ONOFFdata["cmd"] == "high_pulse") {
-        Log.notice(F("MQTTtoONOFF high_pulse ok" CR));
-        Log.notice(F("GPIO number: %d" CR), gpio);
+        THEENGS_LOG_NOTICE(F("MQTTtoONOFF high_pulse ok" CR));
+        THEENGS_LOG_NOTICE(F("GPIO number: %d" CR), gpio);
         int pulselength = ONOFFdata["pulse_length"] | 500;
-        Log.notice(F("Pulse length: %d ms" CR), pulselength);
+        THEENGS_LOG_NOTICE(F("Pulse length: %d ms" CR), pulselength);
         pinMode(gpio, OUTPUT);
         digitalWrite(gpio, HIGH);
         delay(pulselength);
         digitalWrite(gpio, LOW);
       } else if (ONOFFdata["cmd"] == "low_pulse") {
-        Log.notice(F("MQTTtoONOFF low_pulse ok" CR));
-        Log.notice(F("GPIO number: %d" CR), gpio);
+        THEENGS_LOG_NOTICE(F("MQTTtoONOFF low_pulse ok" CR));
+        THEENGS_LOG_NOTICE(F("GPIO number: %d" CR), gpio);
         int pulselength = ONOFFdata["pulse_length"] | 500;
-        Log.notice(F("Pulse length: %d ms" CR), pulselength);
+        THEENGS_LOG_NOTICE(F("Pulse length: %d ms" CR), pulselength);
         pinMode(gpio, OUTPUT);
         digitalWrite(gpio, LOW);
         delay(pulselength);
         digitalWrite(gpio, HIGH);
       } else {
-        Log.error(F("MQTTtoONOFF failed json read" CR));
+        THEENGS_LOG_ERROR(F("MQTTtoONOFF failed json read" CR));
       }
     }
   }
   if (cmpToMainTopic(topicOri, subjectMQTTtoONOFFset)) {
-    Log.trace(F("MQTTtoONOFF json set" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoONOFF json set" CR));
     /*
      * Configuration modifications priorities:
      *  First `init=true` and `load=true` commands are executed (if both are present, INIT prevails on LOAD)
@@ -203,15 +242,15 @@ void MQTTtoONOFF(char* topicOri, JsonObject& ONOFFdata) {
 #  endif
 
 #  if simpleReceiving
-void MQTTtoONOFF(char* topicOri, char* datacallback) {
+void XtoONOFF(const char* topicOri, const char* datacallback) {
   if ((cmpToMainTopic(topicOri, subjectMQTTtoONOFF))) {
-    Log.trace(F("MQTTtoONOFF" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoONOFF" CR));
     char* endptr = NULL;
     long gpio = strtol(datacallback, &endptr, 10);
     if (datacallback == endptr)
       gpio = ACTUATOR_ONOFF_GPIO;
 
-    Log.notice(F("GPIO number: %d" CR), gpio);
+    THEENGS_LOG_NOTICE(F("GPIO number: %d" CR), gpio);
     pinMode(gpio, OUTPUT);
 
     bool ON = false;
@@ -221,11 +260,13 @@ void MQTTtoONOFF(char* topicOri, char* datacallback) {
       ON = false;
 
     digitalWrite(gpio, ON);
+#    ifdef LED_ACTUATOR_ONOFF
     if (ON == ACTUATOR_ON) {
-      PowerIndicatorON();
+      ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_ACTUATOR_ONOFF_COLOR);
     } else {
-      PowerIndicatorOFF();
+      ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_COLOR_BLACK);
     }
+#    endif
     // we acknowledge the sending by publishing the value to an acknowledgement topic
     char b = ON;
     pub(subjectGTWONOFFtoMQTT, &b);
@@ -233,40 +274,19 @@ void MQTTtoONOFF(char* topicOri, char* datacallback) {
 }
 #  endif
 
-//Check regularly temperature of the ESP32 board and switch OFF the relay if temperature is more than MAX_TEMP_ACTUATOR
-#  ifdef MAX_TEMP_ACTUATOR
-void overLimitTemp(void* pvParameters) {
-#    if defined(ESP32) && !defined(NO_INT_TEMP_READING)
-  for (;;) {
-    static float previousInternalTempc = 0;
-    float internalTempc = intTemperatureRead();
-    Log.trace(F("Internal temperature of the ESP32 %F" CR), internalTempc);
-    // We switch OFF the actuator if the temperature of the ESP32 is more than MAX_TEMP_ACTUATOR two consecutive times, so as to avoid false single readings to trigger the relay OFF.
-    if (internalTempc > MAX_TEMP_ACTUATOR && previousInternalTempc > MAX_TEMP_ACTUATOR) {
-      if (digitalRead(ACTUATOR_ONOFF_GPIO) == ACTUATOR_ON) { // This could be with the previous condition, but it is better to trigger the digitalRead only if the previous condition is met to avoid the digitalRead
-        Log.error(F("[ActuatorONOFF] OverTemperature detected ( %F > %F ) switching OFF Actuator" CR), internalTempc, MAX_TEMP_ACTUATOR);
-        ActuatorTrigger();
-        CriticalIndicatorON();
-      }
-    }
-    previousInternalTempc = internalTempc;
-    vTaskDelay(TimeBetweenReadingIntTemp);
-  }
-#    endif
-}
-#  endif
-
 // Check regularly current the relay and switch it OFF if the current is more than MAX_CURRENT_ACTUATOR
 #  ifdef MAX_CURRENT_ACTUATOR
 void overLimitCurrent(float RN8209current) {
   static float RN8209previousCurrent = 0;
-  Log.trace(F("RN8209 Current %F" CR), RN8209current);
+  THEENGS_LOG_TRACE(F("RN8209 Current %F" CR), RN8209current);
   // We switch OFF the actuator if the current of the RN8209 is more than MAX_CURRENT_ACTUATOR.
   if (RN8209current > MAX_CURRENT_ACTUATOR && RN8209previousCurrent > MAX_CURRENT_ACTUATOR) {
     if (digitalRead(ACTUATOR_ONOFF_GPIO) == ACTUATOR_ON) { // This could be with the previous condition, but it is better to trigger the digitalRead only if the previous condition is met to avoid the digitalRead
-      Log.error(F("[ActuatorONOFF] OverCurrent detected ( %F > %F ) switching OFF Actuator" CR), RN8209current, MAX_CURRENT_ACTUATOR);
+      THEENGS_LOG_ERROR(F("[ActuatorONOFF] OverCurrent detected ( %F > %F ) switching OFF Actuator" CR), RN8209current, MAX_CURRENT_ACTUATOR);
       ActuatorTrigger();
-      CriticalIndicatorON();
+#    ifdef LED_ACTUATOR_ONOFF
+      ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_ERROR_COLOR, -1);
+#    endif
     }
   }
   RN8209previousCurrent = RN8209current;
@@ -282,13 +302,15 @@ void overLimitCurrent(float RN8209current) {}
 */
 void ActuatorTrigger() {
   uint8_t level = !digitalRead(ACTUATOR_ONOFF_GPIO);
-  Log.trace(F("Actuator triggered %d" CR), level);
+  THEENGS_LOG_TRACE(F("Actuator triggered %d" CR), level);
   digitalWrite(ACTUATOR_ONOFF_GPIO, level);
+#  ifdef LED_ACTUATOR_ONOFF
   if (level == ACTUATOR_ON) {
-    PowerIndicatorON();
+    ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_ACTUATOR_ONOFF_COLOR);
   } else {
-    PowerIndicatorOFF();
+    ledManager.setMode(LED_ACTUATOR_ONOFF, 0, LEDManager::Mode::STATIC, LED_COLOR_BLACK);
   }
+#  endif
 
 #  ifdef ESP32
   if (ONOFFConfig.useLastStateOnStart) {
@@ -311,6 +333,6 @@ void stateONOFFMeasures() {
   ONOFFdata["uselaststate"] = ONOFFConfig.useLastStateOnStart;
 #  endif
   ONOFFdata["origin"] = subjectGTWONOFFtoMQTT;
-  handleJsonEnqueue(ONOFFdata, QueueSemaphoreTimeOutTask);
+  enqueueJsonObject(ONOFFdata, QueueSemaphoreTimeOutTask);
 }
 #endif
diff --git a/main/ZactuatorPWM.ino b/main/actuatorPWM.cpp
similarity index 95%
rename from main/ZactuatorPWM.ino
rename to main/actuatorPWM.cpp
index 2efd6fc..f8348e3 100644
--- a/main/ZactuatorPWM.ino
+++ b/main/actuatorPWM.cpp
@@ -1,5 +1,5 @@
 /*
-  OpenMQTTGateway - ESP32, ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
   This actuator enables control over the PWM outputs of microcontrollers.
 
@@ -68,7 +68,7 @@
 #include "User_config.h"
 
 #ifdef ZactuatorPWM
-
+#  include "TheengsCommon.h"
 #  include "config_PWM.h"
 
 static long previousUpdateTime = 0; // milliseconds
@@ -128,15 +128,14 @@ void setupPWM() {
     // Configure the pin for PWM output.
     // I think this is the fastest frequency that allows for a 16-bit
     // duty cycle on an ESP32
-    ledcSetup(i, 625.0, kNumDutyCycleBits);
-    ledcAttachPin(channelPins[i], i);
+    ledcAttachChannel(channelPins[i], 625.0, kNumDutyCycleBits, i);
 #  endif
     calibrationMinLinear[i] = 0.f;
     calibrationMaxLinear[i] = 1.f;
     calibrationGamma[i] = PWM_DEFAULT_GAMMA;
   }
 
-  Log.trace(F("ZactuatorPWM setup done " CR));
+  THEENGS_LOG_TRACE(F("actuatorPWM setup done " CR));
 }
 
 // This applies a power curve to the input to try to make the inputs
@@ -187,18 +186,18 @@ void PWMLoop() {
 #  else
     analogWrite(channelPins[i], dutyCycle);
 #  endif
-    //Log.notice(F("Setting channel %d : %d" CR),i,dutyCycle);
+    //THEENGS_LOG_NOTICE(F("Setting channel %d : %d" CR),i,dutyCycle);
   }
 }
 
-boolean PWMtoMQTT() {
+boolean PWMtoX() {
   return false;
 }
 
 #  if jsonReceiving
-void MQTTtoPWM(char* topicOri, JsonObject& jsonData) {
+void XtoPWM(const char* topicOri, JsonObject& jsonData) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoPWMset)) {
-    Log.trace(F("MQTTtoPWM JSON analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoPWM JSON analysis" CR));
     // Parse the target value for each channel
     int modifiedChannelBits = 0;
     for (int i = 0; i < kNumChannels; ++i) {
diff --git a/main/ZactuatorSomfy.ino b/main/actuatorSomfy.cpp
similarity index 73%
rename from main/ZactuatorSomfy.ino
rename to main/actuatorSomfy.cpp
index 3e5cddd..536d439 100644
--- a/main/ZactuatorSomfy.ino
+++ b/main/actuatorSomfy.cpp
@@ -1,15 +1,15 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
- 
+
   This actor enables to:
  - receive MQTT data from a topic and send Somfy RTS remote control signals corresponding to the received MQTT data
-  
+
     Copyright (C) 2020 Leon Kiefer
 
     This file is part of OpenMQTTGateway.
-    
+
     OpenMQTTGateway 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
@@ -24,44 +24,50 @@
 #include "User_config.h"
 
 #ifdef ZactuatorSomfy
-
 #  include <EEPROM.h>
 #  include <EEPROMRollingCodeStorage.h>
 #  include <SomfyRemote.h>
 
+#  include "config_RF.h"
+#  include "config_Somfy.h"
 #  ifdef ZradioCC1101
 #    include <ELECHOUSE_CC1101_SRC_DRV.h>
 #  endif
 
+void disableCurrentReceiver();
+void enableActiveReceiver();
+void initCC1101();
+void setupSomfy();
+
 void setupSomfy() {
   pinMode(RF_EMITTER_GPIO, OUTPUT);
   digitalWrite(RF_EMITTER_GPIO, LOW);
 
 #  if defined(ESP32)
   if (!EEPROM.begin(max(4, SOMFY_REMOTE_NUM * 2))) {
-    Log.error(F("failed to initialise EEPROM" CR));
+    THEENGS_LOG_ERROR(F("failed to initialise EEPROM" CR));
   }
 #  elif defined(ESP8266)
   EEPROM.begin(max(4, SOMFY_REMOTE_NUM * 2));
 #  endif
 
-  Log.trace(F("ZactuatorSomfy setup done " CR));
+  THEENGS_LOG_TRACE(F("actuatorSomfy setup done " CR));
 }
 
 #  if jsonReceiving
-void MQTTtoSomfy(char* topicOri, JsonObject& jsonData) {
+void XtoSomfy(const char* topicOri, JsonObject& jsonData) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoSomfy)) {
-    Log.trace(F("MQTTtoSomfy json data analysis" CR));
-    float txFrequency = jsonData["frequency"] | RFConfig.frequency;
+    THEENGS_LOG_TRACE(F("MQTTtoSomfy json data analysis" CR));
+    float txFrequency = jsonData["frequency"] | iRFConfig.getFrequency();
 #    ifdef ZradioCC1101 // set Receive off and Transmitt on
     disableCurrentReceiver();
     ELECHOUSE_cc1101.SetTx(txFrequency);
-    Log.notice(F("Transmit frequency: %F" CR), txFrequency);
+    THEENGS_LOG_NOTICE(F("Transmit frequency: %F" CR), txFrequency);
 #    endif
 
     const int remoteIndex = jsonData["remote"];
     if (remoteIndex >= SOMFY_REMOTE_NUM) {
-      Log.warning(F("ZactuatorSomfy remote does not exist" CR));
+      THEENGS_LOG_WARNING(F("actuatorSomfy remote does not exist" CR));
       return;
     }
     const String commandData = jsonData["command"];
diff --git a/main/blufi.cpp b/main/blufi.cpp
new file mode 100644
index 0000000..7b1fef5
--- /dev/null
+++ b/main/blufi.cpp
@@ -0,0 +1,508 @@
+/*
+  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
+   Send and receiving command by MQTT
+
+  This program enables to:
+ - receive MQTT data from a topic and send signal (RF, IR, BLE, GSM)  corresponding to the received MQTT data
+ - publish MQTT data to a different topic related to received signals (RF, IR, BLE, GSM)
+
+  Copyright: (c)Florian ROBERT
+
+    This file is part of OpenMQTTGateway.
+
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+#if defined(ESP32) && defined(USE_BLUFI)
+#  include <PicoMQTT.h>
+#  include <WiFiManager.h>
+
+#  include "NimBLEDevice.h"
+#  include "NimBLEOta.h"
+#  include "TheengsCommon.h"
+#  include "User_config.h"
+#  include "esp_blufi_api.h"
+#  include "esp_mac.h"
+#  include "esp_timer.h"
+#  include "services/gap/ble_svc_gap.h"
+
+extern "C" {
+#  include "esp_blufi.h"
+}
+
+extern void receivingDATA(const char* topicOri, const char* datacallback);
+
+static esp_timer_handle_t connection_timer = nullptr;
+static NimBLEOta* pNimBLEOta;
+static NimBLECharacteristic* pCommandCharacteristic;
+static NimBLECharacteristic* pRecvFwCharacteristic;
+
+#  ifndef BLUFI_MFG_ID
+#    define BLUFI_MFG_ID 0xFFFF // Default Manufacturer ID if not defined
+#  endif
+
+struct pkt_info {
+  uint8_t* pkt;
+  int pkt_len;
+};
+
+#  define DATA_PACKAGE_VALUE       0x02
+#  define DATA_SUBTYPE_CUSTOM_DATA 0x07
+#  define FRAME_CTRL_DEFAULT       0x00 // Assuming no encryption or checksum on notifications for simplicity
+
+uint8_t getTypeValue(uint8_t packageType, uint8_t subType) {
+  return (packageType << 2) | subType;
+}
+
+/* store the station info for send back to phone */
+//static bool gl_sta_connected = false;
+bool omg_blufi_ble_connected = false;
+static uint8_t gl_sta_bssid[6];
+static uint8_t gl_sta_ssid[32];
+static uint8_t gl_sta_passwd[64];
+static int gl_sta_ssid_len;
+static bool gl_sta_is_connecting = false;
+static esp_blufi_extra_info_t gl_sta_conn_info;
+extern bool ethConnected;
+extern bool mqttSetupPending;
+extern std::unique_ptr<PicoMQTT::Client> mqtt;
+extern WiFiManager wifiManager;
+
+static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_param_t* param);
+void wifi_event_handler(arduino_event_id_t event);
+esp_err_t blufi_security_init(void);
+void blufi_dh_negotiate_data_handler(uint8_t* data, int len, uint8_t** output_data, int* output_len, bool* need_free);
+int blufi_aes_encrypt(uint8_t iv8, uint8_t* crypt_data, int crypt_len);
+int blufi_aes_decrypt(uint8_t iv8, uint8_t* crypt_data, int crypt_len);
+uint16_t blufi_crc_checksum(uint8_t iv8, uint8_t* data, int len);
+void blufi_security_deinit(void);
+
+uint8_t getNextSequence() {
+  static uint8_t sequence = 0;
+  return sequence++;
+}
+
+struct ReceivingCommandTaskData {
+  uint8_t* data;
+  uint32_t data_len;
+};
+
+// Task function to handle receivingCommand
+void receivingCommandTask(void* pvParameters) {
+  ReceivingCommandTaskData* taskData = static_cast<ReceivingCommandTaskData*>(pvParameters);
+
+  DynamicJsonDocument json(JSON_MSG_BUFFER_MAX);
+  JsonObject jsonBlufi = json.to<JsonObject>();
+  auto error = deserializeJson(json, taskData->data, taskData->data_len);
+  if (error) {
+    THEENGS_LOG_ERROR(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
+  } else {
+    if (jsonBlufi.containsKey("target") && jsonBlufi["target"].is<char*>()) {
+      char topic[(parameters_size) * 2 + jsonBlufi["target"].size() + 1];
+      snprintf(topic, sizeof(topic), "%s%s%s", mqtt_topic, gateway_name, jsonBlufi["target"].as<const char*>());
+      jsonBlufi.remove("target");
+      char jsonStr[JSON_MSG_BUFFER_MAX];
+      serializeJson(jsonBlufi, jsonStr);
+      receivingDATA(topic, jsonStr);
+    } else {
+      THEENGS_LOG_NOTICE(F("No target found in the received command using SYS target, default index and save command" CR));
+      if (!json.containsKey("cnt_index")) {
+        json["cnt_index"] = CNT_DEFAULT_INDEX;
+        json["save_cnt"] = true;
+      }
+      char topic[(parameters_size) * 2 + strlen(subjectMQTTtoSYSset) + 1];
+      snprintf(topic, sizeof(topic), "%s%s%s", mqtt_topic, gateway_name, subjectMQTTtoSYSset);
+      char jsonStr[JSON_MSG_BUFFER_MAX];
+      serializeJson(jsonBlufi, jsonStr);
+      receivingDATA(topic, jsonStr);
+    }
+  }
+
+  // Clean up dynamically allocated memory, if any
+  if (taskData->data) {
+    free(taskData->data);
+  }
+  delete taskData;
+
+  // Delete the task when finished
+  vTaskDelete(NULL);
+}
+
+// We create a task to remove the load from the Bluetooth task
+void createReceivingCommandTask(uint8_t* data, uint32_t data_len) {
+  // Allocate memory for task data and copy over the data
+  ReceivingCommandTaskData* taskData = new ReceivingCommandTaskData;
+  taskData->data = static_cast<uint8_t*>(malloc(data_len));
+  memcpy(taskData->data, data, data_len);
+  taskData->data_len = data_len;
+
+  // Create the task
+  xTaskCreate(receivingCommandTask, "ReceivingCmdTask", 10000, taskData, 5, NULL);
+}
+
+void sendCustomDataNotification(const char* message) {
+  if (!omg_blufi_ble_connected) {
+    return;
+  }
+  size_t messageLength = strlen(message);
+  uint8_t notification[messageLength + 4];
+  notification[0] = getTypeValue(DATA_PACKAGE_VALUE, DATA_SUBTYPE_CUSTOM_DATA);
+  notification[1] = FRAME_CTRL_DEFAULT;
+  notification[2] = getNextSequence();
+  notification[3] = static_cast<uint8_t>(messageLength);
+  memcpy(&notification[4], message, messageLength);
+  esp_blufi_send_custom_data(notification, sizeof(notification));
+}
+
+#  ifdef BT_CONNECTION_TIMEOUT_MS
+void connection_timeout_callback(void* arg) {
+  if (omg_blufi_ble_connected) {
+    THEENGS_LOG_NOTICE(F("BluFi connection timeout reached. Disconnecting." CR));
+    esp_blufi_disconnect();
+    omg_blufi_ble_connected = false;
+  }
+}
+
+void restart_connection_timer() {
+  if (connection_timer == nullptr) {
+    esp_timer_create_args_t timer_args = {
+        .callback = connection_timeout_callback,
+        .arg = NULL,
+        .name = "blufi_connection_timer"};
+    esp_timer_create(&timer_args, &connection_timer);
+  }
+
+  esp_timer_stop(connection_timer); // Stop the timer if it's running
+  esp_err_t ret = esp_timer_start_once(connection_timer, BT_CONNECTION_TIMEOUT_MS * 1000);
+  if (ret != ESP_OK) {
+    THEENGS_LOG_ERROR(F("Failed to start connection timer: %d" CR), ret);
+  }
+}
+
+void stop_connection_timer() {
+  if (connection_timer != nullptr) {
+    esp_timer_stop(connection_timer);
+  }
+}
+#  else
+void restart_connection_timer() {}
+void stop_connection_timer() {}
+#  endif
+
+void set_blufi_mfg_data() {
+  if (!NimBLEDevice::isInitialized() || !NimBLEDevice::getAdvertising()->isAdvertising()) {
+    THEENGS_LOG_NOTICE(F("Unable to set advertising data" CR));
+    return;
+  }
+  ble_hs_adv_fields fields;
+  ble_uuid16_t blufi_uuid = BLE_UUID16_INIT(BLUFI_APP_UUID);
+  memset(&fields, 0, sizeof(fields));
+  fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP;
+  const char* name = ble_svc_gap_device_name();
+  fields.name = (uint8_t*)name;
+  fields.name_len = strlen(name);
+  fields.name_is_complete = true;
+  fields.uuids16 = &blufi_uuid;
+  fields.num_uuids16 = 1;
+  fields.uuids16_is_complete = true;
+  uint8_t omg_blufi_mfg_data[] = {BLUFI_MFG_ID & 0xFF, (BLUFI_MFG_ID >> 8) & 0xFF, 'O', gatewayState};
+  fields.mfg_data = omg_blufi_mfg_data;
+  fields.mfg_data_len = sizeof(omg_blufi_mfg_data);
+  auto rc = ble_gap_adv_set_fields(&fields);
+  if (rc != 0) {
+    THEENGS_LOG_ERROR(F("Failed to set BLE advertising fields: %d" CR), rc);
+  } else {
+    THEENGS_LOG_TRACE(F("BLE advertising fields set successfully" CR));
+  }
+}
+
+void start_blufi_advertising() {
+  esp_blufi_adv_start();
+  set_blufi_mfg_data();
+}
+
+static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_param_t* param) {
+  /* actually, should post to blufi_task handle the procedure,
+     * now, as a example, we do it more simply */
+  ble_gap_conn_desc desc;
+
+  switch (event) {
+    case ESP_BLUFI_EVENT_INIT_FINISH: {
+      THEENGS_LOG_TRACE(F("BLUFI init finish" CR));
+      start_blufi_advertising();
+      break;
+    }
+    case ESP_BLUFI_EVENT_DEINIT_FINISH:
+      THEENGS_LOG_TRACE(F("BLUFI deinit finish" CR));
+      NimBLEDevice::deinit(true);
+      if (connection_timer != nullptr) {
+        esp_timer_delete(connection_timer);
+        connection_timer = nullptr;
+      }
+      break;
+    case ESP_BLUFI_EVENT_BLE_CONNECT:
+      THEENGS_LOG_TRACE(F("BLUFI BLE connect" CR));
+      gatewayState = GatewayState::ONBOARDING;
+      omg_blufi_ble_connected = true;
+      restart_connection_timer();
+      ble_gap_conn_find(param->connect.conn_id, &desc);
+      // Blufi dosn't provide a callback for subscribe so we emulate it here.
+      pCommandCharacteristic->getCallbacks()->onSubscribe(pCommandCharacteristic, *(NimBLEConnInfo*)&desc, 2);
+      pRecvFwCharacteristic->getCallbacks()->onSubscribe(pRecvFwCharacteristic, *(NimBLEConnInfo*)&desc, 2);
+      esp_blufi_adv_stop();
+      blufi_security_init();
+      break;
+    case ESP_BLUFI_EVENT_BLE_DISCONNECT:
+      THEENGS_LOG_TRACE(F("BLUFI BLE disconnect" CR));
+      omg_blufi_ble_connected = false;
+      stop_connection_timer();
+      if (mqtt && mqtt->connected()) {
+        gatewayState = GatewayState::BROKER_CONNECTED;
+      } else if (ethConnected || WiFi.status() == WL_CONNECTED) {
+        gatewayState = GatewayState::NTWK_CONNECTED;
+      } else if (mqttSetupPending) {
+        gatewayState = GatewayState::WAITING_ONBOARDING;
+      } else {
+        gatewayState = GatewayState::OFFLINE;
+      }
+      ble_gap_conn_find(param->connect.conn_id, &desc);
+      pCommandCharacteristic->getCallbacks()->onSubscribe(pCommandCharacteristic, *(NimBLEConnInfo*)&desc, 0);
+      pRecvFwCharacteristic->getCallbacks()->onSubscribe(pRecvFwCharacteristic, *(NimBLEConnInfo*)&desc, 0);
+      blufi_security_deinit();
+      start_blufi_advertising();
+      break;
+    case ESP_BLUFI_EVENT_REQ_CONNECT_TO_AP:
+      THEENGS_LOG_TRACE(F("BLUFI request wifi connect to AP" CR));
+      WiFi.begin((char*)gl_sta_ssid, (char*)gl_sta_passwd);
+      gl_sta_is_connecting = true;
+      break;
+    case ESP_BLUFI_EVENT_REQ_DISCONNECT_FROM_AP:
+      THEENGS_LOG_TRACE(F("BLUFI request wifi disconnect from AP\n" CR));
+      WiFi.disconnect();
+      break;
+    case ESP_BLUFI_EVENT_REPORT_ERROR:
+      THEENGS_LOG_TRACE(F("BLUFI report error, error code %d\n" CR), param->report_error.state);
+      esp_blufi_send_error_info(param->report_error.state);
+      break;
+    case ESP_BLUFI_EVENT_GET_WIFI_STATUS: {
+      esp_blufi_extra_info_t info;
+      THEENGS_LOG_TRACE(F("BLUFI get wifi status" CR));
+      if (gl_sta_ssid_len > 0 && gl_sta_ssid[0] != '\0') {
+        THEENGS_LOG_TRACE(F("SSID exists" CR));
+        memset(&info, 0, sizeof(esp_blufi_extra_info_t));
+        if (memcmp(gl_sta_bssid, "\0\0\0\0\0\0", 6) != 0) {
+          memcpy(info.sta_bssid, gl_sta_bssid, 6);
+          info.sta_bssid_set = true;
+        }
+        info.sta_ssid = gl_sta_ssid;
+        info.sta_ssid_len = gl_sta_ssid_len;
+        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONN_SUCCESS, 0, &info);
+      } else if (gl_sta_is_connecting) {
+        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONNECTING, 0, &gl_sta_conn_info);
+      } else {
+        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONN_FAIL, 0, &gl_sta_conn_info);
+      }
+
+      break;
+    }
+    case ESP_BLUFI_EVENT_RECV_SLAVE_DISCONNECT_BLE:
+      THEENGS_LOG_TRACE(F("BLUFI recv slave disconnect a ble connection" CR));
+      esp_blufi_disconnect();
+      break;
+    case ESP_BLUFI_EVENT_RECV_STA_SSID: {
+      // ssid_len comes from an unauthenticated BLE provisioning frame; clamp it
+      // before the strncpy and the trailing NUL so a crafted long SSID cannot
+      // write past gl_sta_ssid.
+      size_t ssid_len = param->sta_ssid.ssid_len;
+      if (ssid_len > sizeof(gl_sta_ssid) - 1)
+        ssid_len = sizeof(gl_sta_ssid) - 1;
+      memcpy(gl_sta_ssid, param->sta_ssid.ssid, ssid_len);
+      gl_sta_ssid[ssid_len] = '\0';
+      THEENGS_LOG_NOTICE(F("Recv STA SSID %s" CR), gl_sta_ssid);
+      break;
+    }
+    case ESP_BLUFI_EVENT_RECV_STA_PASSWD: {
+      size_t passwd_len = param->sta_passwd.passwd_len;
+      if (passwd_len > sizeof(gl_sta_passwd) - 1)
+        passwd_len = sizeof(gl_sta_passwd) - 1;
+      memcpy(gl_sta_passwd, param->sta_passwd.passwd, passwd_len);
+      gl_sta_passwd[passwd_len] = '\0';
+      THEENGS_LOG_NOTICE(F("Recv STA PASSWORD" CR));
+      break;
+    }
+    case ESP_BLUFI_EVENT_GET_WIFI_LIST: {
+      WiFi.scanNetworks(true);
+      break;
+    }
+    case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA: {
+      THEENGS_LOG_NOTICE(F("Recv Custom Data %" PRIu32 CR), param->custom_data.data_len);
+      esp_log_buffer_hex("Custom Data", param->custom_data.data, param->custom_data.data_len);
+      createReceivingCommandTask(param->custom_data.data, param->custom_data.data_len);
+      break;
+    }
+    case ESP_BLUFI_EVENT_RECV_USERNAME:
+      break;
+    case ESP_BLUFI_EVENT_RECV_CA_CERT:
+      break;
+    case ESP_BLUFI_EVENT_RECV_CLIENT_CERT:
+      break;
+    case ESP_BLUFI_EVENT_RECV_SERVER_CERT:
+      break;
+    case ESP_BLUFI_EVENT_RECV_CLIENT_PRIV_KEY:
+      break;
+      ;
+    case ESP_BLUFI_EVENT_RECV_SERVER_PRIV_KEY:
+      break;
+    default:
+      break;
+  }
+}
+
+void wifi_event_handler(arduino_event_id_t event) {
+  switch (event) {
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP: {
+      gatewayState = GatewayState::NTWK_CONNECTED;
+#  ifndef ESPWifiManualSetup
+      wifiManager.stopConfigPortal();
+#  endif
+      gl_sta_is_connecting = false;
+      esp_blufi_extra_info_t info = {};
+      const String current_ssid = WiFi.SSID();
+      gl_sta_ssid_len = std::min<uint32_t>(current_ssid.length(), sizeof(gl_sta_ssid) - 1);
+      std::copy_n(current_ssid.c_str(), gl_sta_ssid_len, gl_sta_ssid);
+      gl_sta_ssid[gl_sta_ssid_len] = '\0';
+      uint8_t* bssid = WiFi.BSSID();
+      if (bssid) {
+        std::copy_n(bssid, 6, gl_sta_bssid);
+      }
+      info.sta_bssid_set = true;
+      info.sta_ssid = gl_sta_ssid;
+      info.sta_ssid_len = gl_sta_ssid_len;
+      std::copy_n(gl_sta_bssid, 6, info.sta_bssid);
+      if (omg_blufi_ble_connected == true) {
+        esp_blufi_send_wifi_conn_report(WIFI_MODE_STA, ESP_BLUFI_STA_CONN_SUCCESS, 0, &info);
+      }
+      THEENGS_LOG_NOTICE(F("Connected to SSID: %s" CR), gl_sta_ssid);
+      break;
+    }
+    case ARDUINO_EVENT_WIFI_SCAN_DONE: {
+      uint16_t apCount = WiFi.scanComplete();
+      if (apCount == 0) {
+        THEENGS_LOG_ERROR(F("No AP found" CR));
+        break;
+      }
+      THEENGS_LOG_TRACE(F("AP found, count: %d" CR), apCount);
+      esp_blufi_ap_record_t* blufi_ap_list = (esp_blufi_ap_record_t*)malloc(apCount * sizeof(esp_blufi_ap_record_t));
+      if (!blufi_ap_list) {
+        THEENGS_LOG_ERROR(F("Failed to allocate memory for AP list" CR));
+        break;
+      }
+      for (int i = 0; i < apCount; ++i) {
+        THEENGS_LOG_NOTICE(F("%d: %s, Ch:%d (%ddBm)" CR), i + 1, WiFi.SSID(i).c_str(), WiFi.channel(i), WiFi.RSSI(i));
+        blufi_ap_list[i].rssi = WiFi.RSSI(i);
+        size_t ssidLength = strlen(WiFi.SSID(i).c_str());
+        if (ssidLength > sizeof(blufi_ap_list[i].ssid) - 1) {
+          ssidLength = sizeof(blufi_ap_list[i].ssid) - 1;
+        }
+        memcpy(blufi_ap_list[i].ssid, WiFi.SSID(i).c_str(), ssidLength);
+        blufi_ap_list[i].ssid[ssidLength] = '\0';
+      }
+      if (omg_blufi_ble_connected == true) {
+        if (esp_blufi_send_wifi_list(apCount, blufi_ap_list) != ESP_OK) {
+          THEENGS_LOG_ERROR(F("Failed to send WiFi list" CR));
+        }
+      }
+      free(blufi_ap_list);
+      break;
+    }
+    default:
+      break;
+  }
+  return;
+}
+
+static esp_blufi_callbacks_t example_callbacks = {
+    .event_cb = example_event_callback,
+    .negotiate_data_handler = blufi_dh_negotiate_data_handler,
+    .encrypt_func = blufi_aes_encrypt,
+    .decrypt_func = blufi_aes_decrypt,
+    .checksum_func = blufi_crc_checksum,
+};
+
+bool isBlufiConnected() {
+  return omg_blufi_ble_connected;
+}
+
+bool isStaConnecting() {
+  return gl_sta_is_connecting;
+}
+
+bool startBlufi() {
+  esp_err_t ret = ESP_OK;
+  WiFi.onEvent(wifi_event_handler);
+
+  ret = esp_blufi_register_callbacks(&example_callbacks);
+  if (ret) {
+    THEENGS_LOG_ERROR(F("%s blufi register failed, error code = %x" CR), __func__, ret);
+    return false;
+  }
+
+  if (NimBLEDevice::isInitialized()) {
+    NimBLEDevice::deinit(true);
+    delay(50);
+  }
+  esp_blufi_btc_init();
+  uint8_t mac[6];
+  esp_read_mac(mac, ESP_MAC_WIFI_STA);
+  char advName[17] = {0};
+  // Check length of Gateway_Short_Name
+  if (strlen(Gateway_Short_Name) > 3) {
+    THEENGS_LOG_ERROR(F("Gateway_Short_Name is too long, max 3 characters" CR));
+    return false;
+  }
+  snprintf(advName, sizeof(advName), Gateway_Short_Name "_%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+  NimBLEDevice::init(advName);
+  NimBLEDevice::setMTU(517);
+  NimBLEDevice::createServer(); // this initializes the GATT server so we need to reset it for blufi to init
+  ble_gatts_reset();
+  esp_blufi_gatt_svr_init();
+  pNimBLEOta = new NimBLEOta();
+  NimBLEService* pNimBLEOtaSvc = pNimBLEOta->start();
+  pCommandCharacteristic = pNimBLEOtaSvc->getCharacteristic(NimBLEUUID((uint16_t)0x8022));
+  pRecvFwCharacteristic = pNimBLEOtaSvc->getCharacteristic(NimBLEUUID((uint16_t)0x8020));
+  ble_gatts_start();
+  THEENGS_LOG_NOTICE(F("BLUFI started" CR));
+  return esp_blufi_profile_init() == ESP_OK;
+}
+
+bool stopBlufi() {
+  esp_err_t result = ESP_OK;
+  if (omg_blufi_ble_connected) {
+    esp_blufi_disconnect();
+    delay(50);
+  }
+
+  ble_gap_adv_stop();
+  result = esp_blufi_profile_deinit();
+  if (result != ESP_OK) {
+    THEENGS_LOG_ERROR(F("Failed to deinit blufi profile: %d" CR), result);
+    return false;
+  }
+  THEENGS_LOG_NOTICE(F("BLUFI stopped" CR));
+  return true;
+}
+
+#endif // defined(ESP32) && defined(USE_BLUFI)
\ No newline at end of file
diff --git a/main/ZblufiSec.ino b/main/blufiSec.cpp
similarity index 74%
rename from main/ZblufiSec.ino
rename to main/blufiSec.cpp
index 7f4cbc4..0ac90c1 100644
--- a/main/ZblufiSec.ino
+++ b/main/blufiSec.cpp
@@ -6,8 +6,12 @@
 
 #if defined(ESP32) && defined(USE_BLUFI)
 
+#  include <ArduinoLog.h>
+
+#  include "User_config.h"
 #  include "esp_blufi_api.h"
 #  include "esp_crc.h"
+#  include "esp_random.h"
 #  include "mbedtls/aes.h"
 #  include "mbedtls/dhm.h"
 #  include "mbedtls/md5.h"
@@ -48,11 +52,17 @@ static int myrand(void* rng_state, unsigned char* output, size_t len) {
 extern "C" void btc_blufi_report_error(esp_blufi_error_state_t state);
 
 void blufi_dh_negotiate_data_handler(uint8_t* data, int len, uint8_t** output_data, int* output_len, bool* need_free) {
+  if (data == NULL || len < 3) {
+    THEENGS_LOG_ERROR(F("BLUFI Invalid data format" CR));
+    btc_blufi_report_error(ESP_BLUFI_DATA_FORMAT_ERROR);
+    return;
+  }
+
   int ret;
   uint8_t type = data[0];
 
   if (blufi_sec == NULL) {
-    Log.error(F("BLUFI Security is not initialized" CR));
+    THEENGS_LOG_ERROR(F("BLUFI Security is not initialized" CR));
     btc_blufi_report_error(ESP_BLUFI_INIT_SECURITY_ERROR);
     return;
   }
@@ -66,31 +76,47 @@ void blufi_dh_negotiate_data_handler(uint8_t* data, int len, uint8_t** output_da
       }
       blufi_sec->dh_param = (uint8_t*)malloc(blufi_sec->dh_param_len);
       if (blufi_sec->dh_param == NULL) {
+        blufi_sec->dh_param_len = 0; /* Reset length to avoid using unallocated memory */
         btc_blufi_report_error(ESP_BLUFI_DH_MALLOC_ERROR);
-        Log.error(F("%s, malloc failed\n" CR), __func__);
+        THEENGS_LOG_ERROR(F("%s, malloc failed\n" CR), __func__);
         return;
       }
       break;
     case SEC_TYPE_DH_PARAM_DATA: {
       if (blufi_sec->dh_param == NULL) {
-        Log.error(F("%s, blufi_sec->dh_param == NULL" CR), __func__);
+        THEENGS_LOG_ERROR(F("%s, blufi_sec->dh_param == NULL" CR), __func__);
         btc_blufi_report_error(ESP_BLUFI_DH_PARAM_ERROR);
         return;
       }
+
+      if (len < (blufi_sec->dh_param_len + 1)) {
+        THEENGS_LOG_ERROR(F("%s, invalid dh param len" CR), __func__);
+        btc_blufi_report_error(ESP_BLUFI_DH_PARAM_ERROR);
+        return;
+      }
+
       uint8_t* param = blufi_sec->dh_param;
       memcpy(blufi_sec->dh_param, &data[1], blufi_sec->dh_param_len);
       ret = mbedtls_dhm_read_params(&blufi_sec->dhm, &param, &param[blufi_sec->dh_param_len]);
       if (ret) {
-        Log.error(F("%s read param failed %d" CR), __func__, ret);
+        THEENGS_LOG_ERROR(F("%s read param failed %d" CR), __func__, ret);
         btc_blufi_report_error(ESP_BLUFI_READ_PARAM_ERROR);
         return;
       }
       free(blufi_sec->dh_param);
       blufi_sec->dh_param = NULL;
 
-      ret = mbedtls_dhm_make_public(&blufi_sec->dhm, (int)mbedtls_mpi_size(&blufi_sec->dhm.P), blufi_sec->self_public_key, blufi_sec->dhm.len, myrand, NULL);
+      const int dhm_len = mbedtls_dhm_get_len(&blufi_sec->dhm);
+
+      if (dhm_len > DH_SELF_PUB_KEY_LEN) {
+        THEENGS_LOG_ERROR(F("%s dhm len not support %d" CR), __func__, dhm_len);
+        btc_blufi_report_error(ESP_BLUFI_DH_PARAM_ERROR);
+        return;
+      }
+
+      ret = mbedtls_dhm_make_public(&blufi_sec->dhm, dhm_len, blufi_sec->self_public_key, DH_SELF_PUB_KEY_LEN, myrand, NULL);
       if (ret) {
-        Log.error(F("%s make public failed %d" CR), __func__, ret);
+        THEENGS_LOG_ERROR(F("%s make public failed %d" CR), __func__, ret);
         btc_blufi_report_error(ESP_BLUFI_MAKE_PUBLIC_ERROR);
         return;
       }
@@ -101,18 +127,24 @@ void blufi_dh_negotiate_data_handler(uint8_t* data, int len, uint8_t** output_da
                                     &blufi_sec->share_len,
                                     myrand, NULL);
       if (ret) {
-        Log.error(F("%s mbedtls_dhm_calc_secret failed %d" CR), __func__, ret);
+        THEENGS_LOG_ERROR(F("%s mbedtls_dhm_calc_secret failed %d" CR), __func__, ret);
         btc_blufi_report_error(ESP_BLUFI_DH_PARAM_ERROR);
         return;
       }
 
-      mbedtls_md5(blufi_sec->share_key, blufi_sec->share_len, blufi_sec->psk);
+      ret = mbedtls_md5(blufi_sec->share_key, blufi_sec->share_len, blufi_sec->psk);
 
-      mbedtls_aes_setkey_enc(&blufi_sec->aes, blufi_sec->psk, 128);
+      if (ret) {
+        THEENGS_LOG_ERROR(F("%s mbedtls_md5 failed %d" CR), __func__, ret);
+        btc_blufi_report_error(ESP_BLUFI_CALC_MD5_ERROR);
+        return;
+      }
+
+      mbedtls_aes_setkey_enc(&blufi_sec->aes, blufi_sec->psk, PSK_LEN * 8);
 
       /* alloc output data */
       *output_data = &blufi_sec->self_public_key[0];
-      *output_len = blufi_sec->dhm.len;
+      *output_len = dhm_len;
       *need_free = false;
 
     } break;
diff --git a/main/ZboardM5.ino b/main/boardM5.cpp
similarity index 63%
rename from main/ZboardM5.ino
rename to main/boardM5.cpp
index d7348c4..f8d8862 100644
--- a/main/ZboardM5.ino
+++ b/main/boardM5.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     M5 boards management
@@ -29,76 +29,55 @@
 #include "User_config.h"
 
 #if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
-#  ifdef ZboardM5STICKC
-#    include <M5StickC.h>
-#  endif
-#  ifdef ZboardM5STICKCP
-#    include <M5StickCPlus.h>
-#  endif
-#  ifdef ZboardM5STACK
-#    include <M5Stack.h>
-#  endif
-#  ifdef ZboardM5TOUGH
-#    include <M5Tough.h>
-#  endif
+#  include "TheengsCommon.h"
+#  include "config_M5.h" // pulls in <M5Unified.h> for every M5 board
+
+void wakeScreen(int brightness);
+void displayIntro(int i, int X, int Y);
+void drawLogo(int logoSize, int circle1X, int circle1Y, bool circle1, bool circle2, bool circle3, bool circle4, bool circle5, bool circle6);
+void sleepScreen();
+void setBrightness(int brightness);
+
 void logToLCD(bool display) {
   display ? Log.begin(LOG_LEVEL_LCD, &M5.Lcd) : Log.begin(LOG_LEVEL, &Serial); // Log on LCD following LOG_LEVEL_LCD
 }
 
 void setBrightness(int brightness) {
-#  if defined(ZboardM5STACK)
-  M5.Lcd.setBrightness(brightness * 2);
-#  endif
-#  if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-  (!brightness) ? M5.Axp.ScreenBreath(0) : M5.Axp.ScreenBreath(7 + (int)brightness * 0.08);
-#  endif
+  // M5Unified drives the backlight uniformly across Core (direct control) and
+  // the AXP-powered boards (Stick C/CP, Tough), replacing the old per-board
+  // M5.Lcd.setBrightness / M5.Axp.ScreenBreath split. Map the 0..100 OMG scale
+  // onto the panel's 0..255 range (100 -> 200, sleep 2 -> 4).
+  M5.Display.setBrightness(brightness * 2);
 }
 
 void setupM5() {
-  Log.notice(F("Setup M5" CR));
+  THEENGS_LOG_NOTICE(F("Setup M5" CR));
+  M5.begin(); // auto-detects the board, initialises the display and power
   pinMode(SLEEP_BUTTON, INPUT);
   // M5 stack 320*240
   // M5StickC 160*80
   // M5Stick LCD not supported
-  Log.notice(F("Low power set to: %d" CR), lowpowermode);
-  switch (lowpowermode) // if LOW POWER the intro is bypassed and the brightness set to sleep brightness
-  {
-    case 0:
-      wakeScreen(NORMAL_LCD_BRIGHTNESS);
-      M5.Lcd.fillScreen(WHITE);
-      displayIntro(M5.Lcd.width() * 0.25, (M5.Lcd.width() / 2) + M5.Lcd.width() * 0.12, (M5.Lcd.height() / 2) + M5.Lcd.height() * 0.2);
+  wakeScreen(NORMAL_LCD_BRIGHTNESS);
+  M5.Lcd.fillScreen(TFT_WHITE);
+  displayIntro(M5.Lcd.width() * 0.25, (M5.Lcd.width() / 2) + M5.Lcd.width() * 0.12, (M5.Lcd.height() / 2) + M5.Lcd.height() * 0.2);
 #  if LOG_TO_LCD
-      Log.begin(LOG_LEVEL_LCD, &M5.Lcd); // Log on LCD following LOG_LEVEL_LCD
+  Log.begin(LOG_LEVEL_LCD, &M5.Lcd); // Log on LCD following LOG_LEVEL_LCD
 #  endif
-      break;
-    case 1:
-      wakeScreen(SLEEP_LCD_BRIGHTNESS);
-      M5.Lcd.fillScreen(WHITE);
-#  if LOG_TO_LCD
-      Log.begin(LOG_LEVEL_LCD, &M5.Lcd); // Log on LCD following LOG_LEVEL_LCD
-#  endif
-      break;
-    case 2:
-      M5.begin(false, false, false);
-      break;
-  }
-  Log.notice(F("Setup M5 end" CR));
+
+  THEENGS_LOG_NOTICE(F("Setup M5 end" CR));
 }
 
 void sleepScreen() {
-  Log.trace(F("Screen going to sleep" CR));
-#  if defined(ZboardM5STACK)
-  M5.begin(false, false, false); // M5.lcd.sleep() provokes a reset of the ESP
-#  endif
-#  if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-  M5.Axp.ScreenBreath(0);
-  M5.Axp.SetLDO2(false);
-#  endif
+  THEENGS_LOG_TRACE(F("Screen going to sleep" CR));
+  // Backlight off + panel sleep. M5Unified routes this to the AXP LDO on
+  // Stick/Tough and to the Core's backlight control, so the old M5.begin()
+  // re-init workaround and the M5.Axp calls are no longer needed.
+  M5.Display.sleep();
 }
 
 void wakeScreen(int brightness) {
-  Log.trace(F("Screen wake up" CR));
-  M5.begin();
+  THEENGS_LOG_TRACE(F("Screen wake up" CR));
+  M5.Display.wakeup(); // undo sleepScreen(); harmless if already awake
   M5.Lcd.setCursor(0, 0, (M5.Lcd.height() > 200) ? 4 : 2);
   M5.Lcd.setTextSize(1);
   M5.Lcd.setRotation(1);
@@ -106,17 +85,9 @@ void wakeScreen(int brightness) {
 }
 
 void loopM5() {
-  static int previousBtnState;
-  int currentBtnState = digitalRead(SLEEP_BUTTON);
-  if (currentBtnState != previousBtnState && currentBtnState == 0) {
-    int newlowpowermode = lowpowermode;
-    (lowpowermode == 2) ? newlowpowermode = 0 : newlowpowermode = newlowpowermode + 1;
-    changelowpowermode(newlowpowermode);
-  }
-  previousBtnState = currentBtnState;
   static int previousLogLevel;
   int currentLogLevel = Log.getLastMsgLevel();
-  if (previousLogLevel != currentLogLevel && lowpowermode != 2) {
+  if (previousLogLevel != currentLogLevel) {
     switch (currentLogLevel) {
       case 1:
       case 2:
@@ -139,20 +110,20 @@ void loopM5() {
   previousLogLevel = currentLogLevel;
 }
 
-void MQTTtoM5(char* topicOri, JsonObject& M5data) { // json object decoding
+void XtoM5(const char* topicOri, JsonObject& M5data) { // json object decoding
   if (cmpToMainTopic(topicOri, subjectMQTTtoM5set)) {
-    Log.trace(F("MQTTtoM5 json set" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoM5 json set" CR));
     // Log display set between M5 lcd (true) and serial monitor (false)
     if (M5data.containsKey("log-lcd")) {
       bool displayOnLCD = M5data["log-lcd"];
-      Log.notice(F("Set lcd log: %T" CR), displayOnLCD);
+      THEENGS_LOG_NOTICE(F("Set lcd log: %T" CR), displayOnLCD);
       logToLCD(displayOnLCD);
     }
   }
 }
 
 void displayIntro(int i, int X, int Y) {
-  Log.trace(F("Intro display on screen" CR));
+  THEENGS_LOG_TRACE(F("Intro display on screen" CR));
   drawLogo(i, X, Y, false, true, false, false, false, false);
   delay(50);
   drawLogo(i, X, Y, false, false, true, false, false, false);
@@ -181,52 +152,50 @@ void drawLogo(int logoSize, int circle1X, int circle1Y, bool circle1, bool circl
   int circle2Y = circle1Y - (logoSize * 0.8);
 
   if (line1) {
-    M5.Lcd.drawLine(circle1X - 2, circle1Y, circle2X - 2, circle2Y, BLUE);
-    M5.Lcd.drawLine(circle1X - 1, circle1Y, circle2X - 1, circle2Y, BLUE);
-    M5.Lcd.drawLine(circle1X, circle1Y, circle2X, circle2Y, BLUE);
-    M5.Lcd.drawLine(circle1X + 1, circle1Y, circle2X + 1, circle2Y, BLUE);
-    M5.Lcd.drawLine(circle1X + 2, circle1Y, circle2X + 2, circle2Y, BLUE);
-    M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T * 2, WHITE);
+    M5.Lcd.drawLine(circle1X - 2, circle1Y, circle2X - 2, circle2Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X - 1, circle1Y, circle2X - 1, circle2Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X, circle1Y, circle2X, circle2Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X + 1, circle1Y, circle2X + 1, circle2Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X + 2, circle1Y, circle2X + 2, circle2Y, TFT_BLUE);
+    M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T * 2, TFT_WHITE);
   }
   if (line2) {
-    M5.Lcd.drawLine(circle1X - 2, circle1Y, circle3X - 2, circle3Y, BLUE);
-    M5.Lcd.drawLine(circle1X - 1, circle1Y, circle3X - 1, circle3Y, BLUE);
-    M5.Lcd.drawLine(circle1X, circle1Y, circle3X, circle3Y, BLUE);
-    M5.Lcd.drawLine(circle1X + 1, circle1Y, circle3X + 1, circle3Y, BLUE);
-    M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T * 2, WHITE);
+    M5.Lcd.drawLine(circle1X - 2, circle1Y, circle3X - 2, circle3Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X - 1, circle1Y, circle3X - 1, circle3Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X, circle1Y, circle3X, circle3Y, TFT_BLUE);
+    M5.Lcd.drawLine(circle1X + 1, circle1Y, circle3X + 1, circle3Y, TFT_BLUE);
+    M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T * 2, TFT_WHITE);
   }
-  M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T * 2, WHITE);
+  M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T * 2, TFT_WHITE);
   if (circle1) {
-    M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2, WHITE);
+    M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2, TFT_WHITE);
     M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T, TFT_GREEN);
-    M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T * 2, WHITE);
+    M5.Lcd.fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T * 2, TFT_WHITE);
   }
   if (circle2) {
-    M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3, WHITE);
+    M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3, TFT_WHITE);
     M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T, TFT_ORANGE);
-    M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T * 2, WHITE);
+    M5.Lcd.fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T * 2, TFT_WHITE);
   }
   if (circle3) {
-    M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4, WHITE);
+    M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4, TFT_WHITE);
     M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T, TFT_PINK);
-    M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T * 2, WHITE);
+    M5.Lcd.fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T * 2, TFT_WHITE);
   }
   if (name) {
-    M5.Lcd.setTextColor(BLUE);
+    M5.Lcd.setTextColor(TFT_BLUE);
     M5.Lcd.drawString("penMQTTGateway", circle1X + (circle1X * 0.27), circle1Y, (M5.Lcd.height() > 200) ? 4 : 2);
   }
 }
 
 void M5Print(char* line1, char* line2, char* line3) {
-  if (lowpowermode == 2) InfoIndicatorON();
   wakeScreen(NORMAL_LCD_BRIGHTNESS);
   M5.Lcd.fillScreen(TFT_WHITE);
   drawLogo(M5.Lcd.width() * 0.1875, (M5.Lcd.width() / 2) - M5.Lcd.width() * 0.24, M5.Lcd.height() * 0.5, true, true, true, true, true, true);
-  M5.Lcd.setTextColor(BLUE);
+  M5.Lcd.setTextColor(TFT_BLUE);
   M5.Lcd.drawString(line1, 5, M5.Lcd.height() * 0.7, 1);
   M5.Lcd.drawString(line2, 5, M5.Lcd.height() * 0.8, 1);
   M5.Lcd.drawString(line3, 5, M5.Lcd.height() * 0.9, 1);
   delay(2000);
-  InfoIndicatorOFF(); // to switch off no need of condition
 }
 #endif
diff --git a/main/boardTheengs.cpp b/main/boardTheengs.cpp
new file mode 100644
index 0000000..f30aec9
--- /dev/null
+++ b/main/boardTheengs.cpp
@@ -0,0 +1,99 @@
+#if SELF_TEST
+#  include <Arduino.h>
+#  include <ETH.h>
+#  include <LEDManager.h>
+#  include <WiFi.h>
+#  include <esp_chip_info.h>
+#  include <esp_system.h>
+
+#  include "TheengsCommon.h"
+#  include "User_config.h"
+
+extern LEDManager ledManager;
+extern void ESPRestart(byte reason);
+
+String getChipModel() {
+  esp_chip_info_t chip_info;
+  esp_chip_info(&chip_info);
+
+  switch (chip_info.model) {
+    case CHIP_ESP32:
+      return "ESP32";
+    case CHIP_ESP32S2:
+      return "ESP32-S2";
+    case CHIP_ESP32S3:
+      return "ESP32-S3";
+    case CHIP_ESP32C3:
+      return "ESP32-C3";
+    case CHIP_ESP32H2:
+      return "ESP32-H2";
+    default:
+      return "Unknown";
+  }
+}
+
+// From https://github.com/ThingPulse/espgateway-ethernet-testbed
+
+void addTestMessage(JsonArray& data, String name, String value, String result) {
+  JsonObject object = data.createNestedObject();
+  object["name"] = name;
+  object["value"] = value;
+  object["result"] = result;
+}
+
+void testDevice() {
+  StaticJsonDocument<1280> doc;
+  JsonArray data = doc.to<JsonArray>();
+
+  addTestMessage(data, "Mac Address", String(WiFi.macAddress()), "OK");
+  addTestMessage(data, "Chip Model", String(ESP.getChipModel()), "OK");
+  addTestMessage(data, "Chip Revision", String(ESP.getChipRevision()), "OK");
+  addTestMessage(data, "Available Cores", String(ESP.getChipCores()), ESP.getChipCores() == 2 ? "OK" : "NOK");
+  addTestMessage(data, "Heap Size", String(ESP.getHeapSize() / 1024) + "kb", ESP.getHeapSize() > 100000 ? "OK" : "NOK");
+  addTestMessage(data, "Free Heap", String(ESP.getFreeHeap() / 1024) + "kb", ESP.getFreeHeap() > 100000 ? "OK" : "NOK");
+  addTestMessage(data, "ETH MAC Address", String(ETH.macAddress()), ETH.macAddress() ? "OK" : "NOK");
+  addTestMessage(data, "ETH Local IP", ETH.localIP().toString(), ETH.localIP() ? "OK" : "NOK");
+  addTestMessage(data, "ETH Full Duplex", ETH.fullDuplex() ? "true" : "false", ETH.fullDuplex() ? "OK" : "NOK");
+  addTestMessage(data, "ETH Link Speed", String(ETH.linkSpeed()) + "Mbs", ETH.linkSpeed() ? "OK" : "NOK");
+  addTestMessage(data, "Build Date", String(__DATE__), "OK");
+  addTestMessage(data, "Build Time", String(__TIME__), "OK");
+  Serial.println();
+  serializeJson(doc, Serial);
+  Serial.println();
+}
+
+void testLeds() {
+  THEENGS_LOG_NOTICE(F("LED Test" CR));
+  ledManager.setMode(0, 0, LEDManager::Mode::STATIC, LED_NETWORK_OK_COLOR, -1);
+  delay(1000);
+  ledManager.setMode(0, 1, LEDManager::Mode::STATIC, LED_NETWORK_OK_COLOR, -1);
+  delay(1000);
+  ledManager.setMode(0, 2, LEDManager::Mode::STATIC, LED_NETWORK_OK_COLOR, -1);
+  delay(1000);
+  ledManager.setMode(0, 3, LEDManager::Mode::STATIC, LED_NETWORK_OK_COLOR, -1);
+  THEENGS_LOG_NOTICE(F("LED Test Finished" CR));
+}
+
+void checkSerial() {
+  THEENGS_LOG_NOTICE(F("READY_FOR_SELFTEST" CR));
+  unsigned long start = millis();
+  while (millis() - start < 1000) {
+    if (Serial.available() > 0) {
+      String input = Serial.readStringUntil('\n');
+      input.trim(); // Remove any extra whitespace
+      if (input == "SELFTEST") {
+        THEENGS_LOG_NOTICE(F("SELFTEST Launched" CR));
+        testLeds();
+        // Print 20 times the test data
+        for (int i = 0; i < 20; i++) {
+          testDevice();
+          delay(1000);
+        }
+        THEENGS_LOG_NOTICE(F("SELFTEST Finished" CR));
+        // Restart
+        ESPRestart(9);
+      }
+    }
+  }
+}
+#endif
\ No newline at end of file
diff --git a/main/certs/default_client_cert.h b/main/certs/default_client_cert.h
index f7e6613..a6d496f 100644
--- a/main/certs/default_client_cert.h
+++ b/main/certs/default_client_cert.h
@@ -1,4 +1,7 @@
-const char* ss_client_cert PROGMEM = R"EOF("
+#pragma once
+#include <Arduino.h>
+
+static const char* ss_client_cert PROGMEM = R"EOF("
 -----BEGIN CERTIFICATE-----
 ...
 -----END CERTIFICATE-----
diff --git a/main/certs/default_client_key.h b/main/certs/default_client_key.h
index 6a18da7..f41ddd6 100644
--- a/main/certs/default_client_key.h
+++ b/main/certs/default_client_key.h
@@ -1,4 +1,7 @@
-const char* ss_client_key PROGMEM = R"EOF("
+#pragma once
+#include <Arduino.h>
+
+static const char* ss_client_key PROGMEM = R"EOF("
 -----BEGIN RSA PRIVATE KEY-----
 ...
 -----END RSA PRIVATE KEY-----
diff --git a/main/certs/default_ota_cert.h b/main/certs/default_ota_cert.h
index b060165..a901ab5 100644
--- a/main/certs/default_ota_cert.h
+++ b/main/certs/default_ota_cert.h
@@ -1,26 +1,27 @@
 // The certificate must be in PEM ascii format.
-// The default certificate is for github.
-const char* OTAserver_cert PROGMEM = R"EOF("
+// The default certificate is for ota.openmqttgateway.com
+#pragma once
+#include <Arduino.h>
+
+static const char* OTAserver_cert PROGMEM = R"EOF("
 -----BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF
+ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
+b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm
+jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA
+A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI
+U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs
+N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv
+o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU
+5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy
+rqXRfboQnoZsG4q5WTP468SQvvG5
 -----END CERTIFICATE-----
 ")EOF";
diff --git a/main/certs/default_server_cert.h b/main/certs/default_server_cert.h
index f51eea7..29977ce 100644
--- a/main/certs/default_server_cert.h
+++ b/main/certs/default_server_cert.h
@@ -1,4 +1,7 @@
-const char* ss_server_cert PROGMEM = R"EOF("
+#pragma once
+#include <Arduino.h>
+
+static const char* ss_server_cert PROGMEM = R"EOF("
 -----BEGIN CERTIFICATE-----
 ...
 -----END CERTIFICATE-----
diff --git a/main/commonRF.cpp b/main/commonRF.cpp
new file mode 100644
index 0000000..f949a7e
--- /dev/null
+++ b/main/commonRF.cpp
@@ -0,0 +1,286 @@
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+
+   Act as a wifi or ethernet gateway between your BLE/433mhz/infrared IR signal and an MQTT broker
+   Send and receiving command by MQTT
+
+    Copyright: (c)Florian ROBERT
+
+    This file is part of OpenMQTTGateway.
+
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+
+#include "User_config.h"
+
+#if defined(ZgatewayRF) || defined(ZgatewayPilight) || defined(ZgatewayRTL_433) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
+
+#  ifdef ZradioCC1101
+#    include <ELECHOUSE_CC1101_SRC_DRV.h>
+#  endif
+#  include <rf/RFConfiguration.h>
+
+#  include "TheengsCommon.h"
+#  include "config_RF.h"
+
+#  ifdef ZgatewayRTL_433
+#    include <rtl_433_ESP.h>
+extern rtl_433_ESP rtl_433;
+#  endif
+
+int currentReceiver = ACTIVE_NONE;
+boolean isDriverEnabled = false;
+extern void enableActiveReceiver();
+extern void disableCurrentReceiver();
+
+// Note: this is currently just a simple wrapper used to make everything work.
+// It prevents introducing external dependencies on newly added C++ structures,
+// and acts as a first approach to mask the concrete implementations (rf, rf2,
+// pilight, etc.). Later this can be extended or replaced by more complete driver
+// abstractions without changing the rest of the system.
+class ZCommonRFWrapper : public RFReceiver {
+public:
+  ZCommonRFWrapper() : RFReceiver() {}
+  void enable() override { enableActiveReceiver(); }
+  void disable() override { disableCurrentReceiver(); }
+  int getReceiverID() const override { return currentReceiver; }
+};
+
+ZCommonRFWrapper iRFReceiver;
+RFConfiguration iRFConfig(iRFReceiver);
+
+// Initialize the CC1101 and tune the RX frequency.
+// - Uses truncated exponential backoff to avoid tight retry loops
+// - Validates the configured frequency before touching the radio
+// - Emits explicit logs for success/failure so watchdog resets are traceable
+void initCC1101() {
+#  ifdef ZradioCC1101 // receiving with CC1101
+  const float freqMhz = iRFConfig.getFrequency();
+  if (!iRFConfig.validFrequency(freqMhz)) {
+    THEENGS_LOG_ERROR(F("C1101 invalid frequency: %F MHz" CR), freqMhz);
+    return;
+  }
+
+  int delayMS = 16;
+  int delayMaxMS = 500;
+  bool connected = false;
+
+#    ifdef RF_MODULE_SECONDARY_CS
+  // Boards carrying two radios on one SPI bus must hold the unused radio's
+  // chip-select high, or it answers on MISO and corrupts every transfer to the
+  // radio we do use.
+  pinMode(RF_MODULE_SECONDARY_CS, OUTPUT);
+  digitalWrite(RF_MODULE_SECONDARY_CS, HIGH);
+  THEENGS_LOG_NOTICE(F("Deselected secondary radio CS on GPIO%d" CR), RF_MODULE_SECONDARY_CS);
+#    endif
+
+#    if defined(RF_CC1101_SCK) && defined(RF_CC1101_MISO) && \
+        defined(RF_CC1101_MOSI) && defined(RF_CC1101_CS)
+  THEENGS_LOG_TRACE(F("initCC1101 with custom SPI pins, SCK=%d, MISO=%d, MOSI=%d, CS=%d" CR), RF_CC1101_SCK, RF_CC1101_MISO, RF_CC1101_MOSI, RF_CC1101_CS);
+  ELECHOUSE_cc1101.setSpiPin(RF_CC1101_SCK, RF_CC1101_MISO, RF_CC1101_MOSI, RF_CC1101_CS);
+#    endif
+
+  // Init() must run before getCC1101(): from driver V3.x on it is Init() that
+  // starts the SPI bus, so the status-register read behind getCC1101() would
+  // otherwise run on a bus that was never begun.
+  ELECHOUSE_cc1101.Init();
+
+  for (int attempt = 1; attempt <= 10; attempt++) {
+    if (ELECHOUSE_cc1101.getCC1101()) {
+      connected = true;
+      THEENGS_LOG_NOTICE(F("C1101 SPI connection OK on attempt %d" CR), attempt);
+      ELECHOUSE_cc1101.SetRx(freqMhz);
+      THEENGS_LOG_NOTICE(F("C1101 tuned RX to %F MHz" CR), freqMhz);
+      break;
+    }
+
+    THEENGS_LOG_ERROR(F("C1101 SPI connection error (attempt %d), retrying" CR), attempt);
+    delay(delayMS);
+
+    // truncated exponential backoff
+    delayMS = delayMS * 2;
+    if (delayMS > delayMaxMS) delayMS = delayMaxMS;
+
+    ELECHOUSE_cc1101.Init();
+  }
+
+  if (!connected) {
+    THEENGS_LOG_ERROR(F("C1101 init failed after retries, radio left disabled" CR));
+  }
+#  else
+  THEENGS_LOG_TRACE(F("initCC1101 skipped: ZradioCC1101 not enabled" CR));
+#  endif
+}
+
+void setupCommonRF() {
+  iRFConfig.reInit();
+  iRFConfig.loadFromStorage(true);
+}
+
+#  if !defined(ZgatewayRFM69) && !defined(ZactuatorSomfy)
+// Check if a receiver is available
+bool validReceiver(int receiver) {
+  switch (receiver) {
+#    ifdef ZgatewayPilight
+    case ACTIVE_PILIGHT:
+      return true;
+#    endif
+#    ifdef ZgatewayRF
+    case ACTIVE_RF:
+      return true;
+#    endif
+#    ifdef ZgatewayRTL_433
+    case ACTIVE_RTL:
+      return true;
+#    endif
+#    ifdef ZgatewayRF2
+    case ACTIVE_RF2:
+      return true;
+#    endif
+    default:
+      THEENGS_LOG_ERROR(F("ERROR: stored receiver %d not available" CR), receiver);
+  }
+  return false;
+}
+#  endif
+
+void disableCurrentReceiver() {
+  if (!isDriverEnabled) {
+    THEENGS_LOG_TRACE(F("Receiver %d is already disabled" CR), currentReceiver);
+    return;
+  }
+  THEENGS_LOG_TRACE(F("disableCurrentReceiver: %d" CR), currentReceiver);
+  switch (currentReceiver) {
+    case ACTIVE_NONE:
+      isDriverEnabled = false;
+      break;
+#  ifdef ZgatewayPilight
+    case ACTIVE_PILIGHT:
+      disablePilightReceive();
+      isDriverEnabled = false;
+      break;
+#  endif
+#  ifdef ZgatewayRF
+    case ACTIVE_RF:
+      disableRFReceive();
+      isDriverEnabled = false;
+      break;
+#  endif
+#  ifdef ZgatewayRTL_433
+    case ACTIVE_RTL:
+      disableRTLreceive();
+      isDriverEnabled = false;
+      break;
+#  endif
+#  ifdef ZgatewayRF2
+    case ACTIVE_RF2:
+      disableRF2Receive();
+      isDriverEnabled = false;
+      break;
+#  endif
+    default:
+      THEENGS_LOG_ERROR(F("ERROR: unsupported receiver %d" CR), iRFConfig.getActiveReceiver());
+  }
+}
+
+void enableActiveReceiver() {
+  if (isDriverEnabled) {
+    THEENGS_LOG_TRACE(F("Receiver %d is already enabled" CR), currentReceiver);
+    return;
+  }
+  THEENGS_LOG_TRACE(F("enableActiveReceiver: %d" CR), iRFConfig.getActiveReceiver());
+  switch (iRFConfig.getActiveReceiver()) {
+#  ifdef ZgatewayPilight
+    case ACTIVE_PILIGHT:
+      initCC1101();
+      enablePilightReceive();
+      currentReceiver = ACTIVE_PILIGHT;
+      isDriverEnabled = true;
+      break;
+#  endif
+#  ifdef ZgatewayRF
+    case ACTIVE_RF:
+      initCC1101();
+      enableRFReceive(iRFConfig.getFrequency(), RF_RECEIVER_GPIO, RF_EMITTER_GPIO);
+      currentReceiver = ACTIVE_RF;
+      isDriverEnabled = true;
+      break;
+#  endif
+#  ifdef ZgatewayRTL_433
+    case ACTIVE_RTL:
+      initCC1101();
+      enableRTLreceive();
+      currentReceiver = ACTIVE_RTL;
+      isDriverEnabled = true;
+      break;
+#  endif
+#  ifdef ZgatewayRF2
+    case ACTIVE_RF2:
+      initCC1101();
+      enableRF2Receive();
+      currentReceiver = ACTIVE_RF2;
+      isDriverEnabled = true;
+      break;
+#  endif
+    case ACTIVE_RECERROR:
+      THEENGS_LOG_ERROR(F("ERROR: no receiver selected" CR));
+      break;
+    default:
+      THEENGS_LOG_ERROR(F("ERROR: unsupported receiver %d" CR), iRFConfig.getActiveReceiver());
+  }
+}
+
+String stateRFMeasures() {
+  //Publish RTL_433 state
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  JsonObject RFdata = jsonBuffer.to<JsonObject>();
+
+  // load the configuration
+  iRFConfig.toJson(RFdata);
+
+  // load the current state
+#  if defined(ZradioCC1101) || defined(ZradioSX127x)
+  if (iRFConfig.getActiveReceiver() == ACTIVE_RTL) {
+#    ifdef ZgatewayRTL_433
+    RFdata["rssithreshold"] = (int)getRTLrssiThreshold();
+    RFdata["rssi"] = (int)getRTLCurrentRSSI();
+    RFdata["avgrssi"] = (int)getRTLAverageRSSI();
+    RFdata["count"] = (int)getRTLMessageCount();
+    // Capture high water mark of rtl_433_Decoder stack since it can run out and trigger reboot
+    extern TaskHandle_t rtl_433_DecoderHandle;
+    RFdata["rtl433_stack"] = (int)uxTaskGetStackHighWaterMark(rtl_433_DecoderHandle);
+#    endif
+#    ifdef ZradioSX127x
+    RFdata["ookthreshold"] = (int)getOOKThresh();
+#    endif
+  }
+#  endif
+  RFdata["origin"] = subjectcommonRFtoMQTT;
+  enqueueJsonObject(RFdata);
+
+  String output;
+  serializeJson(RFdata, output);
+  return output;
+}
+
+void XtoRFset(const char* topicOri, JsonObject& RFdata) {
+  if (cmpToMainTopic(topicOri, subjectMQTTtoRFset)) {
+    THEENGS_LOG_TRACE(F("MQTTtoRF json set" CR));
+
+    iRFConfig.loadFromMessage(RFdata);
+
+    stateRFMeasures();
+  }
+}
+#endif
diff --git a/main/config_2G.h b/main/config_2G.h
index 8456c8b..9f74096 100644
--- a/main/config_2G.h
+++ b/main/config_2G.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
   This gateway enables to set your parameters for the 2G gateway
@@ -26,10 +26,12 @@
 #ifndef config_2G_h
 #define config_2G_h
 
+#include "TheengsCommon.h"
+
 extern void setup2G();
-extern bool _2GtoMQTT();
-extern void MQTTto2G(char* topicOri, char* datacallback);
-extern void MQTTto2G(char* topicOri, JsonObject& SMSdata);
+extern bool _2GtoX();
+extern void Xto2G(const char* topicOri, const char* datacallback);
+extern void Xto2G(const char* topicOri, JsonObject& SMSdata);
 /*-------------------2G topics & parameters----------------------*/
 //433Mhz MQTT Subjects and keys
 #define subjectMQTTto2G    "/commands/MQTTto2G"
diff --git a/main/config_ADC.h b/main/config_ADC.h
index 393f923..e5188ef 100644
--- a/main/config_ADC.h
+++ b/main/config_ADC.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the ADC value
@@ -27,7 +27,7 @@
 #define config_ADC_h
 
 extern void setupADC();
-extern void ADCtoMQTT();
+extern void ADCtoX();
 extern void MeasureADC();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
diff --git a/main/config_AHTx0.h b/main/config_AHTx0.h
index dba5959..757c990 100644
--- a/main/config_AHTx0.h
+++ b/main/config_AHTx0.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
  
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
    
    This is the Climate Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   AHT10 ------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 5V -------------------> 3v3 (3V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
+   AHT10 ------> ESP8266
+   =======================
+   Vcc ---------> 3v3 (3V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
    
     This file is part of OpenMQTTGateway.
     
diff --git a/main/config_BH1750.h b/main/config_BH1750.h
index e1f29b6..f254012 100644
--- a/main/config_BH1750.h
+++ b/main/config_BH1750.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the BH1750 sensor
@@ -26,13 +26,13 @@
    Connection Schemata:
    --------------------
 
-   BH1750 ------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
-   ADD ---------> N/C (Not Connected) --> N/C (Not Connected)
+   BH1750 ------> ESP8266
+   ==================================
+   Vcc --------->   (5V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
+   ADD ---------> N/C (Not Connected)
 
 */
 #ifndef config_BH1750_h
@@ -47,8 +47,7 @@ extern void MeasureLightIntensity();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 #define subjectBH1750toMQTT "/BH1750toMQTT"
-//Time used to wait for an interval before resending measured values
-unsigned long timebh1750 = 0;
-int BH1750_i2c_addr = 0x23; // Light Sensor I2C Address
+
+#define BH1750_I2C_ADDR 0x23; // Light Sensor I2C Address
 
 #endif
diff --git a/main/config_BME280.h b/main/config_BME280.h
index 3ea6241..b4404f1 100644
--- a/main/config_BME280.h
+++ b/main/config_BME280.h
@@ -1,7 +1,7 @@
 /*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
 
    This files enables you to set parameters for the BME280 or BMP280 sensors.
@@ -26,12 +26,12 @@
    Connection Schemata:
    --------------------
 
-   BME280/BMP280 ------> Arduino Uno ----------> ESP8266
-   =====================================================
-   Vcc ----------------> 5V/3.3V     ----------> 5V/3.3V    (5V or 3.3V depends on the BME280/BMP280 board variant)
-   GND ----------------> GND         ----------> GND
-   SCL ----------------> Pin A5      ----------> D1
-   SDA ----------------> Pin A4      ----------> D2
+   BME280/BMP280 ------> ESP8266
+   ==============================
+   Vcc ----------------> 5V/3.3V    (5V or 3.3V depends on the BME280/BMP280 board variant)
+   GND ----------------> GND
+   SCL ----------------> D1
+   SDA ----------------> D2
 
 */
 #ifndef config_BME280_h
@@ -53,9 +53,7 @@ extern void MeasureTempHumAndPressure();
 #  define BMETOPIC "/CLIMAtoMQTT/bme"
 #endif
 
-//Time used to wait for an interval before resending measured values
-unsigned long timebme280 = 0;
-int BME280_i2c_addr = 0x76; // Bosch BME280 I2C Address
+#define BME280_I2C_ADDR 0x76
 
 // Only supported for ESP
 #ifndef BME280_PIN_SDA
diff --git a/main/config_BT.h b/main/config_BT.h
index a116701..869904a 100644
--- a/main/config_BT.h
+++ b/main/config_BT.h
@@ -1,15 +1,15 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
- 
+
    This files enables to set your parameter for the bluetooth low energy gateway (beacons detection)
-  
+
     Copyright: (c)Florian ROBERT
-  
+
     This file is part of OpenMQTTGateway.
-    
+
     OpenMQTTGateway 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
@@ -26,13 +26,12 @@
 #ifndef config_BT_h
 #define config_BT_h
 
+#include "TheengsCommon.h"
+
 extern void setupBT();
-extern bool BTtoMQTT();
-extern void MQTTtoBT(char* topicOri, JsonObject& RFdata);
-extern void pubMainCore(JsonObject& data);
+extern void XtoBT(const char* topicOri, JsonObject& RFdata);
 extern void launchBTDiscovery(bool overrideDiscovery);
-extern void stopProcessing();
-extern void lowPowerESP32();
+extern void stopProcessing(bool deinit);
 extern String stateBTMeasures(bool);
 
 #ifdef ESP32
@@ -43,6 +42,7 @@ extern String stateBTMeasures(bool);
 #define subjectBTtoMQTT    "/BTtoMQTT"
 #define subjectMQTTtoBTset "/commands/MQTTtoBT/config"
 #define subjectMQTTtoBT    "/commands/MQTTtoBT"
+#define subjectTrackerSync "internal/trackersync"
 // Uncomment to send undecoded device data to another gateway device for decoding
 // #define MQTTDecodeTopic    "undecoded"
 #ifndef UseExtDecoder
@@ -64,7 +64,9 @@ extern String stateBTMeasures(bool);
 #  define BLE_FILTER_CONNECTABLE 0 // Sets whether to filter publishing of scanned devices that require a connection.
 #endif // Setting this to 1 prevents overwriting the publication of the device connection data with the advertised data (Recommended for use with OpenHAB).
 
-#define MinimumRSSI -100 //default minimum rssi value, all the devices below -100 will not be reported
+#ifndef MinimumRSSI
+#  define MinimumRSSI -100 //default minimum rssi value, all the devices below -100 will not be reported
+#endif
 
 #ifndef Scan_duration
 #  define Scan_duration 10000 //define the duration for a scan; in milliseconds
@@ -98,7 +100,10 @@ extern String stateBTMeasures(bool);
 #endif
 
 #ifndef BLEScanDuplicateCacheSize
-#  define BLEScanDuplicateCacheSize 200
+#  define BLEScanDuplicateCacheSize 100
+#endif
+#ifndef MaxBLEDevices
+#  define MaxBLEDevices 80
 #endif
 #ifndef TimeBtwRead
 #  define TimeBtwRead 55555 //define default time between 2 scans; in milliseconds
@@ -116,17 +121,25 @@ extern String stateBTMeasures(bool);
 #  define HassPresence false //true if we publish into Home Assistant presence topic
 #endif
 
-#define HMSerialSpeed 9600 // Communication speed with the HM module, softwareserial doesn't support 115200
-//#define HM_BLUE_LED_STOP true //uncomment to stop the blue led light of HM1X
+#ifndef EnableBT
+#  define EnableBT true
+#endif
 
-#define BLEdelimiter       "4f4b2b444953413a" // OK+DISA:
-#define BLEEndOfDiscovery  "4f4b2b4449534345" // OK+DISCE
-#define BLEdelimiterLength 16
-#define CRLR               "0d0a"
-#define CRLR_Length        4
-#define BLE_CNCT_TIMEOUT   3000
+#ifndef BLEDecoder
+#  define BLEDecoder true //true if we use the Theengs decoder
+#endif
 
-unsigned long scanCount = 0;
+#if !BLEDecoder
+#  define UNKWNON_MODEL -1
+#else
+#  define UNKWNON_MODEL TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL
+#endif
+
+#ifndef BLE_CNCT_TIMEOUT
+#  define BLE_CNCT_TIMEOUT 3000
+#endif
+
+extern unsigned long scanCount;
 
 #ifndef pubBLEAdvData
 #  define pubBLEAdvData false // define true if you want to publish all advertisement data
@@ -136,6 +149,10 @@ unsigned long scanCount = 0;
 #  define useBeaconUuidForTopic false // define true to use iBeacon UUID as topic, instead of sender (random) MAC address
 #endif
 
+#ifndef enableMultiGTWSync
+#  define enableMultiGTWSync true // //define true to use tracker and closest control devices sync across OpenMQTTGateway and Theengs Gateway gateways
+#endif
+
 /*--------------HOME ASSISTANT ROOM PRESENCE--------------*/
 #define subjectHomePresence "presence/" // will send Home Assistant room presence message to this topic (first part is same for all rooms, second is room name)
 
@@ -196,9 +213,8 @@ enum ble_val_type {
 };
 
 struct BLEAction {
-  std::string value;
-  char addr[18];
-  int addr_type;
+  NimBLEAttValue value;
+  NimBLEAddress addr;
   NimBLEUUID service;
   NimBLEUUID characteristic;
   bool write;
@@ -210,6 +226,7 @@ struct BLEAction {
 
 struct BLEdevice {
   char macAdr[18];
+  char name[20];
   int macType;
   bool isDisc;
   bool isWhtL;
diff --git a/main/config_C37_YL83_HMRD.h b/main/config_C37_YL83_HMRD.h
index 018f02a..5ffc48c 100644
--- a/main/config_C37_YL83_HMRD.h
+++ b/main/config_C37_YL83_HMRD.h
@@ -1,5 +1,5 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your RF/infrared IR signal  and a MQTT broker
    Send and receiving command by MQTT
@@ -25,7 +25,7 @@
 #define config_C37_YL83_HMRD_h
 
 extern void setupZsensorC37_YL83_HMRD();
-extern void C37_YL83_HMRDtoMQTT();
+extern void C37_YL83_HMRDtoX();
 extern void MeasureC37_YL83_HMRDWater();
 
 /*----------------------------USER PARAMETERS-----------------------------*/
diff --git a/main/config_DHT.h b/main/config_DHT.h
index 89f4c8c..01d5cdd 100644
--- a/main/config_DHT.h
+++ b/main/config_DHT.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the DHT11/22 sensor
diff --git a/main/config_DS1820.h b/main/config_DS1820.h
index dfba98a..2e4581c 100644
--- a/main/config_DS1820.h
+++ b/main/config_DS1820.h
@@ -1,5 +1,5 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your RF/infrared IR signal  and a MQTT broker
    Send and receiving command by MQTT
@@ -27,7 +27,7 @@
 #define config_DS1820_h
 
 extern void setupZsensorDS1820();
-extern void DS1820toMQTT();
+extern void DS1820toX();
 extern void MeasureDS1820Temp();
 extern void pubOneWire_HADiscovery();
 
diff --git a/main/config_FASTLED.h b/main/config_FASTLED.h
index 545ba28..a49db0e 100644
--- a/main/config_FASTLED.h
+++ b/main/config_FASTLED.h
@@ -1,5 +1,5 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    This files enables you to set your parameters for the FASTLED actuator 
   
@@ -24,10 +24,12 @@
 #ifndef config_FASTLED_h
 #define config_FASTLED_h
 
+#include "TheengsCommon.h"
+
 extern void setupFASTLED();
 extern void FASTLEDLoop();
-extern void MQTTtoFASTLED(char*, char*);
-extern void MQTTtoFASTLED(char*, JsonObject&);
+extern void XtoFASTLED(const char*, const char*);
+extern void XtoFASTLED(const char*, JsonObject&);
 /*-------------------FASTLED topics & parameters----------------------*/
 //FASTLED MQTT Subjects
 #define subjectMQTTtoFASTLED              "/commands/MQTTtoFASTLED"
@@ -82,7 +84,7 @@ extern void MQTTtoFASTLED(char*, JsonObject&);
 #  define FASTLED_ESP8266_D1_GPIO_ORDER
 #  define FASTLED_DATA_GPIO D2 // only D2 works by me
 //#define FASTLED_CLOCK_GPIO 13
-#elif ESP32
+#elif defined(ESP32)
 #  ifndef FASTLED_DATA_GPIO
 #    define FASTLED_DATA_GPIO 16
 #  endif
diff --git a/main/config_GFSunInverter.h b/main/config_GFSunInverter.h
index 7cc1643..58f254c 100644
--- a/main/config_GFSunInverter.h
+++ b/main/config_GFSunInverter.h
@@ -1,5 +1,5 @@
 /*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your GridFree SUN-2000G inverter and a MQTT broker.
    Send inverter metrics by MQTT.
@@ -27,10 +27,6 @@
 #ifndef config_GFSunInverter_h
 #define config_GFSunInverter_h
 
-#include <Arduino.h>
-#include <ArduinoJson.h>
-#include <GfSun2000.h>
-
 extern void setupGFSunInverter();
 extern void ZgatewayGFSunInverterMQTT();
 
diff --git a/main/config_GPIOInput.h b/main/config_GPIOInput.h
index 5c9a34a..5f3215a 100644
--- a/main/config_GPIOInput.h
+++ b/main/config_GPIOInput.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the GPIOInput sensor
@@ -27,7 +27,7 @@
 #define config_GPIOInput_h
 
 extern void setupGPIOInput();
-extern void GPIOInputtoMQTT();
+extern void GPIOInputtoX();
 extern void MeasureGPIOInput();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
diff --git a/main/config_GPIOKeyCode.h b/main/config_GPIOKeyCode.h
index 9896ccc..8072667 100644
--- a/main/config_GPIOKeyCode.h
+++ b/main/config_GPIOKeyCode.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the GPIOKeyCode multi input
@@ -27,7 +27,7 @@
 #define config_GPIOKeyCode_h
 
 extern void setupGPIOKeyCode();
-extern void GPIOKeyCodetoMQTT();
+extern void GPIOKeyCodetoX();
 extern void MeasureGPIOKeyCode();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
diff --git a/main/config_HCSR04.h b/main/config_HCSR04.h
index 7312dff..3404a0f 100644
--- a/main/config_HCSR04.h
+++ b/main/config_HCSR04.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker  
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the HCSR04 sensor
@@ -26,12 +26,12 @@
    Connection Schemata:
    --------------------
 
-   HC-SR04 ------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   TRI ---------> Pin D6 ---------------> D6
-   ECH ---------> Pin D7 ---------------> D7
+   HC-SR04 ------> ESP8266
+   =======================
+   Vcc ---------> Vu (5V)
+   GND ---------> GND
+   TRI ---------> D6
+   ECH ---------> D7
    
 */
 #ifndef config_HCSR04_h
diff --git a/main/config_HCSR501.h b/main/config_HCSR501.h
index 1482f76..b296fae 100644
--- a/main/config_HCSR501.h
+++ b/main/config_HCSR501.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the HC SR-501 sensor
@@ -27,7 +27,7 @@
 #define config_HCSR501_h
 
 extern void setupHCSR501();
-extern void HCSR501toMQTT();
+extern void HCSR501toX();
 extern void MeasureHCSR501();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
diff --git a/main/config_HTU21.h b/main/config_HTU21.h
index 7efc31b..202321d 100644
--- a/main/config_HTU21.h
+++ b/main/config_HTU21.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
  
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
    
    This is the Climate Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   HTU21 ------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
+   HTU21 ------> ESP8266
+   ======================
+   Vcc ---------> Vu (5V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
    
     This file is part of OpenMQTTGateway.
     
diff --git a/main/config_INA226.h b/main/config_INA226.h
index ebc37f2..8114586 100644
--- a/main/config_INA226.h
+++ b/main/config_INA226.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the INA226 sensor
@@ -27,7 +27,7 @@
 #define config_INA226_h
 
 extern void setupINA226();
-extern void INA226toMQTT();
+extern void INA226toX();
 extern void MeasureINA226();
 
 /*----------------------------USER PARAMETERS-----------------------------*/
diff --git a/main/config_IR.h b/main/config_IR.h
index f646c2c..2338043 100644
--- a/main/config_IR.h
+++ b/main/config_IR.h
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This files enables to set your parameter for the infrared gateway
@@ -26,10 +26,12 @@
 #ifndef config_IR_h
 #define config_IR_h
 
+#include "TheengsCommon.h"
+
 extern void setupIR();
-extern void IRtoMQTT();
-extern void MQTTtoIR(char* topicOri, char* datacallback);
-extern void MQTTtoIR(char* topicOri, JsonObject& RFdata);
+extern void IRtoX();
+extern void XtoIR(const char* topicOri, const char* datacallback);
+extern void XtoIR(const char* topicOri, JsonObject& RFdata);
 /*-------------------IR topics & parameters----------------------*/
 //IR MQTT Subjects
 #define subjectGTWIRtoMQTT     "/IRtoMQTT"
@@ -159,17 +161,6 @@ extern void MQTTtoIR(char* topicOri, JsonObject& RFdata);
 #  define IR_COOLIX48
 #  define IR_HITACHI_AC264
 #  define IR_HITACHI_AC296
-#elif __AVR_ATmega2560__
-#  define IR_COOLIX
-#  define IR_Whynter
-#  define IR_LG
-#  define IR_Sony
-#  define IR_DISH
-#  define IR_RC5
-#  define IR_Sharp
-#  define IR_SAMSUNG
-#  define IR_Raw
-#  define IR_PANASONIC
 #else //IR supported protocols on arduino uncomment if you want to send with this protocol, NEC protocol is available per default
 //#define IR_COOLIX
 //#define IR_Whynter
@@ -193,24 +184,16 @@ extern void MQTTtoIR(char* topicOri, JsonObject& RFdata);
 #ifndef IR_RECEIVER_GPIO
 #  ifdef ESP8266
 #    define IR_RECEIVER_GPIO 2 //D4 /replace by 4 with sonoff rf bridge
-#  elif ESP32
+#  elif defined(ESP32)
 #    define IR_RECEIVER_GPIO 26
-#  elif __AVR_ATmega2560__
-#    define IR_RECEIVER_GPIO 2 // 2 = D2 on arduino mega
-#  else
-#    define IR_RECEIVER_GPIO 0 // 0 = D2 on arduino UNO
 #  endif
 #endif
 
 #ifndef IR_EMITTER_GPIO
 #  ifdef ESP8266
 #    define IR_EMITTER_GPIO 16 //D0/ replace by 0 (D3) if you use IR LOLIN controller shield /replace by 5 with sonoff rf bridge
-#  elif ESP32
+#  elif defined(ESP32)
 #    define IR_EMITTER_GPIO 14
-#  elif __AVR_ATmega2560__
-#    define IR_EMITTER_GPIO 9
-#  else
-#    define IR_EMITTER_GPIO 9
 #  endif
 #endif
 
diff --git a/main/config_LM75.h b/main/config_LM75.h
index 9b42cb9..5f0b7ea 100644
--- a/main/config_LM75.h
+++ b/main/config_LM75.h
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This is a Temperature Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   LM75 ------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
+   LM75 ------> ESP8266
+   ======================
+   Vcc ---------> Vu (5V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
 
     This file is part of OpenMQTTGateway.
 
@@ -39,7 +39,7 @@
 #define config_LM75_h
 
 extern void setupLM75();
-extern void LM75toMQTT();
+extern void LM75toX();
 
 #define lm75_always            true // if false when the current value of the parameter is the same as previous one don't send it by MQTT
 #define TimeBetweenReadinglm75 30000
diff --git a/main/config_LORA.h b/main/config_LORA.h
index 2db7f66..6e8ffac 100644
--- a/main/config_LORA.h
+++ b/main/config_LORA.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the LORA gateway
@@ -26,10 +26,12 @@
 #ifndef config_LORA_h
 #define config_LORA_h
 
+#include "TheengsCommon.h"
+
 extern void setupLORA();
-extern void LORAtoMQTT();
-extern void MQTTtoLORA(char* topicOri, char* datacallback);
-extern void MQTTtoLORA(char* topicOri, JsonObject& RFdata);
+extern void LORAtoX();
+extern void XtoLORA(const char* topicOri, const char* datacallback);
+extern void XtoLORA(const char* topicOri, JsonObject& RFdata);
 /*----------------------LORA topics & parameters-------------------------*/
 #define subjectLORAtoMQTT    "/LORAtoMQTT"
 #define subjectMQTTtoLORA    "/commands/MQTTtoLORA"
@@ -112,6 +114,7 @@ struct LORAConfig_s {
 };
 
 #ifdef ZmqttDiscovery
+#  include "config_mqttDiscovery.h"
 extern void launchLORADiscovery(bool overrideDiscovery);
 // This structure stores the entities of the devices and is they have been discovered or not
 // The uniqueId is composed of the device id + the key
@@ -125,11 +128,13 @@ struct LORAdevice {
   bool isDisc;
 };
 
-const char LORAparameters[3][4][12] = {
+const char LORAparameters[5][4][12] = {
     // LORA key, name, unit, device_class
-    {"tempc", "temperature", "°C", "temperature"},
-    {"hum", "humidity", "%", "humidity"},
-    {"moi", "moisture", "%", "humidity"}};
+    {"tempc", HASS_CLASS_TEMPERATURE, HASS_UNIT_CELSIUS, HASS_CLASS_TEMPERATURE},
+    {"hum", HASS_CLASS_HUMIDITY, HASS_UNIT_PERCENT, HASS_CLASS_HUMIDITY},
+    {"moi", "moisture", HASS_UNIT_PERCENT, HASS_CLASS_HUMIDITY},
+    {"batt", HASS_CLASS_BATTERY, HASS_UNIT_PERCENT, HASS_CLASS_BATTERY},
+    {"count", HASS_CLASS_WATER, HASS_UNIT_LITER, HASS_CLASS_WATER}};
 
 #endif
 
diff --git a/main/config_M5.h b/main/config_M5.h
index 47f7e40..bf41fc4 100644
--- a/main/config_M5.h
+++ b/main/config_M5.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to use M5Stick C board components (display)
@@ -26,18 +26,12 @@
 #ifndef config_M5_h
 #define config_M5_h
 
-#ifdef ZboardM5STICKC
-#  include <M5StickC.h>
-#endif
-#ifdef ZboardM5STICKCP
-#  include <M5StickCPlus.h>
-#endif
-#ifdef ZboardM5STACK
-#  include <M5Stack.h>
-#endif
-#ifdef ZboardM5TOUGH
-#  include <M5Tough.h>
-#endif
+// All M5 boards (Core / Stick C / Stick C Plus / Tough) are driven through the
+// unified M5Unified + M5GFX libraries, which build on the modern Arduino core
+// and auto-detect the board at runtime. This replaces the per-board libraries
+// (M5Stack / M5StickC / M5StickC-Plus / M5Tough) that were pinned to Arduino
+// core 2.x (espressif32@6.1.0) because they don't compile on core 3.x.
+#include <M5Unified.h>
 
 extern void setupM5();
 extern void loopM5();
@@ -74,7 +68,7 @@ extern void loopM5();
 // Simple construct for displaying message in lcd and oled displays
 
 #define displayPrint(...) \
-  if (lowpowermode < 2) M5Print(__VA_ARGS__) // only print if not in low power mode
+  if (SYSConfig.powerMode < 1) M5Print(__VA_ARGS__) // only print if not in low power mode
 #define lpDisplayPrint(...) M5Print(__VA_ARGS__) // print in low power mode
 
 void M5Print(char*, char* = "", char* = "");
diff --git a/main/config_MQ2.h b/main/config_MQ2.h
index b553318..9b8908a 100644
--- a/main/config_MQ2.h
+++ b/main/config_MQ2.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This is the MQ2 GAS Sensor Addon based on modules with a MQ:
@@ -11,12 +11,12 @@
    Connection Scheme:
    --------------------
 
-   MQ-2 -------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 3.3V or 5V------------> 3.3V or 5V
-   GND ---------> GND ------------------> GND
-   A0 ----------> Pin A0 ---------------> A0
-   D0 ----------> Pin D4 ---------------> D4
+   MQ-2 -------> ESP8266
+   ==========================
+   Vcc ---------> 3.3V or 5V
+   GND ---------> GND
+   A0 ----------> A0
+   D0 ----------> D4
   
     This file is part of OpenMQTTGateway.
     
@@ -37,7 +37,7 @@
 #define config_MQ2_h
 
 extern void setupZsensorMQ2();
-extern void MQ2toMQTT();
+extern void MQ2toX();
 
 #ifndef MQ2SENSORADCPIN
 #  ifdef ESP32
@@ -62,7 +62,4 @@ extern void MQ2toMQTT();
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 #define subjectMQ2toMQTT "/GAStoMQTT/mq2"
 
-//Time used to wait for an interval before resending measured values
-unsigned long timemq2 = 0;
-
 #endif
\ No newline at end of file
diff --git a/main/config_ONOFF.h b/main/config_ONOFF.h
index 4300569..406154a 100644
--- a/main/config_ONOFF.h
+++ b/main/config_ONOFF.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the ON OFF actuator
@@ -26,9 +26,11 @@
 #ifndef config_ONOFF_h
 #define config_ONOFF_h
 
+#include "TheengsCommon.h"
+
 extern void setupONOFF();
-extern void MQTTtoONOFF(char* topicOri, char* datacallback);
-extern void MQTTtoONOFF(char* topicOri, JsonObject& RFdata);
+extern void XtoONOFF(const char* topicOri, const char* datacallback);
+extern void XtoONOFF(const char* topicOri, JsonObject& RFdata);
 extern void stateONOFFMeasures();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
@@ -70,7 +72,7 @@ extern void stateONOFFMeasures();
 #ifndef ACTUATOR_ONOFF_GPIO
 #  ifdef ESP8266
 #    define ACTUATOR_ONOFF_GPIO 15 //12 for sonoff basic relay
-#  elif ESP32
+#  elif defined(ESP32)
 #    define ACTUATOR_ONOFF_GPIO 15
 #  else
 #    define ACTUATOR_ONOFF_GPIO 13
diff --git a/main/config_PWM.h b/main/config_PWM.h
index c5a6122..bdb56a9 100644
--- a/main/config_PWM.h
+++ b/main/config_PWM.h
@@ -1,5 +1,5 @@
 /*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    This files enables you to set your parameters for the PWM actuator
 
@@ -22,12 +22,15 @@
 */
 
 /*-------------------PWM topics & parameters----------------------*/
+#ifndef config_PWM_h
+#define config_PWM_h
 
+#include "TheengsCommon.h"
 // PWM MQTT Subjects
 
 extern void setupPWM();
 extern void PWMLoop();
-extern void MQTTtoPWM(char*, JsonObject&);
+extern void XtoPWM(const char*, JsonObject&);
 
 #define subjectMQTTtoPWM          "/commands/MQTTtoPWM"
 #define subjectMQTTtoPWMset       subjectMQTTtoPWM "/set" //set channel(s) with JSON struct {"r":0-1,"g":0-1,"b":0-1,"w0":0-1,"w0":0-1,"fade":<fade time in seconds>}
@@ -55,3 +58,5 @@ extern void MQTTtoPWM(char*, JsonObject&);
 #ifndef PWM_DEFAULT_GAMMA
 #  define PWM_DEFAULT_GAMMA 2.2f
 #endif
+
+#endif // config_PWM_h
diff --git a/main/config_RF.h b/main/config_RF.h
index 6c41275..9de6b3d 100644
--- a/main/config_RF.h
+++ b/main/config_RF.h
@@ -1,15 +1,15 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
- 
+
    This files enables to set your parameter for the radiofrequency gateways (ZgatewayRF and ZgatewayRF2) with RCswitch and newremoteswitch library
-  
+
     Copyright: (c)Florian ROBERT
-  
+
     This file is part of OpenMQTTGateway.
-    
+
     OpenMQTTGateway 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
@@ -25,36 +25,31 @@
 */
 #ifndef config_RF_h
 #define config_RF_h
+#pragma once
 
-#include <Arduino.h>
-#include <ArduinoJson.h>
+#include <rf/RFConfiguration.h>
 
 #ifdef ZgatewayRF
-extern void setupRF();
-extern void RFtoMQTT();
-extern void MQTTtoRF(char* topicOri, char* datacallback);
-extern void MQTTtoRF(char* topicOri, JsonObject& RFdata);
+extern void RFtoX();
+extern void XtoRF(const char* topicOri, const char* datacallback);
+extern void XtoRF(const char* topicOri, JsonObject& RFdata);
 extern void disableRFReceive();
-extern void enableRFReceive();
+extern void enableRFReceive(float rfFrequency, int rfReceiverGPIO, int rfEmitterGPIO);
 #endif
 #ifdef ZgatewayRF2
-extern void RF2toMQTT();
-extern void MQTTtoRF2(char* topicOri, char* datacallback);
-extern void MQTTtoRF2(char* topicOri, JsonObject& RFdata);
+extern void RF2toX();
+extern void XtoRF2(const char* topicOri, const char* datacallback);
+extern void XtoRF2(const char* topicOri, JsonObject& RFdata);
 extern void disableRF2Receive();
 extern void enableRF2Receive();
 #endif
 #ifdef ZgatewayPilight
 extern void setupPilight();
-extern void PilighttoMQTT();
-extern void MQTTtoPilight(char* topicOri, char* datacallback);
-extern void MQTTtoPilight(char* topicOri, JsonObject& RFdata);
+extern void PilighttoX();
 extern void disablePilightReceive();
 extern void enablePilightReceive();
 #endif
 #ifdef ZgatewayRTL_433
-#  include <rtl_433_ESP.h>
-rtl_433_ESP rtl_433;
 
 extern void RTL_433Loop();
 extern void setupRTL_433();
@@ -73,98 +68,118 @@ extern void launchRTL_433Discovery(bool overrideDiscovery);
 
 #    define uniqueIdSize  60 // longest model + longest key
 #    define modelNameSize 31 // longest model
+#    define typeSize      10 // longest type
 
 struct RTL_433device {
   char uniqueId[uniqueIdSize];
   char modelName[modelNameSize];
+  char type[typeSize];
   bool isDisc;
 };
 
-const char parameters[40][4][24] = {
+const char parameters[51][4][24] = {
     // RTL_433 key, name, unit, device_class
-    {"temperature_C", "temperature", "°C", "temperature"},
-    {"temperature_1_C", "temperature", "°C", "temperature"},
-    {"temperature_2_C", "temperature", "°C", "temperature"},
-    {"temperature_F", "temperature", "°F", "temperature"},
-    {"time", "timestamp", "", "timestamp"},
-    {"battery_ok", "battery", "%", "battery"},
-    {"humidity", "humidity", "%", "humidity"},
-    {"moisture", "moisture", "%", "humidity"},
-    {"pressure_hPa", "pressure", "hPa", "pressure"},
-    {"pressure_kPa", "pressure", "kPa", "pressure"},
-    {"wind_speed_km_h", "wind speed", "km/h", "wind_speed"},
-    {"wind_avg_km_h", "wind average", "km/h", "wind_speed"},
-    {"wind_avg_mi_h", "wind average", "mi/h", "wind_speed"},
-    {"wind_avg_m_s", "wind average", "m/s", "wind_speed"},
-    {"wind_speed_m_s", "wind speed", "m/s", "wind_speed"},
-    {"gust_speed_km_h", "gust speed", "km/h", "wind_speed"},
-    {"wind_max_km_h", "wind max", "km/h", "wind_speed"},
-    {"wind_max_m_s", "wind max", "m/s", "wind_speed"},
-    {"gust_speed_m_s", "gust speed", "m/s", "wind_speed"},
-    {"wind_dir_deg", "wind direction", "°", ""},
-    {"rain_mm", "rain", "mm", "precipitation"},
-    {"rain_rate_mm_h", "rain", "mm/h", "precipitation_intensity"},
-    {"rain_in", "rain", "in", "precipitation"},
-    {"rain_rate_in_h", "rain", "in/h", "precipitation_intensity"},
-    {"rssi", "rssi", "dB", "signal_strength"},
-    {"snr", "snr", "dB", ""},
-    {"noise", "noise", "dB", ""},
-    {"depth_cm", "depth", "cm", ""},
-    {"power_W", "power", "W", "power"},
-    {"light_lux", "light", "lx", ""},
-    {"lux", "lux", "lx", ""},
-    {"uv", "uv", "UV index", ""},
-    {"uvi", "uvi", "UV index", ""},
-    {"storm_dist", "storm distance", "mi", ""},
-    {"strike_distance", "strike distance", "mi", ""},
-    {"tamper", "tamper", "", ""},
-    {"alarm", "alarm", "", ""},
-    {"motion", "motion", "", "motion"},
-    {"strike_count", "strike count", "", ""}, // from rtl_433_mqtt_hass.py
-    {"event", "Status", "", "moisture"}};
+    {"alarm", "Alarm", "", ""},
+    {"battery_mV", "Battery Voltage", "mV", "voltage"},
+    {"battery_ok", "Battery", "", "battery"},
+    {"co2_ppm", "Carbon Dioxide", "ppm", "carbon_dioxide"},
+    {"depth_cm", "Depth", "cm", "distance"},
+    {"estimated_pm10_0_ug_m3", "Estimated PM10", "μg/m³", "pm10"},
+    {"event", "Status", "", ""},
+    {"group", "Group", "", ""},
+    {"gust_speed_km_h", "Gust speed", "km/h", "wind_speed"},
+    {"gust_speed_m_s", "Gust speed", "m/s", "wind_speed"},
+    {"humidity", "Humidity", "%", "humidity"},
+    {"light_lux", "Illuminance", "lx", "illuminance"},
+    {"lux", "Illuminance", "lx", "illuminance"},
+    {"moisture", "Moisture", "%", "humidity"},
+    {"motion", "Motion", "", "motion"},
+    {"noise", "Noise", "dB", "sound_pressure"},
+    {"pm1_ug_m3", "PM1", "μg/m³", "pm1"},
+    {"pm10_ug_m3", "PM10", "μg/m³", "pm10"},
+    {"pm2_5_ug_m3", "PM2.5", "μg/m³", "pm25"},
+    {"power_W", "Power", "W", "power"},
+    {"pressure_hPa", "Pressure", "hPa", "pressure"},
+    {"pressure_kPa", "Pressure", "kPa", "pressure"},
+    {"rain_in", "Rain", "in", "precipitation"},
+    {"rain_mm", "Rain", "mm", "precipitation"},
+    {"rain_rate_in_h", "Rain", "in/h", "precipitation_intensity"},
+    {"rain_rate_mm_h", "Rain", "mm/h", "precipitation_intensity"},
+    {"rssi", "RSSI", "dB", "signal_strength"},
+    {"snr", "SNR", "dB", ""},
+    {"state", "State", "", ""},
+    {"storm_dist_km", "Storm distance", "km", "distance"},
+    {"storm_dist", "Storm distance", "mi", "distance"},
+    {"strike_count", "Strike count", "", ""}, // from rtl_433_mqtt_hass.py
+    {"strike_distance_km", "Strike distance", "km", "distance"},
+    {"strike_distance", "Strike distance", "mi", "distance"},
+    {"tamper", "Tamper", "", ""},
+    {"temperature_1_C", "Temperature", "°C", "temperature"},
+    {"temperature_2_C", "Temperature", "°C", "temperature"},
+    {"temperature_C", "Temperature", "°C", "temperature"},
+    {"temperature_F", "Temperature", "°F", "temperature"},
+    {"time", "Timestamp", "", "timestamp"},
+    {"unit", "Unit", "", ""},
+    {"uv", "UV value", "", ""},
+    {"uvi", "UV index", "", ""},
+    {"wind_avg_km_h", "Wind average", "km/h", "wind_speed"},
+    {"wind_avg_m_s", "Wind average", "m/s", "wind_speed"},
+    {"wind_avg_mi_h", "Wind average", "mi/h", "wind_speed"},
+    {"wind_dir_deg", "Wind direction", "°", ""},
+    {"wind_max_km_h", "Wind max", "km/h", "wind_speed"},
+    {"wind_max_m_s", "Wind max", "m/s", "wind_speed"},
+    {"wind_speed_km_h", "Wind speed", "km/h", "wind_speed"},
+    {"wind_speed_m_s", "Wind speed", "m/s", "wind_speed"}};
 #  endif
 #  ifdef RTL_433_DISCOVERY_LOGGING
-#    define DISCOVERY_TRACE_LOG(...) Log.trace(__VA_ARGS__)
+#    define DISCOVERY_TRACE_LOG(...) THEENGS_LOG_TRACE(__VA_ARGS__)
 #  else
 #    define DISCOVERY_TRACE_LOG(...)
 #  endif
 #endif
+
+extern RFConfiguration iRFConfig;
+
 /*-------------------RF topics & parameters----------------------*/
 //433Mhz MQTT Subjects and keys
-#define subjectMQTTtoRF       "/commands/MQTTto433"
-#define subjectRFtoMQTT       "/433toMQTT"
-#define subjectcommonRFtoMQTT "/RFtoMQTT"
-#define subjectGTWRFtoMQTT    "/433toMQTT"
-#define RFprotocolKey         "433_" // protocol will be defined if a subject contains RFprotocolKey followed by a value of 1 digit
-#define RFbitsKey             "RFBITS_" // bits  will be defined if a subject contains RFbitsKey followed by a value of 2 digits
-#define repeatRFwMQTT         false // do we repeat a received signal by using MQTT with RF gateway
-#define RFpulselengthKey      "PLSL_" // pulselength will be defined if a subject contains RFprotocolKey followed by a value of 3 digits
+#define subjectMQTTtoRF              "/commands/MQTTto433"
+#define subjectRFtoMQTT              "/433toMQTT"
+#define subjectRFtoMQTTvalueAsATopic "/433toMQTT/#"
+#define subjectcommonRFtoMQTT        "/RFtoMQTT"
+#define subjectGTWRFtoMQTT           "/433toMQTT"
+#define RFprotocolKey                "433_" // protocol will be defined if a subject contains RFprotocolKey followed by a value of 1 digit
+#define RFbitsKey                    "RFBITS_" // bits  will be defined if a subject contains RFbitsKey followed by a value of 2 digits
+#define repeatRFwMQTT                false // do we repeat a received signal by using MQTT with RF gateway
+#define RFpulselengthKey             "PLSL_" // pulselength will be defined if a subject contains RFprotocolKey followed by a value of 3 digits
 // subject monitored to listen traffic processed by other gateways to store data and avoid ntuple
 #define subjectMultiGTWRF "+/+/433toMQTT"
 //RF number of signal repetition - Can be overridden by specifying "repeat" in a JSON message.
 #define RF_EMITTER_REPEAT  20
 #define RF2_EMITTER_REPEAT 2 // Actual repeats is 2^R, where R is the here configured amount
 //#define RF_DISABLE_TRANSMIT //Uncomment this line to disable RF transmissions. (RF Receive will work as normal.)
-#define RFmqttDiscovery true //uncomment this line so as to create a discovery switch for each RF signal received
+//#define RF_on_HAS_as_DeviceTrigger //uncomment this line so as to create a Home Assistant device trigger for each RF signal received
+#define RF_on_HAS_as_MQTTSensor //uncomment this line so as to create a Home Assistant MQTT sensor for each RF signal received
 
 /*-------------------RF2 topics & parameters----------------------*/
 //433Mhz newremoteswitch MQTT Subjects and keys
-#define subjectMQTTtoRF2    "/commands/MQTTtoRF2"
-#define subjectRF2toMQTT    "/RF2toMQTT"
-#define subjectGTWRF2toMQTT "/RF2toMQTT"
-#define RF2codeKey          "ADDRESS_" // code will be defined if a subject contains RF2codeKey followed by a value of 7 digits
-#define RF2periodKey        "PERIOD_" // period  will be defined if a subject contains RF2periodKey followed by a value of 3 digits
-#define RF2unitKey          "UNIT_" // number of your unit value  will be defined if a subject contains RF2unitKey followed by a value of 1-2 digits
-#define RF2groupKey         "GROUP_" // number of your group value  will be defined if a subject contains RF2groupKey followed by a value of 1 digit
-#define RF2dimKey           "DIM" // number of your dim value will be defined if a subject contains RF2dimKey and the payload contains the dim value as digits
+#define subjectMQTTtoRF2              "/commands/MQTTtoRF2"
+#define subjectRF2toMQTT              "/RF2toMQTT"
+#define subjectRF2toMQTTvalueAsATopic "/RF2toMQTT/#"
+#define subjectGTWRF2toMQTT           "/RF2toMQTT"
+#define RF2codeKey                    "ADDRESS_" // code will be defined if a subject contains RF2codeKey followed by a value of 7 digits
+#define RF2periodKey                  "PERIOD_" // period  will be defined if a subject contains RF2periodKey followed by a value of 3 digits
+#define RF2unitKey                    "UNIT_" // number of your unit value  will be defined if a subject contains RF2unitKey followed by a value of 1-2 digits
+#define RF2groupKey                   "GROUP_" // number of your group value  will be defined if a subject contains RF2groupKey followed by a value of 1 digit
+#define RF2dimKey                     "DIM" // number of your dim value will be defined if a subject contains RF2dimKey and the payload contains the dim value as digits
 
 /*-------------------ESPPiLight topics & parameters----------------------*/
 //433Mhz Pilight MQTT Subjects and keys
-#define subjectMQTTtoPilight         "/commands/MQTTtoPilight"
-#define subjectMQTTtoPilightProtocol "/commands/MQTTtoPilight/protocols"
-#define subjectPilighttoMQTT         "/PilighttoMQTT"
-#define subjectGTWPilighttoMQTT      "/PilighttoMQTT"
-#define repeatPilightwMQTT           false // do we repeat a received signal by using MQTT with Pilight gateway
+#define subjectMQTTtoPilight              "/commands/MQTTtoPilight"
+#define subjectMQTTtoPilightProtocol      "/commands/MQTTtoPilight/protocols"
+#define subjectPilighttoMQTT              "/PilighttoMQTT"
+#define subjectPilighttoMQTTvalueAsATopic "/PilighttoMQTT/#"
+#define subjectGTWPilighttoMQTT           "/PilighttoMQTT"
+#define repeatPilightwMQTT                false // do we repeat a received signal by using MQTT with Pilight gateway
 //#define Pilight_rawEnabled true   // enables Pilight RAW return - switchable via MQTT
 
 /*-------------------RTL_433 topics & parameters----------------------*/
@@ -175,7 +190,7 @@ const char parameters[40][4][24] = {
 /*-------------------RF frequency----------------------*/
 //Match frequency to the hardware version of the radio used.
 #ifndef RF_FREQUENCY
-#  define RF_FREQUENCY 433.92
+#  define RF_FREQUENCY 433.92f
 #endif
 
 /**
@@ -186,13 +201,6 @@ const char parameters[40][4][24] = {
  * 4 = ZgatewayRF2
  */
 
-struct RFConfig_s {
-  float frequency;
-  int rssiThreshold;
-  int newOokThreshold;
-  int activeReceiver;
-};
-
 #define ACTIVE_NONE     -1
 #define ACTIVE_RECERROR 0
 #define ACTIVE_PILIGHT  1
@@ -200,7 +208,17 @@ struct RFConfig_s {
 #define ACTIVE_RTL      3
 #define ACTIVE_RF2      4
 
-RFConfig_s RFConfig;
+#ifdef ZgatewayRF
+#  define ACTIVE_RECEIVER ACTIVE_RF
+#elif defined(ZgatewayRF2)
+#  define ACTIVE_RECEIVER ACTIVE_RF2
+#elif defined(ZgatewayPilight)
+#  define ACTIVE_RECEIVER ACTIVE_PILIGHT
+#elif defined(ZgatewayRTL_433)
+#  define ACTIVE_RECEIVER ACTIVE_RTL
+#else
+#  define ACTIVE_RECEIVER ACTIVE_NONE
+#endif
 
 /*-------------------CC1101 DefaultTXPower----------------------*/
 //Adjust the default TX-Power for sending radio if ZradioCC1101 is used.
@@ -212,23 +230,17 @@ RFConfig_s RFConfig;
 /*-------------------PIN DEFINITIONS----------------------*/
 #ifndef RF_RECEIVER_GPIO
 #  ifdef ESP8266
-#    define RF_RECEIVER_GPIO 0 // D3 on nodemcu // put 4 with rf bridge direct mod
-#  elif ESP32
+#    define RF_RECEIVER_GPIO 4 // D2 on nodemcu, don't use 0 (D3): a receiver holding it low at reset forces the ESP8266 into flash mode
+#  elif defined(ESP32)
 #    define RF_RECEIVER_GPIO 27 // D27 on DOIT ESP32
-#  elif __AVR_ATmega2560__
-#    define RF_RECEIVER_GPIO 1 //1 = D3 on mega
-#  else
-#    define RF_RECEIVER_GPIO 1 //1 = D3 on arduino
 #  endif
 #endif
 
 #ifndef RF_EMITTER_GPIO
 #  ifdef ESP8266
 #    define RF_EMITTER_GPIO 3 // RX on nodemcu if it doesn't work with 3, try with 4 (D2) // put 5 with rf bridge direct mod
-#  elif ESP32
+#  elif defined(ESP32)
 #    define RF_EMITTER_GPIO 12 // D12 on DOIT ESP32
-#  elif __AVR_ATmega2560__
-#    define RF_EMITTER_GPIO 4
 #  else
 //IMPORTANT NOTE: On arduino UNO connect IR emitter pin to D9 , comment #define IR_USE_TIMER2 and uncomment #define IR_USE_TIMER1 on library <library>IRremote/boarddefs.h so as to free pin D3 for RF RECEIVER PIN
 //RF PIN definition
diff --git a/main/config_RFM69.h b/main/config_RFM69.h
index a8d7037..1ab570f 100644
--- a/main/config_RFM69.h
+++ b/main/config_RFM69.h
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This files enables to set your parameter for the radiofrequency gateways (ZgatewayRF and ZgatewayRF2) with RCswitch and newremoteswitch library
@@ -26,10 +26,12 @@
 #ifndef config_RFM69_h
 #define config_RFM69_h
 
+#include "TheengsCommon.h"
+
 extern void setupRFM69();
-extern bool RFM69toMQTT();
-extern void MQTTtoRFM69(char* topicOri, char* datacallback);
-extern void MQTTtoRFM69(char* topicOri, JsonObject& RFdata);
+extern bool RFM69toX();
+extern void XtoRFM69(const char* topicOri, const char* datacallback);
+extern void XtoRFM69(const char* topicOri, JsonObject& RFdata);
 /*----------------------RFM69 topics & parameters -------------------------*/
 // Topic where the message from RFM69 will be published by the gateway,
 // appended with the nodeID of the sender
@@ -43,12 +45,12 @@ extern void MQTTtoRFM69(char* topicOri, JsonObject& RFdata);
 #define defaultRFM69ReceiverId 99
 
 // Default values
-const char PROGMEM ENCRYPTKEY[] = "sampleEncryptKey";
-const char PROGMEM MDNS_NAME[] = "rfm69gw1";
-const char PROGMEM MQTT_BROKER[] = "raspi2";
-const char PROGMEM RFM69AP_NAME[] = "RFM69-AP";
-#define NETWORKID 200 //the same on all nodes that talk to each other
-#define NODEID    10
+#define RFM69_ENCRYPTKEY   "sampleEncryptKey";
+#define RFM69_MDNS_NAME    "rfm69gw1";
+#define RFM69_MQTT_BROKER  "raspi2";
+#define RFM69_RFM69AP_NAME "RFM69-AP";
+#define RFM69_NETWORKID    200 //the same on all nodes that talk to each other
+#define RFM69_NODEID       10
 
 //Match frequency to the hardware version of the radio
 #define FREQUENCY RF69_433MHZ
diff --git a/main/config_RN8209.h b/main/config_RN8209.h
index 744ce39..ca5c5b7 100644
--- a/main/config_RN8209.h
+++ b/main/config_RN8209.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the RN8209 sensor
@@ -27,7 +27,7 @@
 #define config_RN8209_h
 
 extern void setupRN8209();
-extern void RN8209toMQTT();
+extern void RN8209toX();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 #define subjectRN8209toMQTT "/RN8209toMQTT"
@@ -43,6 +43,10 @@ extern void RN8209toMQTT();
 #  define RN8209_EC 28250
 #endif
 
+#ifndef RN8209_TASK_STACK_SIZE_OVERRIDE
+#  define RN8209_TASK_STACK_SIZE_OVERRIDE 5500
+#endif
+
 #ifndef TimeBetweenReadingRN8209
 #  define TimeBetweenReadingRN8209 500 // time between 2 RN8209 readings in ms
 #endif
diff --git a/main/config_RS232.h b/main/config_RS232.h
deleted file mode 100644
index a91cbe1..0000000
--- a/main/config_RS232.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
-
-   Act as a wifi or ethernet gateway between your RS232 device and a MQTT broker 
-   Send and receiving command by MQTT
- 
-   This files enables to set your parameter for the RS232 gateway 
-  
-    Copyright: (c)Florian ROBERT
-  
-    This file is part of OpenMQTTGateway.
-    
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#ifndef config_RS232_h
-#define config_RS232_h
-
-extern void setupRS232();
-extern void RS232toMQTT();
-extern void MQTTtoRS232(char* topicOri, JsonObject& RS232data);
-
-/*-------------------RS232 topics & parameters----------------------*/
-
-// Settings RS232 to MQTT topic
-#define subjectRS232toMQTT "/RS232toMQTT"
-
-// setting to specify mode used for sending MQTT messages:
-//   0: RAW: all recieved input at RS232 interface is collected in single MQTT message
-//      defined by RS232toMQTTsubject
-//
-//   1: JSON: Assumes input at RS232 interface to be valid JSON. JSON keys are used to
-//      split the JSON data in separate MQTT sub-topics. This will be repeated for
-//      sub-keys up to the specified nesting level (RS232maxJSONlevel).
-//
-//      EXAMPLE: "{temperature: {sens1: 22, sens2: 23}, humidity: {sens1: 80, sens2: 60}}"
-//        - with RS232maxJSONlevel=1:
-//            ./RS232toMQTT/temperature  ==> "{sens1: 22, sens2: 23}"
-//            ./RS232toMQTT/humidity     ==> "{sens1: 80, sens2: 60}"
-//
-//        - with RS232maxJSONlevel=2 (or higher):
-//            ./RS232toMQTT/temperature/sens1 ==> 22
-//            ./RS232toMQTT/temperature/sens2 ==> 23
-//            ./RS232toMQTT/humidity/sens1 ==> 80
-//            ./RS232toMQTT/humidity/sens2 ==> 60
-//
-#ifndef RS232toMQTTmode
-#  define RS232toMQTTmode 0
-#endif
-
-// settings for RS232TopicMode 0 (RAW)
-#define RS232InPost '\n' // Hacky way to get last character of postfix for incoming
-#define MAX_INPUT   200 // how much serial data we expect
-
-// settings for RS232TopicMode 1 (JSON)
-#define RS232maxJSONlevel 2 // Max nested level in which JSON keys are converted to seperate sub-topics
-#define RS232JSONDocSize  1024 // bytes to reserve for the JSON doc
-
-// settings for MQTT to RS232
-#define subjectMQTTtoRS232 "/commands/MQTTtoRS232"
-#define RS232Pre           "00" // The prefix for the RS232 message
-#define RS232Post          "\r" // The postfix for the RS232 message
-
-//Setup for RS232
-#ifndef RS232Baud
-#  define RS232Baud 9600 // The serial connection Baud
-#endif
-
-/*-------------------PIN DEFINITIONS----------------------*/
-#ifndef RS232_UART
-// set hardware serial UART to be used for device communication or
-// use software emulaton if not defined
-//
-// VALUES:
-//  -  not defined: use software emulation (pins set by RS232_RX_GPIO & RS232_TX_GPIO)
-//
-//  -  0: use HW UART0 (serial), warning: default used for logging & usb
-//        ESP8266:     (TX0 GPIO1,  RX0 GPIO3)
-//                     (TX0 GPIO15, RX0 GPIO13) with UART0 swap enabled
-//        ESP32:       (TX0 by RS232_TX_GPIO, RX0 by RS232_RX_GPIO)
-//        ATmega2560:  (TX0 pin1, RX0 pin0)
-//        Arduino Uno: (TX0 pin1, RX0 pin0)
-//
-//  -  1: use HW UART1 (serial1)
-//        ESP8266:     (TX1 GPIO2,  RX none) only transmit available
-//        ESP32:       (TX1 by RS232_TX_GPIO,  RX1 by RS232_RX_GPIO)
-//        ATmega2560:  (TX1 pin18, RX1 pin19)
-//        Arduino Uno: N/A
-//
-//  -  2: use HW UART2 (serial2)
-//        ESP8266:     N/A
-//        ESP32:       (TX2 by RS232_TX_GPIO,  RX2 by RS232_RX_GPIO)
-//        ATmega2560:  (TX2 pin16, RX1 pin17)
-//        Arduino Uno: N/A
-//
-//  -  3: use HW UART3 (serial3)
-//        ESP8266:     N/A
-//        ESP32:       N/A
-//        ATmega2560:  (TX2 pin14, RX1 pin15)
-//        Arduino Uno: N/A
-//
-// defaults
-#  ifdef ESP32
-#    define RS232_UART 1 // use HW UART ESP32
-#  else
-#    undef RS232_UART // default use software serial
-//#  define RS232_UART 1 // define to use HW UART
-#  endif
-#endif
-
-#ifndef RS232_UART0_SWAP
-// option for ESP8266 only to swap UART0 ports from (GPIO1,GPIO3) to (GPIO15,GPIO13)
-#  define RS232_UART0_SWAP
-#endif
-
-#ifndef RS232_RX_GPIO
-// define receive pin (for software serial or ESP32 with configurable HW UART)
-#  if defined(ESP8266) && !defined(RS232_UART)
-#    define RS232_RX_GPIO 4 //D2
-#  elif defined(ESP32)
-#    define RS232_RX_GPIO 26
-#  elif defined(__AVR_ATmega2560__) && !defined(RS232_UART)
-#    define RS232_RX_GPIO 2 // 2 = D2 on arduino mega
-#  else
-#    define RS232_RX_GPIO 0 // 0 = D2 on arduino UNO
-#  endif
-#endif
-
-#ifndef RS232_TX_GPIO
-// define transmit pin (for software serial and/or ESP32)
-#  if defined(ESP8266) && !defined(RS232_UART)
-#    define RS232_TX_GPIO 2 //D4
-#  elif ESP32
-#    define RS232_TX_GPIO 14
-#  elif defined(__AVR_ATmega2560__) && !defined(RS232_UART)
-#    define RS232_TX_GPIO 9
-#  else
-#    define RS232_TX_GPIO 9
-#  endif
-#endif
-
-#endif
\ No newline at end of file
diff --git a/main/config_SERIAL.h b/main/config_SERIAL.h
new file mode 100644
index 0000000..00cf5d1
--- /dev/null
+++ b/main/config_SERIAL.h
@@ -0,0 +1,145 @@
+/*  
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+
+   Act as a wifi or ethernet gateway between your SERIAL device and a MQTT broker 
+   Send and receiving command by MQTT
+ 
+   This files enables to set your parameter for the SERIAL gateway 
+  
+    Copyright: (c)Florian ROBERT
+  
+    This file is part of OpenMQTTGateway.
+    
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+#ifndef config_SERIAL_h
+#define config_SERIAL_h
+
+#include "TheengsCommon.h"
+
+extern void setupSERIAL();
+extern void SERIALtoX();
+extern bool XtoSERIAL(const char* topicOri, JsonObject& SERIALdata);
+
+/*-------------------SERIAL topics & parameters----------------------*/
+
+// Settings SERIAL to MQTT topic
+#define subjectSERIALtoMQTT "/SERIALtoMQTT"
+
+// setting to specify mode used for sending MQTT messages:
+//   0: RAW: all recieved input at SERIAL interface is collected in single MQTT message
+//      defined by SERIALtoMQTTsubject
+//
+//   1: JSON: Assumes input at SERIAL interface to be valid JSON. JSON keys are used to
+//      split the JSON data in separate MQTT sub-topics. This will be repeated for
+//      sub-keys up to the specified nesting level (SERIALmaxJSONlevel).
+//
+//      EXAMPLE: "{temperature: {sens1: 22, sens2: 23}, humidity: {sens1: 80, sens2: 60}}"
+//        - with SERIALmaxJSONlevel=1:
+//            ./SERIALtoMQTT/temperature  ==> "{sens1: 22, sens2: 23}"
+//            ./SERIALtoMQTT/humidity     ==> "{sens1: 80, sens2: 60}"
+//
+//        - with SERIALmaxJSONlevel=2 (or higher):
+//            ./SERIALtoMQTT/temperature/sens1 ==> 22
+//            ./SERIALtoMQTT/temperature/sens2 ==> 23
+//            ./SERIALtoMQTT/humidity/sens1 ==> 80
+//            ./SERIALtoMQTT/humidity/sens2 ==> 60
+//
+#ifndef SERIALtoMQTTmode
+#  define SERIALtoMQTTmode 0
+#endif
+
+// settings for SERIALTopicMode 0 (RAW)
+#define SERIALInPost '\n' // Hacky way to get last character of postfix for incoming
+#define MAX_INPUT    JSON_MSG_BUFFER // how much serial data we expect
+
+// settings for SERIALTopicMode 1 (JSON)
+#define SERIALmaxJSONlevel 2 // Max nested level in which JSON keys are converted to seperate sub-topics
+
+// settings for MQTT to SERIAL
+#define subjectMQTTtoSERIAL "/commands/MQTTtoSERIAL"
+#ifndef SERIALPre
+#  define SERIALPre "00" // The prefix for the SERIAL message
+#endif
+#ifndef SERIALPost
+#  define SERIALPost "\r" // The postfix for the SERIAL message
+#endif
+
+//Setup for SERIAL
+#ifndef SERIALBaud
+#  define SERIALBaud 9600 // The serial connection Baud
+#endif
+
+#ifndef SERIAL_CONFIG
+#  define SERIAL_CONFIG SERIAL_8N1 // The serial frame format (data/parity/stop bits), e.g. SERIAL_8E1 for 8 data bits/even parity/1 stop bit
+#endif
+
+/*-------------------PIN DEFINITIONS----------------------*/
+#ifndef SERIAL_UART
+// set hardware serial UART to be used for device communication or
+// use software emulaton if not defined
+//
+// VALUES:
+//  -  not defined: use software emulation (pins set by SERIAL_RX_GPIO & SERIAL_TX_GPIO)
+//
+//  -  0: use HW UART0 (serial), warning: default used for logging & usb
+//        ESP8266:     (TX0 GPIO1,  RX0 GPIO3)
+//                     (TX0 GPIO15, RX0 GPIO13) with UART0 swap enabled
+//        ESP32:       (TX0 by SERIAL_TX_GPIO, RX0 by SERIAL_RX_GPIO)
+//
+//  -  1: use HW UART1 (serial1)
+//        ESP8266:     (TX1 GPIO2,  RX none) only transmit available
+//        ESP32:       (TX1 by SERIAL_TX_GPIO,  RX1 by SERIAL_RX_GPIO)
+//
+//  -  2: use HW UART2 (serial2)
+//        ESP8266:     N/A
+//        ESP32:       (TX2 by SERIAL_TX_GPIO,  RX2 by SERIAL_RX_GPIO)
+//
+//  -  3: use HW UART3 (serial3)
+//        ESP8266:     N/A
+//        ESP32:       N/A
+//
+// defaults
+#  ifdef ESP32
+#    define SERIAL_UART 1 // use HW UART ESP32
+#  else
+#    undef SERIAL_UART // default use software serial
+//#  define SERIAL_UART 1 // define to use HW UART
+#  endif
+#endif
+
+#ifndef SERIAL_UART0_SWAP
+// option for ESP8266 only to swap UART0 ports from (GPIO1,GPIO3) to (GPIO15,GPIO13)
+#  define SERIAL_UART0_SWAP
+#endif
+
+#ifndef SERIAL_RX_GPIO
+// define receive pin (for software serial or ESP32 with configurable HW UART)
+#  if defined(ESP8266) && !defined(SERIAL_UART)
+#    define SERIAL_RX_GPIO 4 //D2
+#  elif defined(ESP32)
+#    define SERIAL_RX_GPIO 26
+#  endif
+#endif
+
+#ifndef SERIAL_TX_GPIO
+// define transmit pin (for software serial and/or ESP32)
+#  if defined(ESP8266) && !defined(SERIAL_UART)
+#    define SERIAL_TX_GPIO 2 //D4
+#  elif defined(ESP32)
+#    define SERIAL_TX_GPIO 14
+#  endif
+#endif
+
+#endif
\ No newline at end of file
diff --git a/main/config_SHTC3.h b/main/config_SHTC3.h
index 0f26535..b1a4686 100644
--- a/main/config_SHTC3.h
+++ b/main/config_SHTC3.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the SHTC311/22 sensor
@@ -27,7 +27,7 @@
 #define config_SHTC3_h
 
 extern void setupSHTC3();
-extern void SHTC3toMQTT();
+extern void SHTC3toX();
 
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
diff --git a/main/config_SRFB.h b/main/config_SRFB.h
index c617389..362539b 100644
--- a/main/config_SRFB.h
+++ b/main/config_SRFB.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the radiofrequency gateway on sonoff rf bridge (ZgatewaySRFB)
@@ -27,10 +27,12 @@
 #ifndef config_SRFB_h
 #define config_SRFB_h
 
+#include "TheengsCommon.h"
+
 extern void setupSRFB();
-extern bool SRFBtoMQTT();
-extern void MQTTtoSRFB(char* topicOri, char* datacallback);
-extern void MQTTtoSRFB(char* topicOri, JsonObject& RFdata);
+extern bool SRFBtoX();
+extern void XtoSRFB(const char* topicOri, const char* datacallback);
+extern void XtoSRFB(const char* topicOri, JsonObject& RFdata);
 /*-------------------RF topics & parameters----------------------*/
 //433Mhz MQTT Subjects and keys
 #define subjectMQTTtoSRFB      "/commands/MQTTtoSRFB"
diff --git a/main/config_SSD1306.h b/main/config_SSD1306.h
index 6f66229..526b2ce 100644
--- a/main/config_SSD1306.h
+++ b/main/config_SSD1306.h
@@ -1,7 +1,7 @@
 /*  
   OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
     Supported boards with displays
@@ -34,11 +34,7 @@
 #ifndef config_SSD1306_h
 #define config_SSD1306_h
 
-#include <Arduino.h>
-#include <ArduinoJson.h>
-#include <Wire.h>
-
-#include "SSD1306Wire.h"
+#include "TheengsCommon.h"
 #include "config_WebUI.h"
 
 /*-------------------DEFINE LOG LEVEL----------------------*/
@@ -105,17 +101,33 @@
 #define subjectMQTTtoSSD1306set "/commands/MQTTtoSSD1306/config"
 #define subjectSSD1306toMQTT    "/SSD1306toMQTT"
 
+/*-------------------Display Blanking via Touch----------------------*/
+
+#ifdef DISPLAY_BLANKING
+#  ifndef DISPLAY_BLANKING_TOUCH_GPIO
+#    define DISPLAY_BLANKING_TOUCH_GPIO 2 // GPIO pin for touch sensor
+#  endif
+#  ifndef DISPLAY_BLANKING_START
+#    define DISPLAY_BLANKING_START 30 // 30 seconds after last touch
+#  endif
+#  ifndef DISPLAY_BLANKING_THRESHOLD
+#    define DISPLAY_BLANKING_THRESHOLD 10
+#  endif
+#  define TOUCH_READINGS  100 // Number of readings to average
+#  define TOUCH_THRESHOLD 0.2 // 20% change in reading
+#endif
+
 /*-------------------EXTERNAL FUNCTIONS----------------------*/
 
 extern void setupSSD1306();
 extern void loopSSD1306();
-extern void MQTTtoSSD1306(char*, JsonObject&);
+extern void XtoSSD1306(const char*, JsonObject&);
 extern String stateSSD1306Display();
 
 // Simple construct for displaying message in lcd and oled displays
 
 #define displayPrint(...) \
-  if (lowpowermode < 2) ssd1306Print(__VA_ARGS__) // only print if not in low power mode
+  if (SYSConfig.powerMode < 1) ssd1306Print(__VA_ARGS__) // only print if not in low power mode
 #define lpDisplayPrint(...) ssd1306Print(__VA_ARGS__) // print in low power mode
 
 void ssd1306Print(char*, char*, char*);
@@ -124,53 +136,4 @@ void ssd1306Print(char*);
 
 /*-------------------End of Global Variables----------------------*/
 
-// This pattern was borrowed from HardwareSerial and modified to support the ssd1306 display
-
-class OledSerial : public Stream {
-public:
-  OledSerial(int);
-  void begin();
-  void drawLogo(int xshift, int yshift);
-  boolean displayPage(webUIQueueMessage*);
-
-  SSD1306Wire* display;
-
-  int available(void); // Dummy functions
-  int peek(void); // Dummy functions
-  int read(void); // Dummy functions
-  void flush(void); // Dummy functions
-
-  void fillScreen(OLEDDISPLAY_COLOR); // fillScreen display and set color
-
-  // This is a bit of lazy programmer simplification for the semaphore and core detecting code.  Not sure if it is truly space efficient.
-
-  inline size_t write(uint8_t x) {
-    return write(&x, 1);
-  }
-
-  size_t write(const uint8_t* buffer, size_t size);
-  inline size_t write(const char* buffer, size_t size) {
-    return write((uint8_t*)buffer, size);
-  }
-  inline size_t write(const char* s) {
-    return write((uint8_t*)s, strlen(s));
-  }
-  inline size_t write(unsigned long n) {
-    return write((uint8_t)n);
-  }
-  inline size_t write(long n) {
-    return write((uint8_t)n);
-  }
-  inline size_t write(unsigned int n) {
-    return write((uint8_t)n);
-  }
-  inline size_t write(int n) {
-    return write((uint8_t)n);
-  }
-
-protected:
-};
-
-extern OledSerial Oled;
-
 #endif
diff --git a/main/config_Somfy.h b/main/config_Somfy.h
index dc397af..5d3533e 100644
--- a/main/config_Somfy.h
+++ b/main/config_Somfy.h
@@ -1,6 +1,6 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
   This actor enables to:
@@ -24,11 +24,10 @@
 #ifndef config_Somfy_h
 #define config_Somfy_h
 
-#include <Arduino.h>
-#include <ArduinoJson.h>
+#include "TheengsCommon.h"
 
 extern void setupSomfy();
-extern void MQTTtoSomfy(char* topicOri, JsonObject& RFdata);
+extern void XtoSomfy(const char* topicOri, JsonObject& RFdata);
 /*----------------------------USER PARAMETERS-----------------------------*/
 #define EEPROM_ADDRESS_START 0
 #define SOMFY_REMOTE_NUM     1
diff --git a/main/config_TEMT6000.h b/main/config_TEMT6000.h
index e8dac39..2d71363 100644
--- a/main/config_TEMT6000.h
+++ b/main/config_TEMT6000.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This is the Light Meter Addon based on modules with a TEMT6000:
@@ -49,7 +49,4 @@ extern void MeasureLightIntensityTEMT6000();
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 #define subjectTEMT6000toMQTT "/LIGHTtoMQTT"
 
-//Time used to wait for an interval before resending measured values
-unsigned long timetemt6000 = 0;
-
 #endif
\ No newline at end of file
diff --git a/main/config_TSL2561.h b/main/config_TSL2561.h
index 17d804a..b319146 100644
--- a/main/config_TSL2561.h
+++ b/main/config_TSL2561.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker  
    Send and receiving command by MQTT
  
    This files exposes light level measured by a TSL2651 module
@@ -27,13 +27,13 @@
    Connection Schemata:
    --------------------
 
-   TSL2561 ------> Arduino Uno ----------> ESP8266
-   ==============================================
-   Vcc ---------> 3.3V -----------------> Vu (3.3V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
-   ADD ---------> N/C (Not Connected) --> N/C (Not Connected)
+   TSL2561 ------> ESP8266
+   ===================================
+   Vcc ---------> Vu (3.3V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
+   ADD ---------> N/C (Not Connected)
 
 */
 #ifndef config_TSL2561_h
@@ -48,8 +48,4 @@ extern void MeasureLightIntensityTSL2561();
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 #define subjectTSL12561toMQTT "/LIGHTtoMQTT"
 
-//Time used to wait for an interval before resending measured values
-unsigned long timetsl2561 = 0;
-//int TSL2561_i2c_addr = 0x37; // Light Sensor I2C Address (Set in Adafruit library)
-
 #endif
\ No newline at end of file
diff --git a/main/config_Touch.h b/main/config_Touch.h
index 4a537ad..0e9c991 100644
--- a/main/config_Touch.h
+++ b/main/config_Touch.h
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This files enables to set your parameter for the esp32's touch buttons
@@ -28,10 +28,10 @@
 #define config_Touch_h
 
 extern void setupTouch();
-extern void touchToMQTT();
+extern void touchtoX();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
-#define TOUCHTOPIC "/touchToMQTT"
+#define subjectTouchtoMQTT "/touchToMQTT"
 
 // Time between readings of the touch sensor. Don't make it too short, as
 // reading one touch sensor takes 0.5 ms.
diff --git a/main/config_WeatherStation.h b/main/config_WeatherStation.h
index 2d2bdee..e91b701 100644
--- a/main/config_WeatherStation.h
+++ b/main/config_WeatherStation.h
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This files enables to set your parameter for the DHT11/22 sensor
@@ -26,11 +26,8 @@
 #ifndef config_WeatherStation_h
 #define config_WeatherStation_h
 
-#include <Arduino.h>
-#include <ArduinoJson.h>
-
 extern void setupWeatherStation();
-extern void ZgatewayWeatherStationtoMQTT();
+extern void ZgatewayWeatherStationtoX();
 /*----------------------------USER PARAMETERS-----------------------------*/
 /*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
 #define subjectRFtoMQTT "/433toMQTT"
@@ -39,12 +36,8 @@ extern void ZgatewayWeatherStationtoMQTT();
 #ifndef RF_WS_RECEIVER_GPIO
 #  ifdef ESP8266
 #    define RF_WS_RECEIVER_GPIO 0 // D3 on nodemcu // put 4 with rf bridge direct mod
-#  elif ESP32
+#  elif defined(ESP32)
 #    define RF_WS_RECEIVER_GPIO 27 // D27 on DOIT ESP32
-#  elif __AVR_ATmega2560__
-#    define RF_WS_RECEIVER_GPIO 1 //1 = D3 on mega
-#  else
-#    define RF_WS_RECEIVER_GPIO 1 //1 = D3 on arduino
 #  endif
 #endif
 
diff --git a/main/config_WebContent.h b/main/config_WebContent.h
index 05104d2..11d0369 100644
--- a/main/config_WebContent.h
+++ b/main/config_WebContent.h
@@ -1,7 +1,7 @@
 /* 
  OpenMQTTGateway - ESP8266 or Arduino program for home automation 
 
- Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker 
+ Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker  
  Send and receiving command by MQTT
  
  This files enables to set your parameter for the DHT11/22 sensor
@@ -41,15 +41,15 @@
 #endif
 // Configuration Menu
 
-#define configure_1 "<p><form action='wi' method='get'><button>Configure WiFi</button></form></p>"
-#define configure_2 "<p><form action='mq' method='get'><button>Configure MQTT</button></form></p>"
+#define configure_1 "<p><form action='wi' method='post'><button>Configure WiFi</button></form></p>"
+#define configure_2 "<p><form action='mq' method='post'><button>Configure MQTT</button></form></p>"
 /*#if defined(ZgatewayCloud)
 #  define configure_3 "<p><form action='cl' method='get'><button>Configure Cloud</button></form></p>"
 #else
 #  define configure_3
 #endif*/
 #ifndef ESPWifiManualSetup
-#  define configure_3 "<p><form action='cg' method='get'><button>Configure Gateway</button></form></p>"
+#  define configure_3 "<p><form action='cg' method='post'><button>Configure Gateway</button></form></p>"
 #else
 #  define configure_3
 #endif
@@ -62,7 +62,11 @@
 #else
 #  define configure_6
 #endif
-#define configure_7
+#ifdef ZgatewayBT
+#  define configure_7 "<p><form action='bl' method='get'><button>Configure BLE</button></form></p>"
+#else
+#  define configure_7
+#endif
 #define configure_8
 
 /*------------------- ----------------------*/
@@ -99,16 +103,41 @@ const char information_body[] = body_header "<style>td {padding: 0px 5px;}</styl
 
 const char upgrade_body[] = body_header "<div id='f1' style='display:block;'><fieldset class=\"set1\"><legend><span><b>Upgrade by Web Server</b></span></legend><form method='get' action='up'><br><b>OTA URL</b><br><input id='o' placeholder=\"OTA_URL\" value=\"%s\"><br><br><button type='submit' class='button bgrn'>Start upgrade</button></form></fieldset><br><br><fieldset class=\"set1\"><legend><span><b>Upgrade to Level</b></span></legend><form method='get' action='up'><p><b>Level</b><br><select id='le'><option value='1'>Latest Release</option><option value='2'>Development</option></select></p><br><button type='submit' class='button bgrn'>Start upgrade</button></form></fieldset></div><div id='f2' style='display:none;text-align:center;'><b>Upload started ...</b></div><div id=but2d style=\"display: block;\"></div><p>" body_footer_main_menu;
 
-const char config_wifi_body[] = body_header "%s<br><div><a href='/wi?scan='><b>Scan for all WiFi Networks</b></a></div><br><fieldset class=\"set1\"><legend><span><b>WiFi Parameters</b></span></legend><form method='get' action='wi'><p><b>WiFi Network</b> () <br><input id='s1' placeholder=\"Type or Select your WiFi Network\" value=\"%s\"></p><p><label><b>WiFi Password</b></label><br><input id='p1' type='password' placeholder=\"Enter your WiFi Password\" ></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
-
-// mqtt server (mh), mqtt port (ml), mqtt username (mu), mqtt password (mp), secure connection (sc), server certificate (msc), topic (mt)
-
-const char config_mqtt_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>MQTT Parameters</b></span></legend><form method='get' action='mq'><p><b>MQTT Server</b><br><input id='mh' placeholder=" MQTT_SERVER " value='%s'></p><p><b>MQTT Port</b><br><input id='ml' placeholder=" MQTT_PORT " value='%s'></p><p><b>MQTT Username</b><br><input id='mu' placeholder=" MQTT_USER " value='%s'></p><p><label><b>MQTT Password</b></label><br><input id='mp' type='password' placeholder=\"Password\" ></p><p><b>MQTT Secure Connection</b><br><input id='sc' type='checkbox' %s></p><p><b>Gateway Name</b><br><input id='h' placeholder=" Gateway_Name " value=\"%s\"></p><p><b>MQTT Base Topic</b><br><input id='mt' placeholder='' value='%s'></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
-
-#ifndef ESPWifiManualSetup
-const char config_gateway_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>Gateway Configuration</b></span></legend><form method='get' action='cg'><p><b>Gateway Password (8 characters min)</b><br><input id='gp' type='password' placeholder=\"********\"  minlength='8'></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
+const char config_wifi_body[] = body_header "%s<br><div><a href='/wi?scan='><b>Scan for all WiFi Networks</b></a></div><br><fieldset class=\"set1\"><legend><span><b>WiFi Parameters</b></span></legend><form method='post' action='wi'><p><b>WiFi Network</b> () <br><input id='s1' name='s1' placeholder=\"Type or Select your WiFi Network\" value=\"%s\"></p><p><label><b>WiFi Password</b></label><br><input id='p1' name='p1' type='password' placeholder=\"Enter your WiFi Password\" ></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
+#ifdef ZmqttDiscovery
+// mqtt server (mh), mqtt port (ml), mqtt username (mu), mqtt password (mp), secure connection (sc), server certificate (msc), mqtt topic (mt), discovery prefix (dp)
+const char config_mqtt_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>MQTT Parameters</b></span></legend><form method='post' action='mq'><p><b>MQTT Server</b><br><input id='mh' name='mh' placeholder=" MQTT_SERVER " value='%s'></p><p><b>MQTT Port</b><br><input id='ml' name='ml' placeholder=" MQTT_PORT " value='%s'></p><p><b>MQTT Username</b><br><input id='mu' name='mu' placeholder=" MQTT_USER " value='%s'></p><p><label><b>MQTT Password</b></label><br><input id='mp' name='mp' type='password' placeholder=\"Password\" ></p><p><b>MQTT Secure Connection</b><br><input id='sc' name='sc' type='checkbox' %s></p><p><b>Gateway Name</b><br><input id='h' name='h' placeholder=" Gateway_Name " value=\"%s\"></p><p><b>MQTT Base Topic</b><br><input id='mt' name='mt' placeholder='' value='%s'></p><p><b>MQTT Discovery Prefix</b><br><input id='dp' name='dp' placeholder='' value='%s'></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
+#else
+// mqtt server (mh), mqtt port (ml), mqtt username (mu), mqtt password (mp), secure connection (sc), server certificate (msc), mqtt topic (mt)
+const char config_mqtt_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>MQTT Parameters</b></span></legend><form method='post' action='mq'><p><b>MQTT Server</b><br><input id='mh' name='mh' placeholder=" MQTT_SERVER " value='%s'></p><p><b>MQTT Port</b><br><input id='ml' name='ml' placeholder=" MQTT_PORT " value='%s'></p><p><b>MQTT Username</b><br><input id='mu' name='mu' placeholder=" MQTT_USER " value='%s'></p><p><label><b>MQTT Password</b></label><br><input id='mp' name='mp' type='password' placeholder=\"Password\" ></p><p><b>MQTT Secure Connection</b><br><input id='sc' name='sc' type='checkbox' %s></p><p><b>Gateway Name</b><br><input id='h' name='h' placeholder=" Gateway_Name " value=\"%s\"></p><p><b>MQTT Base Topic</b><br><input id='mt' name='mt' placeholder='' value='%s'></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
 #endif
-const char config_logging_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>OpenMQTTGateway Logging</b></span></legend><form method='get' action='lo'><p><b>Log Level</b><br><select id='lo'><option %s value='0'>Silent</option><option %s value='1'>Fatal</option><option %s value='2'>Error</option><option %s value='3'>Warning</option><option %s value='4'>Notice</option><option %s value='5'>Trace</option><option %s value='6'>Verbose</option></select></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
+#ifndef ESPWifiManualSetup
+const char config_gateway_body[] = body_header
+    "<fieldset class=\"set1\"><legend><span><b>Gateway Configuration</b></span></legend>"
+    "<form method='post' action='cg'>"
+    "<p><b>Gateway Password (8 characters min)</b><br>"
+    "<input id='gp' name='gp' type='password' placeholder=\"********\" minlength='8'></p>"
+#  ifdef ZmqttDiscovery
+    "<p><label><input id='dc' name='dc' type='checkbox' %s> MQTT Discovery</label></p>"
+#  endif
+    "<br><button name='save' type='submit' class='button bgrn'>Save</button>"
+    "</form></fieldset>" body_footer_config_menu;
+#endif
+const char config_logging_body[] = body_header
+    "<fieldset class=\"set1\"><legend><span><b>OpenMQTTGateway Logging</b></span></legend><form method='get' action='lo'><p><b>Log Level</b><br><select id='lo'><option %s value='0'>Silent</option><option %s value='1'>Fatal</option><option %s value='2'>Error</option>"
+#if LOG_LEVEL >= LOG_LEVEL_WARNING
+    "<option %s value='3'>Warning</option>"
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_NOTICE
+    "<option %s value='4'>Notice</option>"
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_TRACE
+    "<option %s value='5'>Trace</option>"
+#endif
+#if LOG_LEVEL >= LOG_LEVEL_VERBOSE
+    "<option %s value='6'>Verbose</option>"
+#endif
+    "</select></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
 
 const char config_webui_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>Configure WebUI</b></span></legend><form method='get' action='wu'><p><b>Display Metric</b><br><input id='dm' type='checkbox' %s></p><p><b>Secure WebUI</b><br><input id='sw' type='checkbox' %s></p><br><button name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
 
@@ -217,6 +246,68 @@ const char config_lora_body[] = body_header
     "</form>"
     "</fieldset>" body_footer_config_menu;
 
+#ifdef ZgatewayBT
+// BLE config page split into parts to fit within WEB_TEMPLATE_BUFFER_MAX_SIZE
+
+// Part 1: Header + Scan settings (body_header %s=modules, %s=gateway_name, then: %s=enabled, %s=adaptivescan, %lu=interval, %lu=intervalacts, %lu=scanduration, %s=forcepscn, %s=bleconnect, %d=minrssi)
+const char config_ble_body_scan[] = body_header
+    "<fieldset class=\"set1\"><legend><span><b>Configure BLE</b></span></legend>"
+    "<form method='post' action='bl'>"
+    "<p><b>Scan Settings</b></p>"
+    "<p><label><input id='en' name='en' type='checkbox' %s> Enable BLE</label></p>"
+    "<p><label><input id='as' name='as' type='checkbox' %s> Adaptive Scan</label></p>"
+    "<p><b>Scan Interval (ms)</b><br><input id='bi' name='bi' type='number' min='0' value='%lu'></p>"
+    "<p><b>Active Scan Interval (ms)</b><br><input id='ai' name='ai' type='number' min='0' value='%lu'></p>"
+    "<p><b>Scan Duration (ms)</b><br><input id='sd' name='sd' type='number' min='0' value='%lu'></p>"
+    "<p><label><input id='fp' name='fp' type='checkbox' %s> Force Passive Scan</label></p>"
+    "<p><label><input id='bc' name='bc' type='checkbox' %s> BLE Connect</label></p>"
+    "<p><b>Min RSSI</b><br><input id='mr' name='mr' type='number' max='0' value='%d'></p>";
+
+// Part 2: Publish settings (%s=onlysensors, %s=randommacs, %s=pubadvdata, %s=pubuuid4topic, %s=filterConnectable, %s=ignoreWBlist)
+const char config_ble_body_publish[] =
+    "<hr><p><b>Publish Settings</b></p>"
+    "<p><label><input id='os' name='os' type='checkbox' %s> Only Sensors</label></p>"
+    "<p><label><input id='rm' name='rm' type='checkbox' %s> Random MACs</label></p>"
+    "<p><label><input id='pa' name='pa' type='checkbox' %s> Publish Adv Data</label></p>"
+    "<p><label><input id='ut' name='ut' type='checkbox' %s> UUID as Topic</label></p>"
+    "<p><label><input id='fc' name='fc' type='checkbox' %s> Filter Connectable</label></p>"
+    "<p><label><input id='iw' name='iw' type='checkbox' %s> Ignore White/Blacklist</label></p>";
+
+// Part 3: Presence settings (%s=hasspresence, %s=presuseuuid, %s=prestopic, %lu=presenceawaytimer, %lu=movingtimer)
+const char config_ble_body_presence[] =
+    "<hr><p><b>Presence Settings</b></p>"
+    "<p><label><input id='hp' name='hp' type='checkbox' %s> HA Presence</label></p>"
+    "<p><label><input id='pu' name='pu' type='checkbox' %s> Use UUID for Presence</label></p>"
+    "<p><b>Presence Topic</b><br><input id='pt' name='pt' value='%s'></p>"
+    "<p><b>Away Timer (ms)</b><br><input id='at' name='at' type='number' min='0' value='%lu'></p>"
+    "<p><b>Moving Timer (ms)</b><br><input id='mo' name='mo' type='number' min='0' value='%lu'></p>";
+
+// Part 4: External decoder settings (%s=extDecoderEnable, %s=extDecoderTopic, %lu=intervalcnct)
+const char config_ble_body_decoder[] =
+    "<hr><p><b>External Decoder</b></p>"
+    "<p><label><input id='ed' name='ed' type='checkbox' %s> Enable Ext Decoder</label></p>"
+    "<p><b>Ext Decoder Topic</b><br><input id='et' name='et' value='%s'></p>"
+    "<p><b>Connect Interval (ms)</b><br><input id='ci' name='ci' type='number' min='0' value='%lu'></p>";
+
+#  if BLEDecryptor
+// Part 5: Encryption settings (%s=ble_aes, %s=ble_aes_keys)
+const char config_ble_body_encrypt[] =
+    "<hr><p><b>Encryption</b></p>"
+    "<p><b>BLE AES Default Key (32 char hex)</b></p>"
+    "<input id='bk' name='bk' minlength='32' maxlength='32' placeholder='00112233445566778899001122334455' value='%s'>"
+    "<hr><p><b>BLE Key Pairs</b></p>"
+    "<p>MacAddress:AESKey with space separator</p>"
+    "<p><textarea id='kp' name='kp' placeholder='A4C138012345:00112233445566778899001122334455' rows='3' cols='46'>%s</textarea></p>";
+#  endif
+
+// Part 6: Save button + footer
+const char config_ble_body_footer[] =
+    "<br><button id='s' name='save' type='submit' class='button bgrn'>Save</button>"
+    "</form></fieldset>" body_footer_config_menu;
+
+const char ble_script[] = "";
+#endif
+
 const char footer[] = "<div style='text-align:right;font-size:11px;'><hr/><a href='https://community.openmqttgateway.com' target='_blank' style='color:#aaa;'>%s</a></div></div></body></html>";
 
 // Source file - https://github.com/1technophile/OpenMQTTGateway/blob/54decb4b65c7894b926ac3a89de0c6b2a3021506/docs/.vuepress/public/favicon-16x16.png
@@ -321,4 +412,4 @@ const unsigned char Openmqttgateway_logo_mini_ico[] = {
     0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00};
 unsigned int Openmqttgateway_logo_mini_ico_len = 1150;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/main/config_WebUI.h b/main/config_WebUI.h
index ca978a0..8b3b115 100644
--- a/main/config_WebUI.h
+++ b/main/config_WebUI.h
@@ -1,15 +1,15 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
- 
+
    This files enables to set your parameter for the DHT11/22 sensor
-  
+
     Copyright: (c)Florian ROBERT
-  
+
     This file is part of OpenMQTTGateway.
-    
+
     OpenMQTTGateway 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
@@ -26,9 +26,10 @@
 #ifndef config_WebUI_h
 #define config_WebUI_h
 
-#include <ArduinoJson.h>
 #include <Wire.h>
 
+#include "TheengsCommon.h"
+
 #define WEBUI_TEXT_WIDTH 128
 
 /*------------------- Optional Compiler Directives ----------------------*/
@@ -52,9 +53,9 @@
 #endif
 
 #ifdef WEBUI_TRACE_LOGGING
-#  define WEBUI_TRACE_LOG(...) Log.trace(__VA_ARGS__)
+#  define WEBUI_TRACE_LOG(...) THEENGS_LOG_TRACE(__VA_ARGS__)
 #else
-#  define WEBUI_TRACE_LOG(...)
+#  define WEBUI_TRACE_LOG(...) ((void)0)
 #endif
 
 #ifndef WEBUI_AUTH
@@ -65,6 +66,8 @@
 #  define WEBUI_LOGIN "admin"
 #endif
 
+extern char ota_pass[];
+
 /*------------------- End of Compiler Directives ----------------------*/
 
 #define WEBUI_SECURE                                                                    \
@@ -92,7 +95,7 @@ struct webUIQueueMessage {
   char line2[WEBUI_TEXT_WIDTH];
   char line3[WEBUI_TEXT_WIDTH];
   char line4[WEBUI_TEXT_WIDTH];
-} webUIQueueMessage_t;
+};
 
 /*------------------- Global Functions and Variables ----------------------*/
 
@@ -102,12 +105,12 @@ void webUIPubPrint(const char*, JsonObject&);
 #endif
 void WebUISetup();
 void WebUILoop();
-void MQTTtoWebUI(char*, JsonObject&);
+void XtoWebUI(const char*, JsonObject&);
 
 String stateWebUIStatus();
 
-webUIQueueMessage* currentWebUIMessage;
-bool newSSD1306Message = false; // Flag to indicate new message to display
+extern webUIQueueMessage* currentWebUIMessage;
+extern bool newSSD1306Message; // Flag to indicate new message to display
 
 /*------------------- End of Global Functions ----------------------*/
 
diff --git a/main/config_mqttDiscovery.h b/main/config_mqttDiscovery.h
index 24b1f45..640da48 100644
--- a/main/config_mqttDiscovery.h
+++ b/main/config_mqttDiscovery.h
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This files enables to set your parameter for the Home assistant mqtt Discovery
@@ -32,7 +32,7 @@ extern void pubMqttDiscovery();
 
 /**
  * Create a discover messages form a list of attribute
- * 
+ *
  * @param mac the MAC address
  * @param sensorList[][0] = component type
  * @param sensorList[][1] = name
@@ -57,7 +57,7 @@ extern void createDiscoveryFromList(const char* mac,
 
 /**
  * @brief Generate message and publish it on an MQTT discovery exploiter. For HA @see https://www.home-assistant.io/docs/mqtt/discovery/
- * 
+ *
  * @param sensor_type the Type
  * @param st_topic set state topic,
  * @param s_name set name,
@@ -71,15 +71,20 @@ extern void createDiscoveryFromList(const char* mac,
  * @param off_delay set off_delay
  * @param payload_available set payload_available,
  * @param payload_not_available set payload_not_available
- * @param gateway_entity set is a gateway entity, 
+ * @param gateway_entity set is a gateway entity,
  * @param cmd_topic set command topic
- * @param device_name set device name, 
- * @param device_manufacturer set device manufacturer, 
- * @param device_model set device model, 
- * @param device_mac set device MAC, 
+ * @param device_name set device name,
+ * @param device_manufacturer set device manufacturer,
+ * @param device_model set device model,
+ * @param device_mac set device MAC,
  * @param retainCmd set retain
  * @param state_class set state class
- * 
+ * @param state_off state off value
+ * @param state_on state on value
+ * @param enum_options options
+ * @param command_template command template
+ * @param diagnostic_entity true if entity_category is diagnostic
+ *
  * */
 extern void createDiscovery(const char* sensor_type,
                             const char* state_topic, const char* s_name, const char* unique_id,
@@ -88,33 +93,34 @@ extern void createDiscovery(const char* sensor_type,
                             int off_delay,
                             const char* payload_available, const char* payload_not_available, bool gateway_entity, const char* command_topic,
                             const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_mac, bool retainCmd,
-                            const char* state_class, const char* state_off = nullptr, const char* state_on = nullptr, const char* enum_options = nullptr);
+                            const char* state_class, const char* state_off = nullptr, const char* state_on = nullptr, const char* enum_options = nullptr,
+                            const char* command_template = nullptr, bool diagnostic_entity = false);
 
+#ifdef ZgatewayRF
 /**
  * @brief Create a message for Discovery Device Trigger. For HA @see https://www.home-assistant.io/integrations/device_trigger.mqtt/
- * @param use_gateway_info      Boolean where true mean use the OMG information as Device Information
- * @param topic                 The Topic  where the trigger will publish the content
+ * @param topic                 Mandatory - The MQTT topic subscribed to receive trigger events.
  * @param type                  The type of the trigger, e.g. button_short_press. Entries supported by the HA Frontend: button_short_press, button_short_release, button_long_press, button_long_release, button_double_press, button_triple_press, button_quadruple_press, button_quintuple_press. If set to an unsupported value, will render as subtype type, e.g. button_1 spammed with type set to spammed and subtype set to button_1
  * @param subtype               The subtype of the trigger, e.g. button_1. Entries supported by the HA frontend: turn_on, turn_off, button_1, button_2, button_3, button_4, button_5, button_6. If set to an unsupported value, will render as subtype type, e.g. left_button pressed with type set to button_short_press and subtype set to left_button
- * @param unique_id             Valid only if gateway entry is false, The IDs that uniquely identify the device. For example a serial number.
- * @param device_name           Valid only if gateway entry is false, The name of the device.
- * @param device_manufacturer   Valid only if gateway entry is false, The manufacturer of the device.
- * @param device_model          Valid only if gateway entry is false, The model of the device.
- * @param device_mac            Valid only if gateway entry is false, The connection of the device to the outside world
+  * @param object_id             The object_id of the trigger.
+ * @param value_template        The template to render the value of the trigger. The template can use the variables trigger.id, trigger.type, trigger.subtype, trigger.payload, trigger.payload_json, trigger.topic, trigger.timestamp, trigger.value, trigger.value_json. The template can be a string or a JSON object. If the template is a JSON object, it must be a valid JSON object. If the template is a string, it will be rendered as a string. If the template is a JSON object, it will be rendered as a JSON object.
  */
-void announceDeviceTrigger(bool use_gateway_info,
-                           char* topic,
-                           char* type,
-                           char* subtype,
-                           char* unique_id,
-                           char* device_name,
-                           char* device_manufacturer,
-                           char* device_model,
-                           char* device_mac);
+void announceGatewayTrigger(const char* topic,
+                            const char* type,
+                            const char* subtype,
+                            const char* object_id,
+                            const char* value_template);
+#endif // ZgatewayRF
 
-#ifndef discovery_Topic
-#  define discovery_Topic "homeassistant"
+#ifdef discovery_Topic //Deprecated - use discovery_Prefix instead
+#  pragma message("compiler directive discovery_Topic is deprecated, use discovery_Prefix instead")
+#  define discovery_Prefix discovery_Topic
 #endif
+#ifndef discovery_Prefix
+#  define discovery_Prefix "homeassistant"
+#endif
+extern char discovery_prefix[];
+
 // discovery_republish_on_reconnect false to publish discovery topics over MQTT only with first connect
 // discovery_republish_on_reconnect true to always republish discovery topics over MQTT when connection is re-established
 #ifndef discovery_republish_on_reconnect
@@ -129,12 +135,11 @@ void announceDeviceTrigger(bool use_gateway_info,
 #  define GATEWAY_MANUFACTURER "OMG_community"
 #endif
 
-/*-------------- Auto discovery macros-----------------*/
-// Set the line below to true so as to have autodiscovery working with OpenHAB
-#ifndef OpenHABDiscovery
-#  define OpenHABDiscovery false
+#ifndef ForceDeviceName
+#  define ForceDeviceName false // Set to true to force the device name to be from the name of the device and not the model
 #endif
 
+/*-------------- Auto discovery macros-----------------*/
 // Home assistant autodiscovery value key definition
 #define jsonBatt        "{{ value_json.batt | is_defined }}"
 #define jsonLux         "{{ value_json.lux | is_defined }}"
@@ -172,85 +177,109 @@ void announceDeviceTrigger(bool use_gateway_info,
 #define jsonAlarm       "{{ value_json.alarm | is_defined }}"
 #define jsonInuse       "{{ value_json.power | is_defined | float > 0 }}"
 #define jsonInuseRN8209 "{% if value_json.power > 0.02 -%} on {% else %} off {%- endif %}"
-#define jsonVoltBM2     "{% if value_json.uuid is not defined and value_json.volt is defined -%} {{value_json.volt}} {%- endif %}"
+#define jsonVoltBM      "{% if value_json.uuid is not defined and value_json.volt is defined -%} {{value_json.volt}} {%- endif %}"
+#define jsonRSSI        "{{ value_json.rssi | is_defined }}"
 
 #define stateClassNone            ""
 #define stateClassMeasurement     "measurement"
 #define stateClassTotal           "total"
 #define stateClassTotalIncreasing "total_increasing"
 
-// From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L225
-// List of classes available in Home Assistant
-const char* availableHASSClasses[] = {"battery",
-                                      "carbon_dioxide",
-                                      "carbon_monoxide",
-                                      "current",
-                                      "data_size",
-                                      "distance",
-                                      "door",
-                                      "duration",
-                                      "energy",
-                                      "enum",
-                                      "gas",
-                                      "humidity",
-                                      "illuminance",
-                                      "irradiance",
-                                      "lock",
-                                      "motion",
-                                      "moving",
-                                      "pm10",
-                                      "pm25",
-                                      "power",
-                                      "power_factor",
-                                      "pressure",
-                                      "problem",
-                                      "restart",
-                                      "signal_strength",
-                                      "temperature",
-                                      "timestamp",
-                                      "voltage",
-                                      "water",
-                                      "weight",
-                                      "window"};
+// Define all HASS device classes as macros for reuse and consistency
+#define HASS_CLASS_BATTERY_CHARGING        "battery_charging"
+#define HASS_CLASS_BATTERY                 "battery"
+#define HASS_CLASS_CARBON_DIOXIDE          "carbon_dioxide"
+#define HASS_CLASS_CARBON_MONOXIDE         "carbon_monoxide"
+#define HASS_CLASS_CONNECTIVITY            "connectivity"
+#define HASS_CLASS_CURRENT                 "current"
+#define HASS_CLASS_DATA_SIZE               "data_size"
+#define HASS_CLASS_DISTANCE                "distance"
+#define HASS_CLASS_DOOR                    "door"
+#define HASS_CLASS_DURATION                "duration"
+#define HASS_CLASS_ENERGY                  "energy"
+#define HASS_CLASS_ENUM                    "enum"
+#define HASS_CLASS_FREQUENCY               "frequency"
+#define HASS_CLASS_GAS                     "gas"
+#define HASS_CLASS_HUMIDITY                "humidity"
+#define HASS_CLASS_ILLUMINANCE             "illuminance"
+#define HASS_CLASS_IRRADIANCE              "irradiance"
+#define HASS_CLASS_LOCK                    "lock"
+#define HASS_CLASS_MOTION                  "motion"
+#define HASS_CLASS_MOVING                  "moving"
+#define HASS_CLASS_OCCUPANCY               "occupancy"
+#define HASS_CLASS_PM1                     "pm1"
+#define HASS_CLASS_PM10                    "pm10"
+#define HASS_CLASS_PM25                    "pm25"
+#define HASS_CLASS_POWER_FACTOR            "power_factor"
+#define HASS_CLASS_POWER                   "power"
+#define HASS_CLASS_PRECIPITATION_INTENSITY "precipitation_intensity"
+#define HASS_CLASS_PRECIPITATION           "precipitation"
+#define HASS_CLASS_PRESSURE                "pressure"
+#define HASS_CLASS_PROBLEM                 "problem"
+#define HASS_CLASS_RESTART                 "restart"
+#define HASS_CLASS_SIGNAL_STRENGTH         "signal_strength"
+#define HASS_CLASS_SOUND_PRESSURE          "sound_pressure"
+#define HASS_CLASS_TEMPERATURE             "temperature"
+#define HASS_CLASS_TIMESTAMP               "timestamp"
+#define HASS_CLASS_VOLTAGE                 "voltage"
+#define HASS_CLASS_WATER                   "water"
+#define HASS_CLASS_WEIGHT                  "weight"
+#define HASS_CLASS_WIND_SPEED              "wind_speed"
+#define HASS_CLASS_WINDOW                  "window"
 
-// From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L379
-// List of units available in Home Assistant
-const char* availableHASSUnits[] = {"W",
-                                    "kW",
-                                    "V",
-                                    "kWh",
-                                    "A",
-                                    "W",
-                                    "°C",
-                                    "°F",
-                                    "ms",
-                                    "s",
-                                    "min",
-                                    "hPa",
-                                    "L",
-                                    "kg",
-                                    "lb",
-                                    "µS/cm",
-                                    "ppm",
-                                    "μg/m³",
-                                    "m³",
-                                    "mg/m³",
-                                    "m/s²",
-                                    "lx",
-                                    "Ω",
-                                    "%",
-                                    "bar",
-                                    "bpm",
-                                    "dB",
-                                    "dBm",
-                                    "B",
-                                    "UV index",
-                                    "m/s",
-                                    "km/h",
-                                    "°",
-                                    "mm",
-                                    "mm/h",
-                                    "cm"};
+// Define all HASS units as macros for reuse and consistency
+#define HASS_UNIT_AMP         "A"
+#define HASS_UNIT_BYTE        "B"
+#define HASS_UNIT_UV_INDEX    "UV index"
+#define HASS_UNIT_VOLT        "V"
+#define HASS_UNIT_WATT        "W"
+#define HASS_UNIT_BPM         "bpm"
+#define HASS_UNIT_BAR         "bar"
+#define HASS_UNIT_CM          "cm"
+#define HASS_UNIT_DB          "dB"
+#define HASS_UNIT_DBM         "dBm"
+#define HASS_UNIT_FT          "ft"
+#define HASS_UNIT_HOUR        "h"
+#define HASS_UNIT_HPA         "hPa"
+#define HASS_UNIT_HZ          "Hz"
+#define HASS_UNIT_KG          "kg"
+#define HASS_UNIT_KW          "kW"
+#define HASS_UNIT_KWH         "kWh"
+#define HASS_UNIT_KMH         "km/h"
+#define HASS_UNIT_LB          "lb"
+#define HASS_UNIT_LITER       "L"
+#define HASS_UNIT_LX          "lx"
+#define HASS_UNIT_MS          "m/s"
+#define HASS_UNIT_MS2         "m/s²"
+#define HASS_UNIT_M3          "m³"
+#define HASS_UNIT_MGM3        "mg/m³"
+#define HASS_UNIT_MIN         "min"
+#define HASS_UNIT_MM          "mm"
+#define HASS_UNIT_MMH         "mm/h"
+#define HASS_UNIT_MILLISECOND "ms"
+#define HASS_UNIT_MV          "mV"
+#define HASS_UNIT_USCM        "µS/cm"
+#define HASS_UNIT_UGM3        "μg/m³"
+#define HASS_UNIT_OHM         "Ω"
+#define HASS_UNIT_PERCENT     "%"
+#define HASS_UNIT_DEGREE      "°"
+#define HASS_UNIT_CELSIUS     "°C"
+#define HASS_UNIT_FAHRENHEIT  "°F"
+#define HASS_UNIT_SECOND      "s"
+#define HASS_UNIT_WB2         "wb²"
+// Additional commonly used units not in the standard list
+#define HASS_UNIT_METER "m"
+#define HASS_UNIT_PPM   "ppm"
+#define HASS_UNIT_WM2   "wm²"
+
+#define HASS_TYPE_SENSOR         "sensor"
+#define HASS_TYPE_BINARY_SENSOR  "binary_sensor"
+#define HASS_TYPE_SWITCH         "switch"
+#define HASS_TYPE_BUTTON         "button"
+#define HASS_TYPE_NUMBER         "number"
+#define HASS_TYPE_UPDATE         "update"
+#define HASS_TYPE_COVER          "cover"
+#define HASS_TYPE_DEVICE_TRACKER "device_tracker"
 
 // Define the command used to update through OTA depending if we want to update from dev nightly or latest release
 #if DEVELOPMENTOTA
diff --git a/main/ZdisplaySSD1306.ino b/main/displaySSD1306.cpp
similarity index 74%
rename from main/ZdisplaySSD1306.ino
rename to main/displaySSD1306.cpp
index b791df7..7ea675a 100644
--- a/main/ZdisplaySSD1306.ino
+++ b/main/displaySSD1306.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
     Supported boards with displays
@@ -31,13 +31,60 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "User_config.h"
+
 #if defined(ZdisplaySSD1306)
-
-#  include <ArduinoJson.h>
-
-#  include "ArduinoLog.h"
-#  include "User_config.h"
+#  include "SSD1306Wire.h"
+#  include "TheengsCommon.h"
 #  include "config_SSD1306.h"
+#  ifdef DISPLAY_BLANKING
+#    include "driver/touch_sensor.h"
+#  endif
+
+// This pattern was borrowed from HardwareSerial and modified to support the ssd1306 display
+
+class OledSerial : public Stream {
+public:
+  OledSerial(int);
+  void begin();
+  void drawLogo(int xshift, int yshift);
+  boolean displayPage(webUIQueueMessage*);
+
+  SSD1306Wire* display;
+
+  int available(void); // Dummy functions
+  int peek(void); // Dummy functions
+  int read(void); // Dummy functions
+  void flush(void); // Dummy functions
+
+  void fillScreen(OLEDDISPLAY_COLOR); // fillScreen display and set color
+
+  // This is a bit of lazy programmer simplification for the semaphore and core detecting code.  Not sure if it is truly space efficient.
+
+  inline size_t write(uint8_t x) {
+    return write(&x, 1);
+  }
+
+  size_t write(const uint8_t* buffer, size_t size);
+  inline size_t write(const char* buffer, size_t size) {
+    return write((uint8_t*)buffer, size);
+  }
+  inline size_t write(const char* s) {
+    return write((uint8_t*)s, strlen(s));
+  }
+  inline size_t write(unsigned long n) {
+    return write((uint8_t)n);
+  }
+  inline size_t write(long n) {
+    return write((uint8_t)n);
+  }
+  inline size_t write(unsigned int n) {
+    return write((uint8_t)n);
+  }
+  inline size_t write(int n) {
+    return write((uint8_t)n);
+  }
+} Oled(0); // Oled object
 
 SemaphoreHandle_t semaphoreOLEDOperation;
 
@@ -47,7 +94,11 @@ boolean displayFlip = DISPLAY_FLIP;
 boolean displayState = DISPLAY_STATE;
 boolean idlelogo = DISPLAY_IDLE_LOGO;
 uint8_t displayBrightness = DISPLAY_BRIGHTNESS;
+bool newSSD1306Message = false; // Flag to indicate new message to display
 
+void SSD1306Config_init();
+bool SSD1306Config_load();
+void SSD1306Config_save();
 /*
 Toogle log display
 */
@@ -62,15 +113,15 @@ module setup, for use in Arduino setup
 void setupSSD1306() {
   SSD1306Config_init();
   SSD1306Config_load();
-  Log.trace(F("Setup SSD1306 Display" CR));
-  Log.trace(F("ZdisplaySSD1306 command topic: %s" CR), subjectMQTTtoSSD1306set);
-  Log.trace(F("ZdisplaySSD1306 log-oled: %T" CR), logToOLEDDisplay);
-  Log.trace(F("ZdisplaySSD1306 json-oled: %T" CR), jsonDisplay);
-  Log.trace(F("ZdisplaySSD1306 DISPLAY_PAGE_INTERVAL: %d" CR), DISPLAY_PAGE_INTERVAL);
-  Log.trace(F("ZdisplaySSD1306 DISPLAY_IDLE_LOGO: %T" CR), idlelogo);
-  Log.trace(F("ZdisplaySSD1306 DISPLAY_FLIP: %T" CR), displayFlip);
+  THEENGS_LOG_TRACE(F("Setup SSD1306 Display" CR));
+  THEENGS_LOG_TRACE(F("displaySSD1306 command topic: %s" CR), subjectMQTTtoSSD1306set);
+  THEENGS_LOG_TRACE(F("displaySSD1306 log-oled: %T" CR), logToOLEDDisplay);
+  THEENGS_LOG_TRACE(F("displaySSD1306 json-oled: %T" CR), jsonDisplay);
+  THEENGS_LOG_TRACE(F("displaySSD1306 DISPLAY_PAGE_INTERVAL: %d" CR), DISPLAY_PAGE_INTERVAL);
+  THEENGS_LOG_TRACE(F("displaySSD1306 DISPLAY_IDLE_LOGO: %T" CR), idlelogo);
+  THEENGS_LOG_TRACE(F("displaySSD1306 DISPLAY_FLIP: %T" CR), displayFlip);
   Oled.begin();
-  Log.notice(F("Setup SSD1306 Display end" CR));
+  THEENGS_LOG_NOTICE(F("Setup SSD1306 Display end" CR));
 
 #  if LOG_TO_OLED
   Log.begin(LOG_LEVEL_OLED, &Oled); // Log on OLED following LOG_LEVEL_OLED
@@ -83,6 +134,17 @@ void setupSSD1306() {
 boolean logoDisplayed = false;
 unsigned long nextDisplayPage = uptime() + DISPLAY_PAGE_INTERVAL;
 
+#  ifdef DISPLAY_BLANKING
+unsigned long blankingStart = uptime() + DISPLAY_BLANKING_START;
+
+touch_value_t touchReadings[TOUCH_READINGS] = {0};
+touch_value_t touchCurrentReading = 0;
+int touchIndex = 0;
+int touchTotal = 0;
+int touchAverage = 0;
+int touchThreshold = 0;
+#  endif
+
 /*
 module loop, for use in Arduino loop
 */
@@ -92,10 +154,30 @@ void loopSSD1306() {
 
   long enough since the last message and display not being used and a queue message waiting
   */
+
+#  ifdef DISPLAY_BLANKING
+  // THEENGS_LOG_TRACE(F("touchAverage %d, touchCurrentReading %d, touchThreshold %d" CR), touchAverage, touchCurrentReading, touchThreshold);
+  touchTotal = touchTotal - touchReadings[touchIndex];
+  touchCurrentReading = touchRead(DISPLAY_BLANKING_TOUCH_GPIO);
+  touchReadings[touchIndex] = touchCurrentReading;
+  touchTotal = touchTotal + touchReadings[touchIndex];
+  touchIndex = (touchIndex + 1) % TOUCH_READINGS;
+  touchAverage = touchTotal / TOUCH_READINGS;
+  touchThreshold = touchAverage * TOUCH_THRESHOLD;
+
+  if ((touchCurrentReading > touchAverage + touchThreshold || touchCurrentReading < touchAverage - touchThreshold) && displayState) {
+    blankingStart = uptime() + DISPLAY_BLANKING_START;
+    Oled.display->displayOn();
+  }
+  if (uptime() > blankingStart && displayState) {
+    Oled.display->displayOff();
+  }
+#  endif
+
   if (jsonDisplay && displayState) {
     if (uptime() >= nextDisplayPage && uxSemaphoreGetCount(semaphoreOLEDOperation) && currentWebUIMessage && newSSD1306Message) {
       if (!Oled.displayPage(currentWebUIMessage)) {
-        Log.warning(F("[ssd1306] displayPage failed: %s" CR), currentWebUIMessage->title);
+        THEENGS_LOG_WARNING(F("[ssd1306] displayPage failed: %s" CR), currentWebUIMessage->title);
       }
       nextDisplayPage = uptime() + DISPLAY_PAGE_INTERVAL;
       logoDisplayed = false;
@@ -118,24 +200,24 @@ Handler for mqtt commands sent to the module
 - log-oled: boolean
   Enable / Disable display of log messages on display
 */
-void MQTTtoSSD1306(char* topicOri, JsonObject& SSD1306data) { // json object decoding
+void XtoSSD1306(const char* topicOri, JsonObject& SSD1306data) { // json object decoding
   bool success = false;
   if (cmpToMainTopic(topicOri, subjectMQTTtoSSD1306set)) {
-    Log.trace(F("MQTTtoSSD1306 json set" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoSSD1306 json set" CR));
     // properties
     if (SSD1306data.containsKey("onstate")) {
       displayState = SSD1306data["onstate"].as<bool>();
-      Log.notice(F("Set display state: %T" CR), displayState);
+      THEENGS_LOG_NOTICE(F("Set display state: %T" CR), displayState);
       success = true;
     }
     if (SSD1306data.containsKey("brightness")) {
       displayBrightness = SSD1306data["brightness"].as<int>();
-      Log.notice(F("Set brightness: %d" CR), displayBrightness);
+      THEENGS_LOG_NOTICE(F("Set brightness: %d" CR), displayBrightness);
       success = true;
     }
     if (SSD1306data.containsKey("log-oled")) {
       logToOLEDDisplay = SSD1306data["log-oled"].as<bool>();
-      Log.notice(F("Set OLED log: %T" CR), logToOLEDDisplay);
+      THEENGS_LOG_NOTICE(F("Set OLED log: %T" CR), logToOLEDDisplay);
       logToOLED(logToOLEDDisplay);
       if (logToOLEDDisplay) {
         jsonDisplay = false;
@@ -147,7 +229,7 @@ void MQTTtoSSD1306(char* topicOri, JsonObject& SSD1306data) { // json object dec
         logToOLEDDisplay = false;
         logToOLED(logToOLEDDisplay);
       }
-      Log.notice(F("Set json-oled: %T" CR), jsonDisplay);
+      THEENGS_LOG_NOTICE(F("Set json-oled: %T" CR), jsonDisplay);
       success = true;
     }
     if (SSD1306data.containsKey("idlelogo")) {
@@ -156,7 +238,7 @@ void MQTTtoSSD1306(char* topicOri, JsonObject& SSD1306data) { // json object dec
     }
     if (SSD1306data.containsKey("display-flip")) {
       displayFlip = SSD1306data["display-flip"].as<bool>();
-      Log.notice(F("Set display-flip: %T" CR), displayFlip);
+      THEENGS_LOG_NOTICE(F("Set display-flip: %T" CR), displayFlip);
       success = true;
     }
     // save, load, init, erase
@@ -166,13 +248,13 @@ void MQTTtoSSD1306(char* topicOri, JsonObject& SSD1306data) { // json object dec
     } else if (SSD1306data.containsKey("load") && SSD1306data["load"]) {
       success = SSD1306Config_load();
       if (success) {
-        Log.notice(F("SSD1306 config loaded" CR));
+        THEENGS_LOG_NOTICE(F("SSD1306 config loaded" CR));
       }
     } else if (SSD1306data.containsKey("init") && SSD1306data["init"]) {
       SSD1306Config_init();
       success = true;
       if (success) {
-        Log.notice(F("SSD1306 config initialised" CR));
+        THEENGS_LOG_NOTICE(F("SSD1306 config initialised" CR));
       }
     } else if (SSD1306data.containsKey("erase") && SSD1306data["erase"]) {
       // Erase config from NVS (non-volatile storage)
@@ -182,13 +264,13 @@ void MQTTtoSSD1306(char* topicOri, JsonObject& SSD1306data) { // json object dec
       }
       preferences.end();
       if (success) {
-        Log.notice(F("SSD1306 config erased" CR));
+        THEENGS_LOG_NOTICE(F("SSD1306 config erased" CR));
       }
     }
     if (success) {
       stateSSD1306Display();
     } else {
-      Log.error(F("[ SSD1306 ] MQTTtoSSD1306 Fail json" CR), SSD1306data);
+      THEENGS_LOG_ERROR(F("[ SSD1306 ] XtoSSD1306 Fail json" CR), SSD1306data);
     }
   }
 }
@@ -208,7 +290,7 @@ void SSD1306Config_save() {
   preferences.begin(Gateway_Short_Name, false);
   int result = preferences.putString("SSD1306Config", conf);
   preferences.end();
-  Log.notice(F("SSD1306 Config_save: %s, result: %d" CR), conf.c_str(), result);
+  THEENGS_LOG_NOTICE(F("SSD1306 Config_save: %s, result: %d" CR), conf.c_str(), result);
 }
 
 void SSD1306Config_init() {
@@ -218,7 +300,7 @@ void SSD1306Config_init() {
   jsonDisplay = JSON_TO_OLED;
   idlelogo = DISPLAY_IDLE_LOGO;
   displayFlip = DISPLAY_FLIP;
-  Log.notice(F("SSD1306 config initialised" CR));
+  THEENGS_LOG_NOTICE(F("SSD1306 config initialised" CR));
 }
 
 bool SSD1306Config_load() {
@@ -228,11 +310,11 @@ bool SSD1306Config_load() {
     auto error = deserializeJson(jsonBuffer, preferences.getString("SSD1306Config", "{}"));
     preferences.end();
     if (error) {
-      Log.error(F("SSD1306 config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      THEENGS_LOG_ERROR(F("SSD1306 config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
       return false;
     }
     if (jsonBuffer.isNull()) {
-      Log.warning(F("SSD1306 config is null" CR));
+      THEENGS_LOG_WARNING(F("SSD1306 config is null" CR));
       return false;
     }
     JsonObject jo = jsonBuffer.as<JsonObject>();
@@ -242,11 +324,11 @@ bool SSD1306Config_load() {
     jsonDisplay = jo["json-oled"].as<bool>();
     idlelogo = jo["idlelogo"].as<bool>();
     displayFlip = jo["display-flip"].as<bool>();
-    Log.notice(F("Saved SSD1306 config loaded" CR));
+    THEENGS_LOG_NOTICE(F("Saved SSD1306 config loaded" CR));
     return true;
   } else {
     preferences.end();
-    Log.notice(F("No SSD1306 config to load" CR));
+    THEENGS_LOG_NOTICE(F("No SSD1306 config to load" CR));
     return false;
   }
 }
@@ -282,7 +364,6 @@ void ssd1306Print(char* line1) {
 
 // This pattern was borrowed from HardwareSerial and modified to support the ssd1306 display
 
-OledSerial Oled(0); // Not sure about this, came from Hardwareserial
 OledSerial::OledSerial(int x) {
 #  if defined(WIFI_Kit_32) || defined(WIFI_LoRa_32) || defined(WIFI_LoRa_32_V2)
   pinMode(RST_OLED, OUTPUT); // https://github.com/espressif/arduino-esp32/issues/4278
@@ -469,7 +550,7 @@ String stateSSD1306Display() {
   DISPLAYdata["log-oled"] = (bool)logToOLEDDisplay;
   DISPLAYdata["json-oled"] = (bool)jsonDisplay;
   DISPLAYdata["origin"] = subjectSSD1306toMQTT;
-  handleJsonEnqueue(DISPLAYdata);
+  enqueueJsonObject(DISPLAYdata);
 
   // apply
   Oled.display->setBrightness(round(displayBrightness * 2.55));
diff --git a/main/Zgateway2G.ino b/main/gateway2G.cpp
similarity index 68%
rename from main/Zgateway2G.ino
rename to main/gateway2G.cpp
index 5353058..fc9385d 100644
--- a/main/Zgateway2G.ino
+++ b/main/gateway2G.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
   This gateway enables to:
@@ -30,7 +30,12 @@
 #ifdef Zgateway2G
 
 #  include <A6lib.h> // library for controling A6 or A7 module
-#  include <ArduinoJson.h>
+
+#  include "TheengsCommon.h"
+#  include "config_2G.h"
+
+void signalStrengthAnalysis();
+void setupGSM(bool deleteSMS);
 
 // Instantiate the library with TxPin, RxPin.
 A6lib A6l(_2G_TX_GPIO, _2G_RX_GPIO); //D6 to A6 RX, D7 to A6 TX
@@ -40,28 +45,28 @@ int unreadSMSNum = 0;
 SMSmessage sms;
 
 void setup2G() {
-  Log.notice(F("_2G_TX_GPIO: %d " CR), _2G_TX_GPIO);
-  Log.notice(F("_2G_RX_GPIO: %d " CR), _2G_RX_GPIO);
+  THEENGS_LOG_NOTICE(F("_2G_TX_GPIO: %d " CR), _2G_TX_GPIO);
+  THEENGS_LOG_NOTICE(F("_2G_RX_GPIO: %d " CR), _2G_RX_GPIO);
   setupGSM(false);
-  Log.trace(F("Zgateway2G setup done " CR));
+  THEENGS_LOG_TRACE(F("gateway2G setup done " CR));
 }
 
 void setupGSM(bool deleteSMS) {
-  Log.trace(F("Init 2G module: %d" CR), _2G_PWR_GPIO);
+  THEENGS_LOG_TRACE(F("Init 2G module: %d" CR), _2G_PWR_GPIO);
   delay(1000);
   // Power-cycle the module to reset it.
   A6l.powerCycle(_2G_PWR_GPIO);
-  Log.notice(F("waiting for network connection at bd: %d" CR), _2G_MODULE_BAUDRATE);
+  THEENGS_LOG_NOTICE(F("waiting for network connection at bd: %d" CR), _2G_MODULE_BAUDRATE);
   A6l.blockUntilReady(_2G_MODULE_BAUDRATE);
-  Log.notice(F("A6/A7 gsm ready" CR));
+  THEENGS_LOG_NOTICE(F("A6/A7 gsm ready" CR));
   signalStrengthAnalysis();
   delay(1000);
   // deleting all sms
   if (deleteSMS) {
     if (A6l.deleteSMS(1, 4) == A6_OK) {
-      Log.notice(F("delete SMS OK" CR));
+      THEENGS_LOG_NOTICE(F("delete SMS OK" CR));
     } else {
-      Log.error(F("delete SMS KO" CR));
+      THEENGS_LOG_ERROR(F("delete SMS KO" CR));
     }
   }
 }
@@ -69,82 +74,82 @@ void setupGSM(bool deleteSMS) {
 void signalStrengthAnalysis() {
   int signalStrength = 0;
   signalStrength = A6l.getSignalStrength();
-  Log.trace(F("Signal strength: %d" CR), signalStrength);
+  THEENGS_LOG_TRACE(F("Signal strength: %d" CR), signalStrength);
   if (signalStrength < _2G_MIN_SIGNAL || signalStrength > _2G_MAX_SIGNAL) {
-    Log.trace(F("Signal too low restart the module" CR));
+    THEENGS_LOG_TRACE(F("Signal too low restart the module" CR));
     setupGSM(false); // if we are below or above a threshold signal we relaunch the setup of GSM module
   }
 }
 
-bool _2GtoMQTT() {
+bool _2GtoX() {
   // Get the memory locations of unread SMS messages.
   unreadSMSNum = A6l.getUnreadSMSLocs(unreadSMSLocs, 512);
-  Log.trace(F("Creating SMS  buffer" CR));
+  THEENGS_LOG_TRACE(F("Creating SMS  buffer" CR));
   StaticJsonDocument<JSON_MSG_BUFFER> SMSdataBuffer;
   JsonObject SMSdata = SMSdataBuffer.to<JsonObject>();
   for (int i = 0; i < unreadSMSNum; i++) {
-    Log.notice(F("New  message at index: %d" CR), unreadSMSNum);
+    THEENGS_LOG_NOTICE(F("New  message at index: %d" CR), unreadSMSNum);
     sms = A6l.readSMS(unreadSMSLocs[i]);
     SMSdata["message"] = (const char*)sms.message.c_str();
     SMSdata["date"] = (const char*)sms.date.c_str();
     SMSdata["phone"] = (const char*)sms.number.c_str();
     A6l.deleteSMS(unreadSMSLocs[i]); // we delete the SMS received
-    Log.trace(F("Adv data 2GtoMQTT" CR));
+    THEENGS_LOG_TRACE(F("Adv data 2GtoMQTT" CR));
     SMSdata["origin"] = subject2GtoMQTT;
-    return handleJsonEnqueue(SMSdata);
+    return enqueueJsonObject(SMSdata);
   }
   return false;
 }
 #  if simpleReceiving
-void MQTTto2G(char* topicOri, char* datacallback) {
+void Xto2G(const char* topicOri, const char* datacallback) {
   String data = datacallback;
   String topic = topicOri;
 
   if (cmpToMainTopic(topicOri, subjectMQTTto2G)) {
-    Log.trace(F("MQTTto2G data analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTto2G data analysis" CR));
     // 2G DATA ANALYSIS
     String phone_number = "";
     int pos0 = topic.lastIndexOf(_2GPhoneKey);
     if (pos0 != -1) {
       pos0 = pos0 + strlen(_2GPhoneKey);
       phone_number = topic.substring(pos0);
-      Log.notice(F("MQTTto2G phone: %s" CR), (char*)phone_number.c_str());
-      Log.notice(F("MQTTto2G sms: %s" CR), (char*)data.c_str());
+      THEENGS_LOG_NOTICE(F("MQTTto2G phone: %s" CR), (char*)phone_number.c_str());
+      THEENGS_LOG_NOTICE(F("MQTTto2G sms: %s" CR), (char*)data.c_str());
       if (A6l.sendSMS(phone_number, data) == A6_OK) {
-        Log.notice(F("SMS OK" CR));
+        THEENGS_LOG_NOTICE(F("SMS OK" CR));
         // Acknowledgement to the GTW2G topic
         pub(subjectGTW2GtoMQTT, "SMS OK"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
       } else {
-        Log.error(F("SMS KO" CR));
+        THEENGS_LOG_ERROR(F("SMS KO" CR));
         // Acknowledgement to the GTW2G topic
         pub(subjectGTW2GtoMQTT, "SMS KO"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
       }
     } else {
-      Log.error(F("MQTTto2G Fail reading phone number" CR));
+      THEENGS_LOG_ERROR(F("MQTTto2G Fail reading phone number" CR));
     }
   }
 }
 #  endif
 
 #  if jsonReceiving
-void MQTTto2G(char* topicOri, JsonObject& SMSdata) {
+void Xto2G(const char* topicOri, JsonObject& SMSdata) {
   if (cmpToMainTopic(topicOri, subjectMQTTto2G)) {
     const char* sms = SMSdata["message"];
     const char* phone = SMSdata["phone"];
-    Log.trace(F("MQTTto2G json data analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTto2G json data analysis" CR));
     if (sms && phone) {
-      Log.notice(F("MQTTto2G phone: %s" CR), phone);
-      Log.notice(F("MQTTto2G sms: %s" CR), sms);
+      THEENGS_LOG_NOTICE(F("MQTTto2G phone: %s" CR), phone);
+      THEENGS_LOG_NOTICE(F("MQTTto2G sms: %s" CR), sms);
       if (A6l.sendSMS(String(phone), String(sms)) == A6_OK) {
-        Log.notice(F("SMS OK" CR));
+        THEENGS_LOG_NOTICE(F("SMS OK" CR));
         // Acknowledgement to the GTW2G topic
         pub(subjectGTW2GtoMQTT, "SMS OK"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
       } else {
-        Log.error(F("SMS KO" CR));
+        THEENGS_LOG_ERROR(F("SMS KO" CR));
         pub(subjectGTW2GtoMQTT, "SMS KO"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
       }
     } else {
-      Log.error(F("MQTTto2G failed json read" CR));
+      THEENGS_LOG_ERROR(F("MQTTto2G failed json read" CR));
     }
   }
 }
diff --git a/main/gatewayBLEConnect.cpp b/main/gatewayBLEConnect.cpp
new file mode 100644
index 0000000..0e43d7a
--- /dev/null
+++ b/main/gatewayBLEConnect.cpp
@@ -0,0 +1,841 @@
+#ifdef ESP32
+#  include "User_config.h"
+#  ifdef ZgatewayBT
+#    include "gatewayBLEConnect.h"
+#    include "mbedtls/aes.h"
+
+#    define convertTemp_CtoF(c) ((c * 1.8) + 32)
+
+extern std::vector<BLEdevice*> devices;
+extern bool BTProcessLock;
+
+NimBLERemoteCharacteristic* zBLEConnect::getCharacteristic(const NimBLEUUID& service,
+                                                           const NimBLEUUID& characteristic) {
+  BLERemoteCharacteristic* pRemoteCharacteristic = nullptr;
+  if (!m_pClient) {
+    THEENGS_LOG_ERROR(F("No BLE client" CR));
+  } else if (!m_pClient->isConnected() && !m_pClient->connect()) {
+    THEENGS_LOG_ERROR(F("Connect to: %s failed" CR), m_pClient->getPeerAddress().toString().c_str());
+  } else {
+    BLERemoteService* pRemoteService = m_pClient->getService(service);
+    if (!pRemoteService) {
+      THEENGS_LOG_NOTICE(F("Failed to find service UUID: %s" CR), service.toString().c_str());
+    } else {
+      THEENGS_LOG_TRACE(F("Found service: %s" CR), service.toString().c_str());
+      THEENGS_LOG_TRACE(F("Client isConnected, freeHeap: %d" CR), ESP.getFreeHeap());
+      pRemoteCharacteristic = pRemoteService->getCharacteristic(characteristic);
+      if (!pRemoteCharacteristic) {
+        THEENGS_LOG_NOTICE(F("Failed to find characteristic UUID: %s" CR), characteristic.toString().c_str());
+      }
+    }
+  }
+
+  return pRemoteCharacteristic;
+}
+
+bool zBLEConnect::writeData(BLEAction* action) {
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(action->service, action->characteristic);
+  if (pChar && (pChar->canWrite() || pChar->canWriteNoResponse())) {
+    switch (action->value_type) {
+      case BLE_VAL_HEX: {
+        int len = action->value.length();
+        if (len % 2) {
+          THEENGS_LOG_ERROR(F("Invalid HEX value length" CR));
+          return false;
+        }
+
+        std::vector<uint8_t> buf;
+        buf.reserve(len / 2);
+        for (auto i = 0; i < len; i += 2) {
+          char sVal[3] = {action->value[i], action->value[i + 1], 0};
+          buf.push_back((uint8_t)strtoul(sVal, nullptr, 16));
+        }
+        return pChar->writeValue(&buf[0], buf.size(), !pChar->canWriteNoResponse());
+      }
+      case BLE_VAL_INT:
+        return pChar->writeValue(strtol(action->value.c_str(), nullptr, 0), !pChar->canWriteNoResponse());
+      case BLE_VAL_FLOAT:
+        return pChar->writeValue(strtod(action->value.c_str(), nullptr), !pChar->canWriteNoResponse());
+      default:
+        return pChar->writeValue(action->value, !pChar->canWriteNoResponse());
+    }
+  }
+  return false;
+}
+
+bool zBLEConnect::readData(BLEAction* action) {
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(action->service, action->characteristic);
+
+  if (pChar && pChar->canRead()) {
+    action->value = pChar->readValue();
+    if (action->value != "") {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool zBLEConnect::processActions(std::vector<BLEAction>& actions) {
+  bool result = false;
+  if (actions.size() > 0) {
+    for (auto& it : actions) {
+      if (NimBLEAddress(it.addr) == m_pClient->getPeerAddress()) {
+        DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+        JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+        BLEdata["id"] = m_pClient->getPeerAddress().toString();
+        BLEdata["service"] = it.service.toString();
+        BLEdata["characteristic"] = it.characteristic.toString();
+
+        if (it.write) {
+          THEENGS_LOG_TRACE(F("processing BLE write" CR));
+          BLEdata["write"] = std::string(it.value);
+          result = writeData(&it);
+        } else {
+          THEENGS_LOG_TRACE(F("processing BLE read" CR));
+          result = readData(&it);
+          if (result) {
+            switch (it.value_type) {
+              case BLE_VAL_HEX: {
+                BLEdata["read"] = NimBLEUtils::dataToHexString(it.value.data(), it.value.size());
+                break;
+              }
+              case BLE_VAL_INT: {
+                int ival = *(int*)it.value.data();
+                BLEdata["read"] = ival;
+                break;
+              }
+              case BLE_VAL_FLOAT: {
+                float fval = *(double*)it.value.data();
+                BLEdata["read"] = fval;
+                break;
+              }
+              default:
+                BLEdata["read"] = it.value.c_str();
+                break;
+            }
+          }
+        }
+
+        it.complete = result;
+        BLEdata["success"] = result;
+        if (result || it.ttl <= 1) {
+          buildTopicFromId(BLEdata, subjectBTtoMQTT);
+          enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+        }
+      }
+    }
+  }
+
+  return result;
+}
+
+/*-----------------------LYWSD03MMC && MHO_C401 HANDLING-----------------------*/
+void LYWSD03MMC_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+
+    if (length == 5) {
+      THEENGS_LOG_TRACE(F("Device identified creating BLE buffer" CR));
+      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+      auto mac_addr = m_pClient->getPeerAddress().toString();
+      for (std::vector<BLEdevice*>::iterator it = devices.begin(); it != devices.end(); ++it) {
+        BLEdevice* p = *it;
+        if (p->macAdr == mac_addr) {
+          if (p->sensorModel_id == BLEconectable::id::LYWSD03MMC)
+            BLEdata["model"] = "LYWSD03MMC";
+          else if (p->sensorModel_id == BLEconectable::id::MHO_C401)
+            BLEdata["model"] = "MHO-C401";
+        }
+      }
+      BLEdata["id"] = mac_addr;
+      THEENGS_LOG_TRACE(F("Device identified in CB: %s" CR), mac_addr);
+      BLEdata["tempc"] = (float)((pData[0] | (pData[1] << 8)) * 0.01);
+      BLEdata["tempf"] = (float)(convertTemp_CtoF((pData[0] | (pData[1] << 8)) * 0.01));
+      BLEdata["hum"] = (float)(pData[2]);
+      BLEdata["volt"] = (float)(((pData[4] * 256) + pData[3]) / 1000.0);
+      BLEdata["batt"] = (float)(((((pData[4] * 256) + pData[3]) / 1000.0) - 2.1) * 100);
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+void LYWSD03MMC_connect::publishData() {
+  NimBLEUUID serviceUUID("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6");
+  NimBLEUUID charUUID("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6");
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+
+  if (pChar && pChar->canNotify()) {
+    THEENGS_LOG_TRACE(F("Registering notification" CR));
+    if (pChar->subscribe(true, std::bind(&LYWSD03MMC_connect::notifyCB, this,
+                                         std::placeholders::_1, std::placeholders::_2,
+                                         std::placeholders::_3, std::placeholders::_4))) {
+      m_taskHandle = xTaskGetCurrentTaskHandle();
+      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+        m_taskHandle = nullptr;
+      }
+    } else {
+      THEENGS_LOG_NOTICE(F("Failed registering notification" CR));
+    }
+  }
+}
+
+/*-----------------------DT24 HANDLING-----------------------*/
+void DT24_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+    if (length == 20) {
+      m_data.assign(pData, pData + length);
+      return;
+    } else if (m_data.size() == 20 && length == 16) {
+      m_data.insert(m_data.end(), pData, pData + length);
+
+      // DT24-BLE data format
+      // https://github.com/NiceLabs/atorch-console/blob/master/docs/protocol-design.md#dc-meter-report
+      // Data comes as two packets ( 20 and 16 ), and am only processing first
+      THEENGS_LOG_TRACE(F("Device identified creating BLE buffer" CR));
+      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+      auto mac_address = m_pClient->getPeerAddress().toString();
+      BLEdata["model"] = "DT24";
+      BLEdata["id"] = mac_address;
+      THEENGS_LOG_TRACE(F("Device identified in CB: %s" CR), mac_address);
+      BLEdata["volt"] = (float)(((m_data[4] * 256 * 256) + (m_data[5] * 256) + m_data[6]) / 10.0);
+      BLEdata["current"] = (float)(((m_data[7] * 256 * 256) + (m_data[8] * 256) + m_data[9]) / 1000.0);
+      BLEdata["power"] = (float)(((m_data[10] * 256 * 256) + (m_data[11] * 256) + m_data[12]) / 10.0);
+      BLEdata["energy"] = (float)(((m_data[13] * 256 * 256 * 256) + (m_data[14] * 256 * 256) + (m_data[15] * 256) + m_data[16]) / 100.0);
+      BLEdata["price"] = (float)(((m_data[17] * 256 * 256) + (m_data[18] * 256) + m_data[19]) / 100.0);
+      BLEdata["tempc"] = (float)(m_data[24] * 256) + m_data[25];
+      BLEdata["tempf"] = (float)(convertTemp_CtoF((m_data[24] * 256) + m_data[25]));
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+void DT24_connect::publishData() {
+  NimBLEUUID serviceUUID("ffe0");
+  NimBLEUUID charUUID("ffe1");
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+
+  if (pChar && pChar->canNotify()) {
+    THEENGS_LOG_TRACE(F("Registering notification" CR));
+    if (pChar->subscribe(true, std::bind(&DT24_connect::notifyCB, this,
+                                         std::placeholders::_1, std::placeholders::_2,
+                                         std::placeholders::_3, std::placeholders::_4))) {
+      m_taskHandle = xTaskGetCurrentTaskHandle();
+      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+        m_taskHandle = nullptr;
+      }
+    } else {
+      THEENGS_LOG_NOTICE(F("Failed registering notification" CR));
+    }
+  }
+}
+
+/*-----------------------BM2 HANDLING-----------------------*/
+void BM2_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+    if (length == 16) {
+      THEENGS_LOG_TRACE(F("Device identified creating BLE buffer" CR));
+      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+      BLEdata["model"] = "BM2 Battery Monitor";
+      BLEdata["id"] = m_pClient->getPeerAddress().toString();
+      mbedtls_aes_context aes;
+      mbedtls_aes_init(&aes);
+      unsigned char output[16];
+      unsigned char iv[16] = {};
+      unsigned char key[16] = {
+          108,
+          101,
+          97,
+          103,
+          101,
+          110,
+          100,
+          255,
+          254,
+          49,
+          56,
+          56,
+          50,
+          52,
+          54,
+          54,
+      };
+      mbedtls_aes_setkey_dec(&aes, key, 128);
+      mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, 16, iv, (uint8_t*)&pData[0], output);
+      mbedtls_aes_free(&aes);
+      float volt = ((output[2] | (output[1] << 8)) >> 4) / 100.0f;
+      BLEdata["volt"] = volt;
+      THEENGS_LOG_TRACE(F("volt: %F" CR), volt);
+      // to avoid the BM2 device tracker going offline because of the voltage MQTT message without an RSSI value
+      BLEdata["rssi"] = -60;
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+void BM2_connect::publishData() {
+  NimBLEUUID serviceUUID("fff0");
+  NimBLEUUID charUUID("fff4");
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+
+  if (pChar && pChar->canNotify()) {
+    THEENGS_LOG_TRACE(F("Registering notification" CR));
+    if (pChar->subscribe(true, std::bind(&BM2_connect::notifyCB, this,
+                                         std::placeholders::_1, std::placeholders::_2,
+                                         std::placeholders::_3, std::placeholders::_4))) {
+      m_taskHandle = xTaskGetCurrentTaskHandle();
+      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+        m_taskHandle = nullptr;
+      }
+    } else {
+      THEENGS_LOG_NOTICE(F("Failed registering notification" CR));
+    }
+  }
+}
+
+/*-----------------------BM6 HANDLING-----------------------*/
+// BM6 AES encryption key: "leagend\xff\xfe0100009"
+static const unsigned char BM6_AES_KEY[16] = {
+    108, // l
+    101, // e
+    97, // a
+    103, // g
+    101, // e
+    110, // n
+    100, // d
+    255, // 0xff
+    254, // 0xfe
+    48, // 0
+    49, // 1
+    48, // 0
+    48, // 0
+    48, // 0
+    48, // 0
+    57, // 9
+};
+
+void BM6_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+    if (length == 16) {
+      THEENGS_LOG_TRACE(F("Device identified creating BLE buffer" CR));
+      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+      BLEdata["model"] = "BM6 Battery Monitor";
+      BLEdata["id"] = m_pClient->getPeerAddress().toString();
+      mbedtls_aes_context aes;
+      mbedtls_aes_init(&aes);
+      unsigned char output[16];
+      unsigned char iv[16] = {};
+      mbedtls_aes_setkey_dec(&aes, BM6_AES_KEY, 128);
+      mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, 16, iv, (uint8_t*)&pData[0], output);
+      mbedtls_aes_free(&aes);
+
+      // Check for valid message signature (should start with D15507)
+      if (output[0] != 0xd1 || output[1] != 0x55 || output[2] != 0x07) {
+        THEENGS_LOG_NOTICE(F("BM6 invalid message signature" CR));
+        xTaskNotifyGive(m_taskHandle);
+        return;
+      }
+
+      // Parse according to BM6 protocol (from https://github.com/JeffWDH/bm6-battery-monitor)
+      // The decrypted data is converted to a hex string for parsing:
+      //   - Voltage: hex string positions 15-17 (3 chars) / 100
+      //   - Temperature: hex string positions 8-9 (2 chars), negated if positions 6-7 == "01"
+      //   - SoC (State of Charge): hex string positions 12-13 (2 chars)
+      char hexstr[33];
+      sprintf(hexstr, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
+              output[0], output[1], output[2], output[3], output[4], output[5], output[6], output[7],
+              output[8], output[9], output[10], output[11], output[12], output[13], output[14], output[15]);
+
+      // Extract voltage (positions 15-17 in hex string)
+      char volt_str[4] = {hexstr[15], hexstr[16], hexstr[17], 0};
+      int volt_raw = (int)strtol(volt_str, NULL, 16);
+      float volt = volt_raw / 100.0f;
+
+      // Extract SoC (positions 12-13 in hex string)
+      char soc_str[3] = {hexstr[12], hexstr[13], 0};
+      int soc = (int)strtol(soc_str, NULL, 16);
+
+      // Extract temperature (positions 8-9 in hex string)
+      char temp_str[3] = {hexstr[8], hexstr[9], 0};
+      int temp_raw = (int)strtol(temp_str, NULL, 16);
+
+      // Check temperature sign (positions 6-7 in hex string)
+      char temp_sign_str[3] = {hexstr[6], hexstr[7], 0};
+      float temp = (strcmp(temp_sign_str, "01") == 0) ? -temp_raw : temp_raw;
+
+      BLEdata["tempc"] = temp;
+      BLEdata["tempf"] = (float)convertTemp_CtoF(temp);
+      BLEdata["volt"] = volt;
+      BLEdata["batt"] = soc;
+      // to avoid the BM6 device tracker going offline because of the voltage/temp MQTT message without an RSSI value
+      BLEdata["rssi"] = -60;
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+void BM6_connect::publishData() {
+  NimBLEUUID serviceUUID("fff0");
+  NimBLEUUID charWriteUUID("fff3");
+  NimBLEUUID charNotifyUUID("fff4");
+
+  // Get write characteristic to send command
+  NimBLERemoteCharacteristic* pCharWrite = getCharacteristic(serviceUUID, charWriteUUID);
+  // Get notify characteristic to receive data
+  NimBLERemoteCharacteristic* pCharNotify = getCharacteristic(serviceUUID, charNotifyUUID);
+
+  if (pCharWrite && (pCharWrite->canWrite() || pCharWrite->canWriteNoResponse()) &&
+      pCharNotify && pCharNotify->canNotify()) {
+    THEENGS_LOG_TRACE(F("Registering notification" CR));
+    if (pCharNotify->subscribe(true, std::bind(&BM6_connect::notifyCB, this,
+                                               std::placeholders::_1, std::placeholders::_2,
+                                               std::placeholders::_3, std::placeholders::_4))) {
+      // Encrypt the command before sending (BM6 requires encrypted commands)
+      uint8_t command_plain[16] = {0xd1, 0x55, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+      uint8_t command_encrypted[16];
+      unsigned char iv[16] = {};
+
+      mbedtls_aes_context aes;
+      mbedtls_aes_init(&aes);
+      mbedtls_aes_setkey_enc(&aes, BM6_AES_KEY, 128);
+      mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, 16, iv, command_plain, command_encrypted);
+      mbedtls_aes_free(&aes);
+
+      if (pCharWrite->writeValue(command_encrypted, 16, true)) { // Use write with response
+        m_taskHandle = xTaskGetCurrentTaskHandle();
+        if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+          m_taskHandle = nullptr;
+        }
+      } else {
+        THEENGS_LOG_NOTICE(F("Failed to send command" CR));
+      }
+    } else {
+      THEENGS_LOG_NOTICE(F("Failed registering notification" CR));
+    }
+  }
+}
+
+/*-----------------------HHCCJCY01HHCC HANDLING-----------------------*/
+void HHCCJCY01HHCC_connect::publishData() {
+  NimBLEUUID serviceUUID("00001204-0000-1000-8000-00805f9b34fb");
+  NimBLEUUID charUUID("00001a00-0000-1000-8000-00805f9b34fb");
+  NimBLEUUID charUUID2("00001a02-0000-1000-8000-00805f9b34fb");
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+
+  if (pChar) {
+    THEENGS_LOG_TRACE(F("Read mode" CR));
+    uint8_t buf[2] = {0xA0, 0x1F};
+    pChar->writeValue(buf, 2, true);
+    int batteryValue = -1;
+    NimBLERemoteCharacteristic* pChar2 = getCharacteristic(serviceUUID, charUUID2);
+    if (pChar2) {
+      std::string value;
+      value = pChar2->readValue();
+      const char* val2 = value.c_str();
+      batteryValue = val2[0];
+      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+      BLEdata["model"] = "HHCCJCY01HHCC";
+      BLEdata["id"] = m_pClient->getPeerAddress().toString();
+      BLEdata["batt"] = (int)batteryValue;
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Failed getting characteristic" CR));
+    }
+  } else {
+    THEENGS_LOG_NOTICE(F("Failed getting characteristic" CR));
+  }
+}
+
+/*-----------------------XMWSDJ04MMC HANDLING-----------------------*/
+void XMWSDJ04MMC_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+
+    if (length == 6) {
+      THEENGS_LOG_TRACE(F("Device identified creating BLE buffer" CR));
+      DynamicJsonDocument BLEdataBuffer(JSON_MSG_BUFFER);
+      JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+      auto mac_address = m_pClient->getPeerAddress().toString();
+      BLEdata["model"] = "XMWSDJ04MMC";
+      BLEdata["id"] = mac_address;
+      THEENGS_LOG_TRACE(F("Device identified in CB: %s" CR), mac_address);
+      BLEdata["tempc"] = (float)((pData[0] | (pData[1] << 8)) * 0.1);
+      BLEdata["tempf"] = (float)(convertTemp_CtoF((pData[0] | (pData[1] << 8)) * 0.1));
+      BLEdata["hum"] = (float)((pData[2] | (pData[3] << 8)) * 0.1);
+      BLEdata["volt"] = (float)((pData[4] | (pData[5] << 8)) / 1000.0);
+      BLEdata["batt"] = (float)((((pData[4] | (pData[5] << 8)) / 1000.0) - 2.1) * 100);
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+void XMWSDJ04MMC_connect::publishData() {
+  NimBLEUUID serviceUUID("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6");
+  NimBLEUUID charUUID("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6");
+  NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+
+  if (pChar && pChar->canNotify()) {
+    THEENGS_LOG_TRACE(F("Registering notification" CR));
+    if (pChar->subscribe(true, std::bind(&XMWSDJ04MMC_connect::notifyCB, this,
+                                         std::placeholders::_1, std::placeholders::_2,
+                                         std::placeholders::_3, std::placeholders::_4))) {
+      m_taskHandle = xTaskGetCurrentTaskHandle();
+      if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+        m_taskHandle = nullptr;
+      }
+    } else {
+      THEENGS_LOG_NOTICE(F("Failed registering notification" CR));
+    }
+  }
+}
+
+/*-----------------------SBS1 HANDLING-----------------------*/
+void SBS1_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+
+    if (length) {
+      m_notifyVal = *pData;
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+bool SBS1_connect::processActions(std::vector<BLEAction>& actions) {
+  NimBLEUUID serviceUUID("cba20d00-224d-11e6-9fb8-0002a5d5c51b");
+  NimBLEUUID charUUID("cba20002-224d-11e6-9fb8-0002a5d5c51b");
+  NimBLEUUID notifyCharUUID("cba20003-224d-11e6-9fb8-0002a5d5c51b");
+  static byte ON[] = {0x57, 0x01, 0x01};
+  static byte OFF[] = {0x57, 0x01, 0x02};
+  static byte PRESS[] = {0x57, 0x01, 0x00};
+  static byte DOWN[] = {0x57, 0x01, 0x03};
+  static byte UP[] = {0x57, 0x01, 0x04};
+
+  bool result = false;
+  if (actions.size() > 0) {
+    for (auto& it : actions) {
+      if (it.addr == m_pClient->getPeerAddress()) {
+        NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+        NimBLERemoteCharacteristic* pNotifyChar = getCharacteristic(serviceUUID, notifyCharUUID);
+
+        if (it.write && pChar && pNotifyChar) {
+          THEENGS_LOG_TRACE(F("processing Switchbot %s" CR), it.value.c_str());
+          if (pNotifyChar->subscribe(true,
+                                     std::bind(&SBS1_connect::notifyCB,
+                                               this, std::placeholders::_1, std::placeholders::_2,
+                                               std::placeholders::_3, std::placeholders::_4),
+                                     true)) {
+            if (it.value == "on") {
+              result = pChar->writeValue(ON, 3, false);
+            } else if (it.value == "off") {
+              result = pChar->writeValue(OFF, 3, false);
+            } else if (it.value == "press") {
+              result = pChar->writeValue(PRESS, 3, false);
+            } else if (it.value == "down") {
+              result = pChar->writeValue(DOWN, 3, false);
+            } else if (it.value == "up") {
+              result = pChar->writeValue(UP, 3, false);
+            }
+
+            if (result) {
+              m_taskHandle = xTaskGetCurrentTaskHandle();
+              if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+                m_taskHandle = nullptr;
+              }
+              result = m_notifyVal == 0x01;
+            }
+          }
+        }
+
+        it.complete = result;
+        if (result || it.ttl <= 1) {
+          StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
+          JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+          BLEdata["id"] = m_pClient->getPeerAddress().toString();
+          BLEdata["state"] = std::string(it.value);
+          buildTopicFromId(BLEdata, subjectBTtoMQTT);
+          enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+        }
+      }
+    }
+  }
+
+  return result;
+}
+
+/*-----------------------SBBT HANDLING-----------------------*/
+void SBBT_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+
+    if (length) {
+      m_notifyVal = *pData;
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+bool SBBT_connect::processActions(std::vector<BLEAction>& actions) {
+  NimBLEUUID serviceUUID("cba20d00-224d-11e6-9fb8-0002a5d5c51b");
+  NimBLEUUID charUUID("cba20002-224d-11e6-9fb8-0002a5d5c51b");
+  NimBLEUUID notifyCharUUID("cba20003-224d-11e6-9fb8-0002a5d5c51b");
+  static byte OPEN[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x32};
+  static byte CLOSE_DOWN[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x00};
+  static byte CLOSE_UP[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x64};
+  static byte MOVE[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x00};
+  static byte STOP[] = {0x57, 0x0f, 0x45, 0x01, 0x00, 0x01};
+
+  bool result = false;
+  if (actions.size() > 0) {
+    for (auto& it : actions) {
+      if (NimBLEAddress(it.addr) == m_pClient->getPeerAddress()) {
+        NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+        NimBLERemoteCharacteristic* pNotifyChar = getCharacteristic(serviceUUID, notifyCharUUID);
+        int value = -99;
+        if (it.value_type == BLE_VAL_INT) {
+          value = std::stoi(it.value);
+        }
+        if (it.write && pChar && pNotifyChar) {
+          THEENGS_LOG_TRACE(F("processing Switchbot %s" CR), it.value.c_str());
+          if (pNotifyChar->subscribe(true,
+                                     std::bind(&SBBT_connect::notifyCB,
+                                               this, std::placeholders::_1, std::placeholders::_2,
+                                               std::placeholders::_3, std::placeholders::_4),
+                                     true)) {
+            if (it.value == "open" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(OPEN, 7, false);
+              value = 50;
+            } else if (it.value == "close_down" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(CLOSE_DOWN, 7, false);
+              value = 0;
+            } else if (it.value == "close_up" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(CLOSE_UP, 7, false);
+              value = 100;
+            } else if (it.value == "stop" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(STOP, 6, false);
+            } else if (it.value_type == BLE_VAL_INT) {
+              if (value >= 0 && value <= 100) {
+                byte posByte = (byte)value;
+                MOVE[6] = posByte;
+                result = pChar->writeValue(MOVE, 7, false);
+              }
+            } else if (value == -1 && it.value_type == BLE_VAL_INT) {
+              result = pChar->writeValue(STOP, 6, false);
+            }
+
+            if (result) {
+              m_taskHandle = xTaskGetCurrentTaskHandle();
+              if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+                m_taskHandle = nullptr;
+              }
+              result = m_notifyVal == 0x01;
+            }
+          }
+        }
+
+        it.complete = result;
+        if (result || it.ttl <= 1) {
+          StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
+          JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+          BLEdata["id"] = it.addr.toString();
+          if (value != -99 || value != -1)
+            BLEdata["tilt"] = value;
+          if (value == 50) {
+            BLEdata["open"] = 100;
+            BLEdata["direction"] = "-";
+          } else if (value < 50 && value >= 0) {
+            BLEdata["open"] = value * 2;
+            BLEdata["direction"] = "down";
+          } else if (value > 50 && value <= 100) {
+            BLEdata["open"] = (100 - value) * 2;
+            BLEdata["direction"] = "up";
+          }
+          buildTopicFromId(BLEdata, subjectBTtoMQTT);
+          enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+        }
+      }
+    }
+  }
+
+  return result;
+}
+
+/*-----------------------SBCU HANDLING-----------------------*/
+void SBCU_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+  if (m_taskHandle == nullptr) {
+    return; // unexpected notification
+  }
+  if (!BTProcessLock) {
+    THEENGS_LOG_TRACE(F("Callback from %s characteristic" CR), pChar->getUUID().toString().c_str());
+
+    if (length) {
+      m_notifyVal = *pData;
+    } else {
+      THEENGS_LOG_NOTICE(F("Invalid notification data" CR));
+      return;
+    }
+  } else {
+    THEENGS_LOG_TRACE(F("Callback process canceled by BTProcessLock" CR));
+  }
+
+  xTaskNotifyGive(m_taskHandle);
+}
+
+bool SBCU_connect::processActions(std::vector<BLEAction>& actions) {
+  NimBLEUUID serviceUUID("cba20d00-224d-11e6-9fb8-0002a5d5c51b");
+  NimBLEUUID charUUID("cba20002-224d-11e6-9fb8-0002a5d5c51b");
+  NimBLEUUID notifyCharUUID("cba20003-224d-11e6-9fb8-0002a5d5c51b");
+  static byte CLOSE[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x64};
+  static byte OPEN[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x00};
+  static byte MOVE[] = {0x57, 0x0f, 0x45, 0x01, 0x01, 0x01, 0x00};
+  static byte STOP[] = {0x57, 0x0f, 0x45, 0x01, 0x00, 0x01};
+
+  bool result = false;
+  if (actions.size() > 0) {
+    for (auto& it : actions) {
+      if (NimBLEAddress(it.addr) == m_pClient->getPeerAddress()) {
+        NimBLERemoteCharacteristic* pChar = getCharacteristic(serviceUUID, charUUID);
+        NimBLERemoteCharacteristic* pNotifyChar = getCharacteristic(serviceUUID, notifyCharUUID);
+        int value = -99;
+        if (it.value_type == BLE_VAL_INT) {
+          value = std::stoi(it.value);
+        }
+        if (it.write && pChar && pNotifyChar) {
+          THEENGS_LOG_TRACE(F("processing Switchbot %s" CR), it.value.c_str());
+          if (pNotifyChar->subscribe(true,
+                                     std::bind(&SBCU_connect::notifyCB,
+                                               this, std::placeholders::_1, std::placeholders::_2,
+                                               std::placeholders::_3, std::placeholders::_4),
+                                     true)) {
+            if (it.value == "open" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(OPEN, 7, false);
+              value = 100;
+            } else if (it.value == "close" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(CLOSE, 7, false);
+              value = 0;
+            } else if (it.value == "stop" && it.value_type == BLE_VAL_STRING) {
+              result = pChar->writeValue(STOP, 6, false);
+            } else if (it.value_type == BLE_VAL_INT) {
+              if (value >= 0 && value <= 100) {
+                byte posByte = (byte)value;
+                MOVE[6] = posByte;
+                result = pChar->writeValue(MOVE, 7, false);
+              }
+            } else if (value == -1 && it.value_type == BLE_VAL_INT) {
+              result = pChar->writeValue(STOP, 6, false);
+            }
+
+            if (result) {
+              m_taskHandle = xTaskGetCurrentTaskHandle();
+              if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(BLE_CNCT_TIMEOUT)) == pdFALSE) {
+                m_taskHandle = nullptr;
+              }
+              result = m_notifyVal == 0x01;
+            }
+          }
+        }
+
+        it.complete = result;
+        if (result || it.ttl <= 1) {
+          StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
+          JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
+          BLEdata["id"] = it.addr.toString();
+          if (value != -99 || value != -1)
+            BLEdata["position"] = value;
+          buildTopicFromId(BLEdata, subjectBTtoMQTT);
+          enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+        }
+      }
+    }
+  }
+
+  return result;
+}
+
+#  endif //ZgatewayBT
+#endif //ESP32
diff --git a/main/ZgatewayBLEConnect.h b/main/gatewayBLEConnect.h
similarity index 73%
rename from main/ZgatewayBLEConnect.h
rename to main/gatewayBLEConnect.h
index f4d0b30..8e02840 100644
--- a/main/ZgatewayBLEConnect.h
+++ b/main/gatewayBLEConnect.h
@@ -2,8 +2,8 @@
 #define zBLEConnect_h
 
 #ifdef ESP32
-#  include "ArduinoJson.h"
 #  include "NimBLEDevice.h"
+#  include "TheengsCommon.h"
 #  include "config_BT.h"
 
 class zBLEConnect {
@@ -12,7 +12,7 @@ public:
   TaskHandle_t m_taskHandle = nullptr;
   zBLEConnect(NimBLEAddress& addr) {
     m_pClient = NimBLEDevice::createClient(addr);
-    m_pClient->setConnectTimeout(5);
+    m_pClient->setConnectTimeout(5000);
   }
   virtual ~zBLEConnect() { NimBLEDevice::deleteClient(m_pClient); }
   virtual bool writeData(BLEAction* action);
@@ -48,6 +48,14 @@ public:
   void publishData() override;
 };
 
+class BM6_connect : public zBLEConnect {
+  void notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify);
+
+public:
+  BM6_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
+  void publishData() override;
+};
+
 class GENERIC_connect : public zBLEConnect {
   std::vector<uint8_t> m_data;
 
@@ -82,5 +90,23 @@ public:
   bool processActions(std::vector<BLEAction>& actions) override;
 };
 
+class SBBT_connect : public zBLEConnect {
+  uint8_t m_notifyVal;
+  void notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify);
+
+public:
+  SBBT_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
+  bool processActions(std::vector<BLEAction>& actions) override;
+};
+
+class SBCU_connect : public zBLEConnect {
+  uint8_t m_notifyVal;
+  void notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify);
+
+public:
+  SBCU_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
+  bool processActions(std::vector<BLEAction>& actions) override;
+};
+
 #endif //ESP32
 #endif //zBLEConnect_h
diff --git a/main/ZgatewayBT.ino b/main/gatewayBT.cpp
similarity index 53%
rename from main/ZgatewayBT.ino
rename to main/gatewayBT.cpp
index e8e633f..ee86b83 100644
--- a/main/ZgatewayBT.ino
+++ b/main/gatewayBT.cpp
@@ -1,13 +1,11 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal/BLE  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
   This gateway enables to:
- - publish MQTT data to a different topic related to BLE devices rssi signal
- - publish MQTT data related to mi flora temperature, moisture, fertility and lux
- - publish MQTT data related to mi jia indoor temperature & humidity sensor
+ - publish MQTT data to a topic related to BLE devices data
 
     Copyright: (c)Florian ROBERT
 
@@ -31,23 +29,24 @@ Thanks to wolass https://github.com/wolass for suggesting me HM 10 and dinosd ht
 #include "User_config.h"
 
 #ifdef ZgatewayBT
+#  include "TheengsCommon.h"
 
 SemaphoreHandle_t semaphoreCreateOrUpdateDevice;
 SemaphoreHandle_t semaphoreBLEOperation;
 QueueHandle_t BLEQueue;
-// Headers used for deep sleep functions
+unsigned long scanCount = 0;
 #  include <NimBLEAdvertisedDevice.h>
 #  include <NimBLEDevice.h>
 #  include <NimBLEScan.h>
 #  include <NimBLEUtils.h>
-#  include <decoder.h>
-#  include <driver/adc.h>
 #  include <esp_bt.h>
 #  include <esp_wifi.h>
 
 #  include <atomic>
 
-#  include "ZgatewayBLEConnect.h"
+#  include "TheengsCommon.h"
+#  include "config_mqttDiscovery.h"
+#  include "gatewayBLEConnect.h"
 #  include "soc/timer_group_reg.h"
 #  include "soc/timer_group_struct.h"
 
@@ -56,7 +55,14 @@ using namespace std;
 // Global struct to store live BT configuration data
 BTConfig_s BTConfig;
 
+#  if BLEDecoder
+#    include <decoder.h>
+#    if BLEDecryptor
+#      include "mbedtls/aes.h"
+#      include "mbedtls/ccm.h"
+#    endif
 TheengsDecoder decoder;
+#  endif
 
 static TaskHandle_t xCoreTaskHandle;
 static TaskHandle_t xProcBLETaskHandle;
@@ -72,15 +78,26 @@ vector<BLEAction> BLEactions;
 vector<BLEdevice*> devices;
 int newDevices = 0;
 
-static BLEdevice NO_BT_DEVICE_FOUND = {{0},
-                                       0,
-                                       false,
-                                       false,
-                                       false,
-                                       false,
-                                       TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL};
+static BLEdevice NO_BT_DEVICE_FOUND = {
+    {0},
+    0,
+    false,
+    false,
+    false,
+    false,
+    (char)UNKWNON_MODEL,
+    0,
+};
 static bool oneWhite = false;
 
+extern bool BTProcessLock;
+extern int queueLength;
+
+void setupBTTasksAndBLE();
+bool checkIfIsTracker(char ch);
+void hass_presence(JsonObject& HomePresence);
+void BTforceScan();
+
 void BTConfig_init() {
   BTConfig.bleConnect = AttemptBLEConnect;
   BTConfig.BLEinterval = TimeBtwRead;
@@ -103,7 +120,7 @@ void BTConfig_init() {
   BTConfig.presenceAwayTimer = PresenceAwayTimer;
   BTConfig.movingTimer = MovingTimer;
   BTConfig.forcePassiveScan = false;
-  BTConfig.enabled = true;
+  BTConfig.enabled = EnableBT;
 }
 
 unsigned long timeBetweenConnect = 0;
@@ -118,28 +135,30 @@ String stateBTMeasures(bool start) {
   jo["intervalacts"] = BTConfig.intervalActiveScan;
   jo["intervalcnct"] = BTConfig.intervalConnect;
   jo["scanduration"] = BTConfig.scanDuration;
-  jo["onlysensors"] = BTConfig.pubOnlySensors;
-  jo["randommacs"] = BTConfig.pubRandomMACs;
   jo["hasspresence"] = BTConfig.presenceEnable;
   jo["prestopic"] = BTConfig.presenceTopic;
   jo["presuseuuid"] = BTConfig.presenceUseBeaconUuid;
   jo["minrssi"] = -abs(BTConfig.minRssi); // Always export as negative value
   jo["extDecoderEnable"] = BTConfig.extDecoderEnable;
   jo["extDecoderTopic"] = BTConfig.extDecoderTopic;
-  jo["filterConnectable"] = BTConfig.filterConnectable;
-  jo["pubadvdata"] = BTConfig.pubAdvData;
   jo["pubuuid4topic"] = BTConfig.pubBeaconUuidForTopic;
   jo["ignoreWBlist"] = BTConfig.ignoreWBlist;
-  jo["presenceawaytimer"] = BTConfig.presenceAwayTimer;
-  jo["movingtimer"] = BTConfig.movingTimer;
   jo["forcepscn"] = BTConfig.forcePassiveScan;
   jo["tskstck"] = uxTaskGetStackHighWaterMark(xProcBLETaskHandle);
   jo["crstck"] = uxTaskGetStackHighWaterMark(xCoreTaskHandle);
   jo["enabled"] = BTConfig.enabled;
   jo["scnct"] = scanCount;
+#  if BLEDecoder
+  jo["onlysensors"] = BTConfig.pubOnlySensors;
+  jo["randommacs"] = BTConfig.pubRandomMACs;
+  jo["filterConnectable"] = BTConfig.filterConnectable;
+  jo["pubadvdata"] = BTConfig.pubAdvData;
+  jo["presenceawaytimer"] = BTConfig.presenceAwayTimer;
+  jo["movingtimer"] = BTConfig.movingTimer;
+#  endif
 
   if (start) {
-    Log.notice(F("BT sys: "));
+    THEENGS_LOG_NOTICE(F("BT sys: "));
     serializeJsonPretty(jsonBuffer, Serial);
     Serial.println();
     return ""; // Do not try to erase/write/send config at startup
@@ -147,7 +166,7 @@ String stateBTMeasures(bool start) {
   String output;
   serializeJson(jo, output);
   jo["origin"] = subjectBTtoMQTT;
-  handleJsonEnqueue(jo, QueueSemaphoreTimeOutTask);
+  enqueueJsonObject(jo, QueueSemaphoreTimeOutTask);
   return (output);
 }
 
@@ -158,10 +177,6 @@ void BTConfig_fromJson(JsonObject& BTdata, bool startup = false) {
   if (startup == false) {
     if (BTdata.containsKey("hasspresence") && BTdata["hasspresence"] == false && BTConfig.presenceEnable == true) {
       BTdata["adaptivescan"] = true;
-#  ifdef ZmqttDiscovery
-      // Remove discovered entities
-      eraseTopic("number", (char*)getUniqueId("presenceawaytimer", "").c_str());
-#  endif
     } else if (BTdata.containsKey("hasspresence") && BTdata["hasspresence"] == true && BTConfig.presenceEnable == false) {
       BTdata["adaptivescan"] = false;
     }
@@ -174,34 +189,37 @@ void BTConfig_fromJson(JsonObject& BTdata, bool startup = false) {
       BTdata["interval"] = TimeBtwRead;
       BTdata["intervalacts"] = TimeBtwActive;
       BTdata["scanduration"] = Scan_duration;
-#  ifdef ZmqttDiscovery
-      // Remove discovered entities
-      eraseTopic("number", (char*)getUniqueId("interval", "").c_str());
-      eraseTopic("number", (char*)getUniqueId("intervalacts", "").c_str());
-#  endif
     }
     // Identify if the gateway is enabled or not and stop start accordingly
     if (BTdata.containsKey("enabled") && BTdata["enabled"] == false && BTConfig.enabled == true) {
-      stopProcessing();
+      // Stop the gateway but without deinit to enable a future BT restart
+      stopProcessing(false);
     } else if (BTdata.containsKey("enabled") && BTdata["enabled"] == true && BTConfig.enabled == false) {
       BTProcessLock = false;
       setupBTTasksAndBLE();
     }
   }
-  Config_update(BTdata, "adaptivescan", BTConfig.adaptiveScan);
   // Home Assistant presence message
   Config_update(BTdata, "hasspresence", BTConfig.presenceEnable);
-#  ifdef ZmqttDiscovery
-  // Create discovery entities
-  btScanParametersDiscovery();
-  btPresenceParametersDiscovery();
-#  endif
   // Time before before active scan
-  // Scan interval set
-  if (BTdata.containsKey("interval") && BTdata["interval"] != 0)
+  // Scan interval set - and avoid intervalacts to be lower than interval
+  if (BTdata.containsKey("interval") && BTdata["interval"] != 0) {
+    BTConfig.adaptiveScan = false;
     Config_update(BTdata, "interval", BTConfig.BLEinterval);
-  // Define if the scan is adaptive or not
-  Config_update(BTdata, "intervalacts", BTConfig.intervalActiveScan);
+    if (BTConfig.intervalActiveScan < BTConfig.BLEinterval) {
+      Config_update(BTdata, "interval", BTConfig.intervalActiveScan);
+    }
+  }
+  // Define if the scan is adaptive or not - and avoid intervalacts to be lower than interval
+  if (BTdata.containsKey("intervalacts") && BTdata["intervalacts"] < BTConfig.BLEinterval) {
+    BTConfig.adaptiveScan = false;
+    // Config_update(BTdata, "interval", BTConfig.intervalActiveScan);
+    BTConfig.intervalActiveScan = BTConfig.BLEinterval;
+  } else {
+    Config_update(BTdata, "intervalacts", BTConfig.intervalActiveScan);
+  }
+  //  Adaptive scan set
+  Config_update(BTdata, "adaptivescan", BTConfig.adaptiveScan);
   // Time before a connect set
   Config_update(BTdata, "intervalcnct", BTConfig.intervalConnect);
   // publish all BLE devices discovered or  only the identified sensors (like temperature sensors)
@@ -244,12 +262,12 @@ void BTConfig_fromJson(JsonObject& BTdata, bool startup = false) {
     preferences.begin(Gateway_Short_Name, false);
     if (preferences.isKey("BTConfig")) {
       int result = preferences.remove("BTConfig");
-      Log.notice(F("BT config erase result: %d" CR), result);
+      THEENGS_LOG_NOTICE(F("BT config erase result: %d" CR), result);
       preferences.end();
       return; // Erase prevails on save, so skipping save
     } else {
       preferences.end();
-      Log.notice(F("BT config not found" CR));
+      THEENGS_LOG_NOTICE(F("BT config not found" CR));
     }
   }
 
@@ -284,7 +302,7 @@ void BTConfig_fromJson(JsonObject& BTdata, bool startup = false) {
     preferences.begin(Gateway_Short_Name, false);
     int result = preferences.putString("BTConfig", conf);
     preferences.end();
-    Log.notice(F("BT config save: %s, result: %d" CR), conf.c_str(), result);
+    THEENGS_LOG_NOTICE(F("BT config save: %s, result: %d" CR), conf.c_str(), result);
   }
 }
 
@@ -294,21 +312,21 @@ void BTConfig_load() {
   if (preferences.isKey("BTConfig")) {
     auto error = deserializeJson(jsonBuffer, preferences.getString("BTConfig", "{}"));
     preferences.end();
-    Log.notice(F("BT config loaded" CR));
+    THEENGS_LOG_NOTICE(F("BT config loaded" CR));
     if (error) {
-      Log.error(F("BT config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      THEENGS_LOG_ERROR(F("BT config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
       return;
     }
     if (jsonBuffer.isNull()) {
-      Log.warning(F("BT config is null" CR));
+      THEENGS_LOG_WARNING(F("BT config is null" CR));
       return;
     }
     JsonObject jo = jsonBuffer.as<JsonObject>();
     BTConfig_fromJson(jo, true); // Never send MQTT message with config
-    Log.notice(F("BT config loaded" CR));
+    THEENGS_LOG_NOTICE(F("BT config loaded" CR));
   } else {
     preferences.end();
-    Log.notice(F("BT config not found" CR));
+    THEENGS_LOG_NOTICE(F("BT config not found" CR));
   }
 }
 
@@ -316,11 +334,11 @@ void PublishDeviceData(JsonObject& BLEdata);
 
 atomic_int forceBTScan;
 
-void createOrUpdateDevice(const char* mac, uint8_t flags, int model, int mac_type = 0);
+void createOrUpdateDevice(const char* mac, uint8_t flags, int model, int mac_type = 0, const char* name = "");
 
 BLEdevice* getDeviceByMac(const char* mac); // Declared here to avoid pre-compilation issue (misplaced auto declaration by pio)
 BLEdevice* getDeviceByMac(const char* mac) {
-  Log.trace(F("getDeviceByMac %s" CR), mac);
+  THEENGS_LOG_TRACE(F("getDeviceByMac %s" CR), mac);
 
   for (vector<BLEdevice*>::iterator it = devices.begin(); it != devices.end(); ++it) {
     if ((strcmp((*it)->macAdr, mac) == 0)) {
@@ -331,7 +349,7 @@ BLEdevice* getDeviceByMac(const char* mac) {
 }
 
 bool updateWorB(JsonObject& BTdata, bool isWhite) {
-  Log.trace(F("update WorB" CR));
+  THEENGS_LOG_TRACE(F("update WorB" CR));
   const char* jsonKey = isWhite ? "white-list" : "black-list";
 
   int size = BTdata[jsonKey].size();
@@ -341,21 +359,44 @@ bool updateWorB(JsonObject& BTdata, bool isWhite) {
   for (int i = 0; i < size; i++) {
     const char* mac = BTdata[jsonKey][i];
     createOrUpdateDevice(mac, (isWhite ? device_flags_isWhiteL : device_flags_isBlackL),
-                         TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL);
+                         UNKWNON_MODEL);
   }
 
   return true;
 }
 
-void createOrUpdateDevice(const char* mac, uint8_t flags, int model, int mac_type) {
+void createOrUpdateDevice(const char* mac, uint8_t flags, int model, int mac_type, const char* name) {
   if (xSemaphoreTake(semaphoreCreateOrUpdateDevice, pdMS_TO_TICKS(30000)) == pdFALSE) {
-    Log.error(F("Semaphore NOT taken" CR));
+    THEENGS_LOG_ERROR(F("Semaphore NOT taken" CR));
+    return;
+  }
+  // A BLE MAC is XX:XX:XX:XX:XX:XX = 17 chars; macAdr is 18 bytes including the null.
+  // Reject anything longer so untrusted MQTT input cannot overflow the heap buffer.
+  if (mac == nullptr || strlen(mac) > 17) {
+    THEENGS_LOG_WARNING(F("Invalid MAC, skipping" CR));
+    xSemaphoreGive(semaphoreCreateOrUpdateDevice);
     return;
   }
-
   BLEdevice* device = getDeviceByMac(mac);
   if (device == &NO_BT_DEVICE_FOUND) {
-    Log.trace(F("add %s" CR), mac);
+    // Evict oldest non-listed device when at capacity
+    if ((int)devices.size() >= MaxBLEDevices) {
+      int oldestIdx = -1;
+      unsigned long oldestTime = ULONG_MAX;
+      for (int i = 0; i < (int)devices.size(); i++) {
+        if (!devices[i]->isWhtL && !devices[i]->isBlkL && !devices[i]->connect &&
+            devices[i]->lastUpdate < oldestTime) {
+          oldestTime = devices[i]->lastUpdate;
+          oldestIdx = i;
+        }
+      }
+      if (oldestIdx >= 0) {
+        THEENGS_LOG_TRACE(F("%.4s evict %s" CR), "BLE", devices[oldestIdx]->macAdr);
+        delete devices[oldestIdx];
+        devices.erase(devices.begin() + oldestIdx);
+      }
+    }
+    THEENGS_LOG_TRACE(F("add %s" CR), mac);
     //new device
     device = new BLEdevice();
     strcpy(device->macAdr, mac);
@@ -364,12 +405,20 @@ void createOrUpdateDevice(const char* mac, uint8_t flags, int model, int mac_typ
     device->isBlkL = flags & device_flags_isBlackL;
     device->connect = flags & device_flags_connect;
     device->macType = mac_type;
+    // Check name length
+    if (strlen(name) > 20) {
+      THEENGS_LOG_WARNING(F("Name too long, truncating" CR));
+      strncpy(device->name, name, 20);
+      device->name[19] = '\0';
+    } else {
+      strcpy(device->name, name);
+    }
     device->sensorModel_id = model;
     device->lastUpdate = millis();
     devices.push_back(device);
     newDevices++;
   } else {
-    Log.trace(F("update %s" CR), mac);
+    THEENGS_LOG_TRACE(F("update %s" CR), mac);
     device->lastUpdate = millis();
     device->macType = mac_type;
 
@@ -381,10 +430,16 @@ void createOrUpdateDevice(const char* mac, uint8_t flags, int model, int mac_typ
       device->connect = true;
     }
 
-    if (model != TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL) {
+    if (model != UNKWNON_MODEL && device->sensorModel_id == UNKWNON_MODEL) {
+      newDevices++;
+      device->isDisc = false;
       device->sensorModel_id = model;
     }
 
+    // If a device has been added to the white-list, flag it so it can be auto-detected
+    if (!device->isWhtL && flags & device_flags_isWhiteL) {
+      newDevices++;
+    }
     if (flags & device_flags_isWhiteL || flags & device_flags_isBlackL) {
       device->isWhtL = flags & device_flags_isWhiteL;
       device->isBlkL = flags & device_flags_isBlackL;
@@ -403,6 +458,7 @@ void updateDevicesStatus() {
     unsigned long now = millis();
     // Check for tracker status
     bool isTracker = false;
+#  if BLEDecoder
     std::string tag = decoder.getTheengAttribute(p->sensorModel_id, "tag");
     if (tag.length() >= 4) {
       isTracker = checkIfIsTracker(tag[3]);
@@ -416,7 +472,7 @@ void updateDevicesStatus() {
         BLEdata["id"] = p->macAdr;
         BLEdata["state"] = "offline";
         buildTopicFromId(BLEdata, subjectBTtoMQTT);
-        handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
+        enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
         // We set the lastUpdate to 0 to avoid replublishing the offline state
         p->lastUpdate = 0;
       }
@@ -430,11 +486,12 @@ void updateDevicesStatus() {
         BLEdata["id"] = p->macAdr;
         BLEdata["state"] = "offline";
         buildTopicFromId(BLEdata, subjectBTtoMQTT);
-        handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
+        enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
         // We set the lastUpdate to 0 to avoid replublishing the offline state
         p->lastUpdate = 0;
       }
     }
+#  endif
   }
 }
 
@@ -442,14 +499,14 @@ void dumpDevices() {
 #  if LOG_LEVEL > LOG_LEVEL_NOTICE
   for (vector<BLEdevice*>::iterator it = devices.begin(); it != devices.end(); ++it) {
     BLEdevice* p = *it;
-    Log.trace(F("macAdr %s" CR), p->macAdr);
-    Log.trace(F("macType %d" CR), p->macType);
-    Log.trace(F("isDisc %d" CR), p->isDisc);
-    Log.trace(F("isWhtL %d" CR), p->isWhtL);
-    Log.trace(F("isBlkL %d" CR), p->isBlkL);
-    Log.trace(F("connect %d" CR), p->connect);
-    Log.trace(F("sensorModel_id %d" CR), p->sensorModel_id);
-    Log.trace(F("LastUpdate %u" CR), p->lastUpdate);
+    THEENGS_LOG_TRACE(F("macAdr %s" CR), p->macAdr);
+    THEENGS_LOG_TRACE(F("macType %d" CR), p->macType);
+    THEENGS_LOG_TRACE(F("isDisc %d" CR), p->isDisc);
+    THEENGS_LOG_TRACE(F("isWhtL %d" CR), p->isWhtL);
+    THEENGS_LOG_TRACE(F("isBlkL %d" CR), p->isBlkL);
+    THEENGS_LOG_TRACE(F("connect %d" CR), p->connect);
+    THEENGS_LOG_TRACE(F("sensorModel_id %d" CR), p->sensorModel_id);
+    THEENGS_LOG_TRACE(F("LastUpdate %u" CR), p->lastUpdate);
   }
 #  endif
 }
@@ -462,15 +519,15 @@ void strupp(char* beg) {
 #  ifdef ZmqttDiscovery
 void DT24Discovery(const char* mac, const char* sensorModel_id) {
 #    define DT24parametersCount 7
-  Log.trace(F("DT24Discovery" CR));
+  THEENGS_LOG_TRACE(F("DT24Discovery" CR));
   const char* DT24sensor[DT24parametersCount][9] = {
-      {"sensor", "volt", mac, "voltage", jsonVolt, "", "", "V", stateClassMeasurement},
-      {"sensor", "amp", mac, "current", jsonCurrent, "", "", "A", stateClassMeasurement},
-      {"sensor", "watt", mac, "power", jsonPower, "", "", "W", stateClassMeasurement},
-      {"sensor", "watt-hour", mac, "power", jsonEnergy, "", "", "kWh", stateClassMeasurement},
-      {"sensor", "price", mac, "", jsonMsg, "", "", "", stateClassNone},
-      {"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement},
-      {"binary_sensor", "inUse", mac, "power", jsonInuse, "", "", "", stateClassNone}
+      {HASS_TYPE_SENSOR, "volt", mac, HASS_CLASS_VOLTAGE, jsonVolt, "", "", HASS_UNIT_VOLT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "amp", mac, HASS_CLASS_CURRENT, jsonCurrent, "", "", HASS_UNIT_AMP, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "watt", mac, HASS_CLASS_POWER, jsonPower, "", "", "W", stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "watt-hour", mac, HASS_CLASS_POWER, jsonEnergy, "", "", HASS_UNIT_KWH, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "price", mac, "", jsonMsg, "", "", "", stateClassNone},
+      {HASS_TYPE_SENSOR, "temp", mac, HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement},
+      {HASS_TYPE_BINARY_SENSOR, "inUse", mac, HASS_CLASS_POWER, jsonInuse, "", "", "", stateClassNone}
       //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
   };
 
@@ -479,24 +536,37 @@ void DT24Discovery(const char* mac, const char* sensorModel_id) {
 
 void BM2Discovery(const char* mac, const char* sensorModel_id) {
 #    define BM2parametersCount 2
-  Log.trace(F("BM2Discovery" CR));
+  THEENGS_LOG_TRACE(F("BM2Discovery" CR));
   const char* BM2sensor[BM2parametersCount][9] = {
-      {"sensor", "volt", mac, "voltage", jsonVoltBM2, "", "", "V", stateClassMeasurement}, // We use a json definition that retrieve only data from the BM2 decoder, as this sensor also advertize volt as an iBeacon
-      {"sensor", "batt", mac, "battery", jsonBatt, "", "", "%", stateClassMeasurement}
+      {HASS_TYPE_SENSOR, "volt", mac, HASS_CLASS_VOLTAGE, jsonVoltBM, "", "", HASS_UNIT_VOLT, stateClassMeasurement}, // We use a json definition that retrieve only data from the BM decoder, as this sensor also advertizes volt as an iBeacon
+      {HASS_TYPE_SENSOR, "batt", mac, HASS_CLASS_BATTERY, jsonBatt, "", "", HASS_UNIT_PERCENT, stateClassMeasurement}
       //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
   };
 
   createDiscoveryFromList(mac, BM2sensor, BM2parametersCount, "BM2", "Generic", sensorModel_id);
 }
 
+void BM6Discovery(const char* mac, const char* sensorModel_id) {
+#    define BM6parametersCount 3
+  THEENGS_LOG_TRACE(F("BM6Discovery" CR));
+  const char* BM6sensor[BM6parametersCount][9] = {
+      {HASS_TYPE_SENSOR, "volt", mac, HASS_CLASS_VOLTAGE, jsonVoltBM, "", "", HASS_UNIT_VOLT, stateClassMeasurement}, // We use a json definition that retrieve only data from the BM decoder, as this sensor also advertizes volt as an iBeacon
+      {HASS_TYPE_SENSOR, "temp", mac, HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "batt", mac, HASS_CLASS_BATTERY, jsonBatt, "", "", HASS_UNIT_PERCENT, stateClassMeasurement}
+      //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
+  };
+
+  createDiscoveryFromList(mac, BM6sensor, BM6parametersCount, "BM6", "Generic", sensorModel_id);
+}
+
 void LYWSD03MMCDiscovery(const char* mac, const char* sensorModel) {
 #    define LYWSD03MMCparametersCount 4
-  Log.trace(F("LYWSD03MMCDiscovery" CR));
+  THEENGS_LOG_TRACE(F("LYWSD03MMCDiscovery" CR));
   const char* LYWSD03MMCsensor[LYWSD03MMCparametersCount][9] = {
-      {"sensor", "batt", mac, "battery", jsonBatt, "", "", "%", stateClassMeasurement},
-      {"sensor", "volt", mac, "", jsonVolt, "", "", "V", stateClassMeasurement},
-      {"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement},
-      {"sensor", "hum", mac, "humidity", jsonHum, "", "", "%", stateClassMeasurement}
+      {HASS_TYPE_SENSOR, "batt", mac, HASS_CLASS_BATTERY, jsonBatt, "", "", HASS_UNIT_PERCENT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "volt", mac, "", jsonVolt, "", "", HASS_UNIT_VOLT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "temp", mac, HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "hum", mac, HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement}
       //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
   };
 
@@ -505,12 +575,12 @@ void LYWSD03MMCDiscovery(const char* mac, const char* sensorModel) {
 
 void MHO_C401Discovery(const char* mac, const char* sensorModel) {
 #    define MHO_C401parametersCount 4
-  Log.trace(F("MHO_C401Discovery" CR));
+  THEENGS_LOG_TRACE(F("MHO_C401Discovery" CR));
   const char* MHO_C401sensor[MHO_C401parametersCount][9] = {
-      {"sensor", "batt", mac, "battery", jsonBatt, "", "", "%", stateClassMeasurement},
-      {"sensor", "volt", mac, "", jsonVolt, "", "", "V", stateClassMeasurement},
-      {"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement},
-      {"sensor", "hum", mac, "humidity", jsonHum, "", "", "%", stateClassMeasurement}
+      {HASS_TYPE_SENSOR, "batt", mac, HASS_CLASS_BATTERY, jsonBatt, "", "", HASS_UNIT_PERCENT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "volt", mac, "", jsonVolt, "", "", HASS_UNIT_VOLT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "temp", mac, HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "hum", mac, HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement}
       //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
   };
 
@@ -519,13 +589,13 @@ void MHO_C401Discovery(const char* mac, const char* sensorModel) {
 
 void HHCCJCY01HHCCDiscovery(const char* mac, const char* sensorModel) {
 #    define HHCCJCY01HHCCparametersCount 5
-  Log.trace(F("HHCCJCY01HHCCDiscovery" CR));
+  THEENGS_LOG_TRACE(F("HHCCJCY01HHCCDiscovery" CR));
   const char* HHCCJCY01HHCCsensor[HHCCJCY01HHCCparametersCount][9] = {
-      {"sensor", "batt", mac, "battery", jsonBatt, "", "", "%", stateClassMeasurement},
-      {"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement},
-      {"sensor", "lux", mac, "illuminance", jsonLux, "", "", "lx", stateClassMeasurement},
-      {"sensor", "fer", mac, "", jsonFer, "", "", "µS/cm", stateClassMeasurement},
-      {"sensor", "moi", mac, "", jsonMoi, "", "", "%", stateClassMeasurement}
+      {HASS_TYPE_SENSOR, "batt", mac, HASS_CLASS_BATTERY, jsonBatt, "", "", HASS_UNIT_PERCENT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "temp", mac, HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "lux", mac, HASS_CLASS_ILLUMINANCE, jsonLux, "", "", "lx", stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "fer", mac, "", jsonFer, "", "", "µS/cm", stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "moi", mac, "", jsonMoi, "", "", HASS_UNIT_PERCENT, stateClassMeasurement}
       //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
   };
 
@@ -534,12 +604,12 @@ void HHCCJCY01HHCCDiscovery(const char* mac, const char* sensorModel) {
 
 void XMWSDJ04MMCDiscovery(const char* mac, const char* sensorModel) {
 #    define XMWSDJ04MMCparametersCount 4
-  Log.trace(F("XMWSDJ04MMCDiscovery" CR));
+  THEENGS_LOG_TRACE(F("XMWSDJ04MMCDiscovery" CR));
   const char* XMWSDJ04MMCsensor[XMWSDJ04MMCparametersCount][9] = {
-      {"sensor", "batt", mac, "battery", jsonBatt, "", "", "%", stateClassMeasurement},
-      {"sensor", "volt", mac, "", jsonVolt, "", "", "V", stateClassMeasurement},
-      {"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement},
-      {"sensor", "hum", mac, "humidity", jsonHum, "", "", "%", stateClassMeasurement}
+      {HASS_TYPE_SENSOR, "batt", mac, HASS_CLASS_BATTERY, jsonBatt, "", "", HASS_UNIT_PERCENT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "volt", mac, "", jsonVolt, "", "", HASS_UNIT_VOLT, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "temp", mac, HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement},
+      {HASS_TYPE_SENSOR, "hum", mac, HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement}
       //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
   };
 
@@ -552,6 +622,7 @@ void MHO_C401Discovery(const char* mac, const char* sensorModel) {}
 void HHCCJCY01HHCCDiscovery(const char* mac, const char* sensorModel) {}
 void DT24Discovery(const char* mac, const char* sensorModel_id) {}
 void BM2Discovery(const char* mac, const char* sensorModel_id) {}
+void BM6Discovery(const char* mac, const char* sensorModel_id) {}
 void XMWSDJ04MMCDiscovery(const char* mac, const char* sensorModel_id) {}
 #  endif
 
@@ -564,22 +635,22 @@ void XMWSDJ04MMCDiscovery(const char* mac, const char* sensorModel_id) {}
 //core on which the BLE detection task will run
 static int taskCore = 0;
 
-class MyAdvertisedDeviceCallbacks : public BLEAdvertisedDeviceCallbacks {
-  void onResult(BLEAdvertisedDevice* advertisedDevice) {
-    BLEAdvertisedDevice* ad = new BLEAdvertisedDevice(*advertisedDevice);
+class ScanCallbacks : public NimBLEScanCallbacks {
+  void onResult(const NimBLEAdvertisedDevice* advertisedDevice) {
+    NimBLEAdvertisedDevice* ad = new NimBLEAdvertisedDevice(*advertisedDevice);
     if (xQueueSend(BLEQueue, &ad, 0) != pdTRUE) {
-      Log.error(F("BLEQueue full" CR));
+      THEENGS_LOG_ERROR(F("BLEQueue full" CR));
       delete (ad);
     }
   }
-};
+} scanCallbacks;
 
 std::string convertServiceData(std::string deviceServiceData) {
   int serviceDataLength = (int)deviceServiceData.length();
   char spr[2 * serviceDataLength + 1];
   for (int i = 0; i < serviceDataLength; i++) sprintf(spr + 2 * i, "%.2x", (unsigned char)deviceServiceData[i]);
   spr[2 * serviceDataLength] = 0;
-  Log.trace(F("Converted service data (%d) to %s" CR), serviceDataLength, spr);
+  THEENGS_LOG_TRACE(F("Converted service data (%d) to %s" CR), serviceDataLength, spr);
   return spr;
 }
 
@@ -591,7 +662,7 @@ bool checkIfIsTracker(char ch) {
     data = 10 + (ch - 'a');
 
   if (((data >> 3) & 0x01) == 1) {
-    Log.trace(F("Is Device Tracker" CR));
+    THEENGS_LOG_TRACE(F("Is Device Tracker" CR));
     return true;
   } else {
     return false;
@@ -606,23 +677,17 @@ void procBLETask(void* pvParameters) {
     // Feed the watchdog
     //esp_task_wdt_reset();
     if (!BTProcessLock) {
-      Log.trace(F("Creating BLE buffer" CR));
+      THEENGS_LOG_TRACE(F("Creating BLE buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
       JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      std::string mac_address = advertisedDevice->getAddress().toString();
-
-      for (char& c : mac_address) {
-        c = std::toupper(c);
-      }
-
-      BLEdata["id"] = mac_address;
+      BLEdata["id"] = advertisedDevice->getAddress().toString();
       BLEdata["mac_type"] = advertisedDevice->getAddress().getType();
       BLEdata["adv_type"] = advertisedDevice->getAdvType();
-      Log.notice(F("Device detected: %s" CR), BLEdata["id"].as<const char*>());
+      THEENGS_LOG_NOTICE(F("BT Device detected: %s" CR), BLEdata["id"].as<const char*>());
       BLEdevice* device = getDeviceByMac(BLEdata["id"].as<const char*>());
 
       if (BTConfig.filterConnectable && device->connect) {
-        Log.notice(F("Filtered connectable device" CR));
+        THEENGS_LOG_NOTICE(F("Filtered connectable device" CR));
         delete (advertisedDevice);
         continue;
       }
@@ -631,28 +696,26 @@ void procBLETask(void* pvParameters) {
         if (advertisedDevice->haveName())
           BLEdata["name"] = (char*)advertisedDevice->getName().c_str();
         if (advertisedDevice->haveManufacturerData()) {
-          char* manufacturerdata = BLEUtils::buildHexData(NULL, (uint8_t*)advertisedDevice->getManufacturerData().data(), advertisedDevice->getManufacturerData().length());
-          BLEdata["manufacturerdata"] = manufacturerdata;
-          free(manufacturerdata);
+          BLEdata["manufacturerdata"] = NimBLEUtils::dataToHexString((uint8_t*)advertisedDevice->getManufacturerData().data(),
+                                                                     advertisedDevice->getManufacturerData().length());
         }
-        if (advertisedDevice->haveRSSI())
-          BLEdata["rssi"] = (int)advertisedDevice->getRSSI();
+        BLEdata["rssi"] = (int)advertisedDevice->getRSSI();
         if (advertisedDevice->haveTXPower())
           BLEdata["txpower"] = (int8_t)advertisedDevice->getTXPower();
-        if (advertisedDevice->haveRSSI() && BTConfig.presenceEnable) {
-          hass_presence(BLEdata); // this device has an rssi and with either only sensors or not we can use it for home assistant room presence component
+        if (BTConfig.presenceEnable) {
+          hass_presence(BLEdata); // with either only sensors or not we can use it for home assistant room presence component
         }
         if (advertisedDevice->haveServiceData()) {
           int serviceDataCount = advertisedDevice->getServiceDataCount();
-          Log.trace(F("Get services data number: %d" CR), serviceDataCount);
+          THEENGS_LOG_TRACE(F("Get services data number: %d" CR), serviceDataCount);
           for (int j = 0; j < serviceDataCount; j++) {
             StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBufferTemp;
             JsonObject BLEdataTemp = BLEdataBufferTemp.to<JsonObject>();
             BLEdataBufferTemp = BLEdataBuffer;
             std::string service_data = convertServiceData(advertisedDevice->getServiceData(j));
-            Log.trace(F("Service data: %s" CR), service_data.c_str());
+            THEENGS_LOG_TRACE(F("Service data: %s" CR), service_data.c_str());
             std::string serviceDatauuid = advertisedDevice->getServiceDataUUID(j).toString();
-            Log.trace(F("Service data UUID: %s" CR), (char*)serviceDatauuid.c_str());
+            THEENGS_LOG_TRACE(F("Service data UUID: %s" CR), (char*)serviceDatauuid.c_str());
             BLEdataTemp["servicedata"] = (char*)service_data.c_str();
             BLEdataTemp["servicedatauuid"] = (char*)serviceDatauuid.c_str();
             PublishDeviceData(BLEdataTemp);
@@ -661,11 +724,12 @@ void procBLETask(void* pvParameters) {
           PublishDeviceData(BLEdata);
         }
       } else {
-        Log.trace(F("Filtered MAC device" CR));
+        THEENGS_LOG_TRACE(F("Filtered MAC device" CR));
       }
       updateDevicesStatus();
     }
     delete (advertisedDevice);
+    vTaskDelay(10);
   }
 }
 
@@ -677,10 +741,9 @@ void BLEscan() {
   while (uxQueueMessagesWaiting(BLEQueue) || queueLength != 0) { // the criteria on queueLength could be adjusted to parallelize the scan and the queue processing
     delay(1); // Wait for queue to empty, a yield here instead of the delay cause the WDT to trigger
   }
-  Log.notice(F("Scan begin" CR));
+  THEENGS_LOG_NOTICE(F("Scan begin" CR));
   BLEScan* pBLEScan = BLEDevice::getScan();
-  MyAdvertisedDeviceCallbacks myCallbacks;
-  pBLEScan->setAdvertisedDeviceCallbacks(&myCallbacks);
+  pBLEScan->setScanCallbacks(&scanCallbacks);
   if ((millis() > (timeBetweenActive + BTConfig.intervalActiveScan) || BTConfig.intervalActiveScan == BTConfig.BLEinterval) && !BTConfig.forcePassiveScan) {
     pBLEScan->setActiveScan(true);
     timeBetweenActive = millis();
@@ -689,24 +752,25 @@ void BLEscan() {
   }
   pBLEScan->setInterval(BLEScanInterval);
   pBLEScan->setWindow(BLEScanWindow);
-  BLEScanResults foundDevices = pBLEScan->start(BTConfig.scanDuration / 1000, false);
+  NimBLEScanResults foundDevices = pBLEScan->getResults(BTConfig.scanDuration, false);
   if (foundDevices.getCount())
     scanCount++;
-  Log.notice(F("Found %d devices, scan number %d end" CR), foundDevices.getCount(), scanCount);
-  Log.trace(F("Process BLE stack free: %u" CR), uxTaskGetStackHighWaterMark(xProcBLETaskHandle));
+  THEENGS_LOG_NOTICE(F("Found %d devices, scan number %d end" CR), foundDevices.getCount(), scanCount);
+  THEENGS_LOG_TRACE(F("Process BLE stack free: %u" CR), uxTaskGetStackHighWaterMark(xProcBLETaskHandle));
 }
 
 /**
  * Connect to BLE devices and initiate the callbacks with a service/characteristic request
  */
+#  if BLEDecoder
 void BLEconnect() {
   if (!BTProcessLock) {
-    Log.notice(F("BLE Connect begin" CR));
+    THEENGS_LOG_NOTICE(F("BLE Connect begin" CR));
     do {
       for (vector<BLEdevice*>::iterator it = devices.begin(); it != devices.end(); ++it) {
         BLEdevice* p = *it;
         if (p->connect) {
-          Log.trace(F("Model to connect found: %s" CR), p->macAdr);
+          THEENGS_LOG_TRACE(F("Model to connect found: %s" CR), p->macAdr);
           NimBLEAddress addr((const char*)p->macAdr, p->macType);
           if (p->sensorModel_id == BLEconectable::id::LYWSD03MMC ||
               p->sensorModel_id == BLEconectable::id::MHO_C401) {
@@ -721,6 +785,10 @@ void BLEconnect() {
             BM2_connect BLEclient(addr);
             BLEclient.processActions(BLEactions);
             BLEclient.publishData();
+          } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM6) {
+            BM6_connect BLEclient(addr);
+            BLEclient.processActions(BLEactions);
+            BLEclient.publishData();
           } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC) {
             HHCCJCY01HHCC_connect BLEclient(addr);
             BLEclient.processActions(BLEactions);
@@ -732,6 +800,12 @@ void BLEconnect() {
           } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBS1) {
             SBS1_connect BLEclient(addr);
             BLEclient.processActions(BLEactions);
+          } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBBT) {
+            SBBT_connect BLEclient(addr);
+            BLEclient.processActions(BLEactions);
+          } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBCU) {
+            SBCU_connect BLEclient(addr);
+            BLEclient.processActions(BLEactions);
           } else {
             GENERIC_connect BLEclient(addr);
             if (BLEclient.processActions(BLEactions)) {
@@ -745,11 +819,12 @@ void BLEconnect() {
             for (auto& it : BLEactions) {
               if (!it.complete && --it.ttl) {
                 swap.push_back(it);
-              } else if (memcmp(it.addr, p->macAdr, sizeof(it.addr)) == 0) {
+              } else if (it.addr == NimBLEAddress(p->macAdr, p->macType)) {
                 if (p->sensorModel_id != BLEconectable::id::DT24_BLE &&
                     p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC &&
                     p->sensorModel_id != BLEconectable::id::LYWSD03MMC &&
                     p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::BM2 &&
+                    p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::BM6 &&
                     p->sensorModel_id != BLEconectable::id::MHO_C401 &&
                     p->sensorModel_id != BLEconectable::id::XMWSDJ04MMC) {
                   // if irregulary connected to and connection failed clear the connect flag.
@@ -762,22 +837,25 @@ void BLEconnect() {
         }
       }
     } while (BLEactions.size() > 0);
-    Log.notice(F("BLE Connect end" CR));
+    THEENGS_LOG_NOTICE(F("BLE Connect end" CR));
   }
 }
+#  else
+void BLEconnect() {}
+#  endif
 
-void stopProcessing() {
+void stopProcessing(bool deinit) {
   if (BTConfig.enabled) {
     BTProcessLock = true;
     // We stop the scan
-    Log.notice(F("Stopping BLE scan" CR));
+    THEENGS_LOG_NOTICE(F("Stopping BLE scan" CR));
     BLEScan* pBLEScan = BLEDevice::getScan();
     if (pBLEScan->isScanning()) {
       pBLEScan->stop();
     }
 
     if (xSemaphoreTake(semaphoreBLEOperation, pdMS_TO_TICKS(5000)) == pdTRUE) {
-      Log.notice(F("Stopping BLE tasks" CR));
+      THEENGS_LOG_NOTICE(F("Stopping BLE tasks" CR));
       //Suspending, deleting tasks and stopping BT to free memory
       vTaskSuspend(xCoreTaskHandle);
       vTaskDelete(xCoreTaskHandle);
@@ -785,39 +863,33 @@ void stopProcessing() {
       vTaskDelete(xProcBLETaskHandle);
       xSemaphoreGive(semaphoreBLEOperation);
     }
+    // Using deinit to free memory, should only be used if we are going to restart the gateway
+    if (deinit)
+      BLEDevice::deinit(true);
   }
-  Log.notice(F("BLE gateway stopped %T, free heap: %d" CR), ESP.getFreeHeap());
+  THEENGS_LOG_NOTICE(F("BLE gateway stopped, free heap: %d" CR), ESP.getFreeHeap());
 }
 
 void coreTask(void* pvParameters) {
   while (true) {
     if (!BTProcessLock) {
-      int n = 0;
-      while (client.state() != 0 && n <= InitialMQTTConnectionTimeout && !BTProcessLock) {
-        n++;
-        delay(1000);
-      }
-      if (!connected) {
-        Log.warning(F("MQTT client or Network disconnected no BLE scan" CR));
-      } else if (!BTProcessLock) {
-        if (xSemaphoreTake(semaphoreBLEOperation, pdMS_TO_TICKS(30000)) == pdTRUE) {
-          BLEscan();
-          // Launching a connect every TimeBtwConnect
-          if (millis() > (timeBetweenConnect + BTConfig.intervalConnect) && BTConfig.bleConnect) {
-            timeBetweenConnect = millis();
-            BLEconnect();
-          }
-          //dumpDevices();
-          Log.trace(F("CoreTask stack free: %u" CR), uxTaskGetStackHighWaterMark(xCoreTaskHandle));
-          xSemaphoreGive(semaphoreBLEOperation);
-        } else {
-          Log.error(F("Failed to start scan - BLE busy" CR));
+      if (xSemaphoreTake(semaphoreBLEOperation, pdMS_TO_TICKS(30000)) == pdTRUE) {
+        BLEscan();
+        // Launching a connect every TimeBtwConnect
+        if (millis() > (timeBetweenConnect + BTConfig.intervalConnect) && BTConfig.bleConnect) {
+          timeBetweenConnect = millis();
+          BLEconnect();
         }
+        //dumpDevices();
+        THEENGS_LOG_TRACE(F("CoreTask stack free: %u" CR), uxTaskGetStackHighWaterMark(xCoreTaskHandle));
+        xSemaphoreGive(semaphoreBLEOperation);
+      } else {
+        THEENGS_LOG_ERROR(F("Failed to start scan - BLE busy" CR));
       }
-      if (lowpowermode > 0) {
-        lowPowerESP32();
+      if (SYSConfig.powerMode > 0) {
         int scan = atomic_exchange_explicit(&forceBTScan, 0, ::memory_order_seq_cst); // is this enough, it will wait the full deepsleep...
         if (scan == 1) BTforceScan();
+        ready_to_sleep = true;
       } else {
         for (int interval = BTConfig.BLEinterval, waitms; interval > 0; interval -= waitms) {
           int scan = atomic_exchange_explicit(&forceBTScan, 0, ::memory_order_seq_cst);
@@ -830,71 +902,18 @@ void coreTask(void* pvParameters) {
   }
 }
 
-#  if DEFAULT_LOW_POWER_MODE != -1
-void lowPowerESP32() { // low power mode
-  Log.trace(F("Going to deep sleep for: %l s" CR), (TimeBtwRead / 1000));
-  deepSleep(TimeBtwRead * 1000);
-}
-
-void deepSleep(uint64_t time_in_us) {
-#    if defined(ZboardM5STACK) || defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-  sleepScreen();
-  esp_sleep_enable_ext0_wakeup((gpio_num_t)SLEEP_BUTTON, LOW);
-#    endif
-
-  Log.trace(F("Deactivating ESP32 components" CR));
-  stopProcessing();
-  ProcessLock = true;
-  // Ignore the deprecated warning, this call is necessary here.
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  adc_power_off();
-#    pragma GCC diagnostic pop
-  esp_wifi_stop();
-  esp_deep_sleep(time_in_us);
-}
-#  else
-void lowPowerESP32() {}
-#  endif
-
-void changelowpowermode(int newLowPowerMode) {
-#  if DEFAULT_LOW_POWER_MODE != -1
-  Log.notice(F("Changing LOW POWER mode to: %d" CR), newLowPowerMode);
-#    if defined(ZboardM5STACK) || defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-  if (lowpowermode == 2) {
-#      ifdef ZboardM5STACK
-    M5.Lcd.wakeup();
-#      endif
-#      if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-    M5.Axp.SetLDO2(true);
-    M5.Lcd.begin();
-#      endif
-  }
-  char lpm[2];
-  sprintf(lpm, "%d", newLowPowerMode);
-  M5Print("Changing LOW POWER mode to:", lpm, "");
-#    endif
-  lowpowermode = newLowPowerMode;
-  preferences.begin(Gateway_Short_Name, false);
-  int result = preferences.putUInt("lowpowermode", lowpowermode);
-  Log.notice(F("BT LPM config save result: %d" CR), result);
-  preferences.end();
-  // Publish the states to update the controller switch status
-  stateMeasures();
-#  endif
-}
-
 void setupBTTasksAndBLE() {
+#  ifdef CONFIG_BTDM_BLE_SCAN_DUPL
   BLEDevice::setScanDuplicateCacheSize(BLEScanDuplicateCacheSize);
+#  endif
   BLEDevice::init("");
-
-  xTaskCreatePinnedToCore(
+  xTaskCreateUniversal(
       procBLETask, /* Function to implement the task */
       "procBLETask", /* Name of the task */
-#  ifdef USE_BLUFI
-      13000,
+#  if defined(USE_ESP_IDF) || defined(USE_BLUFI)
+      14500,
 #  else
-      8500, /* Stack size in bytes */
+      8000, /* Stack size in bytes */
 #  endif
       NULL, /* Task input parameter */
       2, /* Priority of the task (set higher than core task) */
@@ -902,7 +921,7 @@ void setupBTTasksAndBLE() {
       1); /* Core where the task should run */
 
   // we setup a task with priority one to avoid conflict with other gateways
-  xTaskCreatePinnedToCore(
+  xTaskCreateUniversal(
       coreTask, /* Function to implement the task */
       "coreTask", /* Name of the task */
       5120, /* Stack size in bytes */
@@ -915,19 +934,18 @@ void setupBTTasksAndBLE() {
 void setupBT() {
   BTConfig_init();
   BTConfig_load();
-  Log.notice(F("BLE scans interval: %d" CR), BTConfig.BLEinterval);
-  Log.notice(F("BLE connects interval: %d" CR), BTConfig.intervalConnect);
-  Log.notice(F("BLE scan duration: %d" CR), BTConfig.scanDuration);
-  Log.notice(F("Publishing only BLE sensors: %T" CR), BTConfig.pubOnlySensors);
-  Log.notice(F("Publishing random MAC devices: %T" CR), BTConfig.pubRandomMACs);
-  Log.notice(F("Adaptive BLE scan: %T" CR), BTConfig.adaptiveScan);
-  Log.notice(F("Active BLE scan interval: %d" CR), BTConfig.intervalActiveScan);
-  Log.notice(F("minrssi: %d" CR), -abs(BTConfig.minRssi));
-  Log.notice(F("Low Power Mode: %d" CR), lowpowermode);
-  Log.notice(F("Presence Away Timer: %d" CR), BTConfig.presenceAwayTimer);
-  Log.notice(F("Moving Timer: %d" CR), BTConfig.movingTimer);
-  Log.notice(F("Force passive scan: %T" CR), BTConfig.forcePassiveScan);
-  Log.notice(F("Enabled BLE: %T" CR), BTConfig.enabled);
+  THEENGS_LOG_NOTICE(F("BLE scans interval: %d" CR), BTConfig.BLEinterval);
+  THEENGS_LOG_NOTICE(F("BLE connects interval: %d" CR), BTConfig.intervalConnect);
+  THEENGS_LOG_NOTICE(F("BLE scan duration: %d" CR), BTConfig.scanDuration);
+  THEENGS_LOG_NOTICE(F("Publishing only BLE sensors: %T" CR), BTConfig.pubOnlySensors);
+  THEENGS_LOG_NOTICE(F("Publishing random MAC devices: %T" CR), BTConfig.pubRandomMACs);
+  THEENGS_LOG_NOTICE(F("Adaptive BLE scan: %T" CR), BTConfig.adaptiveScan);
+  THEENGS_LOG_NOTICE(F("Active BLE scan interval: %d" CR), BTConfig.intervalActiveScan);
+  THEENGS_LOG_NOTICE(F("minrssi: %d" CR), -abs(BTConfig.minRssi));
+  THEENGS_LOG_NOTICE(F("Presence Away Timer: %d" CR), BTConfig.presenceAwayTimer);
+  THEENGS_LOG_NOTICE(F("Moving Timer: %d" CR), BTConfig.movingTimer);
+  THEENGS_LOG_NOTICE(F("Force passive scan: %T" CR), BTConfig.forcePassiveScan);
+  THEENGS_LOG_NOTICE(F("Enabled BLE: %T" CR), BTConfig.enabled);
 
   atomic_init(&forceBTScan, 0); // in theory, we don't need this
 
@@ -940,17 +958,12 @@ void setupBT() {
   BLEQueue = xQueueCreate(QueueSize, sizeof(NimBLEAdvertisedDevice*));
   if (BTConfig.enabled) {
     setupBTTasksAndBLE();
-    Log.notice(F("ZgatewayBT multicore ESP32 setup done" CR));
+    THEENGS_LOG_NOTICE(F("gatewayBT multicore ESP32 setup done" CR));
   } else {
-    Log.notice(F("ZgatewayBT multicore ESP32 setup disabled" CR));
+    THEENGS_LOG_NOTICE(F("gatewayBT multicore ESP32 setup disabled" CR));
   }
 }
 
-bool BTtoMQTT() { // for on demand BLE scans
-  BLEscan();
-  return true;
-}
-
 boolean valid_service_data(const char* data, int size) {
   for (int i = 0; i < size; ++i) {
     if (data[i] != 48) // 48 correspond to 0 in ASCII table
@@ -959,14 +972,14 @@ boolean valid_service_data(const char* data, int size) {
   return false;
 }
 
-#  ifdef ZmqttDiscovery
+#  if defined(ZmqttDiscovery) && BLEDecoder == true
 // This function always should be called from the main core as it generates direct mqtt messages
 // When overrideDiscovery=true, we publish discovery messages of known devices (even if no new)
 void launchBTDiscovery(bool overrideDiscovery) {
   if (!overrideDiscovery && newDevices == 0)
     return;
   if (xSemaphoreTake(semaphoreCreateOrUpdateDevice, pdMS_TO_TICKS(QueueSemaphoreTimeOutTask)) == pdFALSE) {
-    Log.error(F("Semaphore NOT taken" CR));
+    THEENGS_LOG_ERROR(F("Semaphore NOT taken" CR));
     return;
   }
   newDevices = 0;
@@ -974,17 +987,22 @@ void launchBTDiscovery(bool overrideDiscovery) {
   xSemaphoreGive(semaphoreCreateOrUpdateDevice);
   for (vector<BLEdevice*>::iterator it = localDevices.begin(); it != localDevices.end(); ++it) {
     BLEdevice* p = *it;
-    Log.trace(F("Device mac %s" CR), p->macAdr);
+    THEENGS_LOG_TRACE(F("Device mac %s" CR), p->macAdr);
     // Do not launch discovery for the devices already discovered (unless we have overrideDiscovery) or that are not unique by their MAC Address (iBeacon, GAEN and Microsoft CDP)
     if (overrideDiscovery || !isDiscovered(p)) {
       String macWOdots = String(p->macAdr);
       macWOdots.replace(":", "");
       if (p->sensorModel_id >= 0) {
-        Log.trace(F("Looking for Model_id: %d" CR), p->sensorModel_id);
+        THEENGS_LOG_TRACE(F("Looking for Model_id: %d" CR), p->sensorModel_id);
         std::string properties = decoder.getTheengProperties(p->sensorModel_id);
-        Log.trace(F("properties: %s" CR), properties.c_str());
+        THEENGS_LOG_TRACE(F("properties: %s" CR), properties.c_str());
         std::string brand = decoder.getTheengAttribute(p->sensorModel_id, "brand");
         std::string model = decoder.getTheengAttribute(p->sensorModel_id, "model");
+#    if ForceDeviceName
+        if (p->name[0] != '\0') {
+          model = p->name;
+        }
+#    endif
         std::string model_id = decoder.getTheengAttribute(p->sensorModel_id, "model_id");
 
         // Check for tracker status
@@ -996,13 +1014,15 @@ void launchBTDiscovery(bool overrideDiscovery) {
 
         String discovery_topic = String(subjectBTtoMQTT) + "/" + macWOdots;
         if (!BTConfig.extDecoderEnable && // Do not decode if an external decoder is configured
-            p->sensorModel_id > TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL &&
+            p->sensorModel_id > UNKWNON_MODEL &&
             p->sensorModel_id < TheengsDecoder::BLE_ID_NUM::BLE_ID_MAX &&
-            p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC && p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::BM2) { // Exception on HHCCJCY01HHCC and BM2 as these ones are discoverable and connectable
+            p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC &&
+            p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::BM2 &&
+            p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::BM6) { // Exception on HHCCJCY01HHCC and BM2/BM6 as these ones are discoverable and connectable
           if (isTracker) {
             String tracker_name = String(model_id.c_str()) + "-tracker";
             String tracker_id = macWOdots + "-tracker";
-            createDiscovery("device_tracker",
+            createDiscovery(HASS_TYPE_DEVICE_TRACKER,
                             discovery_topic.c_str(), tracker_name.c_str(), tracker_id.c_str(),
                             will_Topic, "occupancy", "{% if value_json.get('rssi') -%}home{%- else -%}not_home{%- endif %}",
                             "", "", "",
@@ -1013,7 +1033,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
           if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BC08) {
             String sensor_name = String(model_id.c_str()) + "-moving";
             String sensor_id = macWOdots + "-moving";
-            createDiscovery("binary_sensor",
+            createDiscovery(HASS_TYPE_BINARY_SENSOR,
                             discovery_topic.c_str(), sensor_name.c_str(), sensor_id.c_str(),
                             will_Topic, "moving", "{% if value_json.get('accx') -%}on{%- else -%}off{%- endif %}",
                             "on", "off", "",
@@ -1028,33 +1048,63 @@ void launchBTDiscovery(bool overrideDiscovery) {
               if (jsonBuffer.overflowed()) {
                 // This should not happen if JSON_MSG_BUFFER is large enough for
                 // the Theengs json properties
-                Log.error(F("JSON deserialization of Theengs properties overflowed (error %s), buffer capacity: %u. Program might crash. Properties json: %s" CR),
-                          error.c_str(), jsonBuffer.capacity(), properties.c_str());
+                THEENGS_LOG_ERROR(F("JSON deserialization of Theengs properties overflowed (error %s), buffer capacity: %u. Program might crash. Properties json: %s" CR),
+                                  error.c_str(), jsonBuffer.capacity(), properties.c_str());
               } else {
-                Log.error(F("JSON deserialization of Theengs properties errored: %" CR),
-                          error.c_str());
+                THEENGS_LOG_ERROR(F("JSON deserialization of Theengs properties errored: %" CR),
+                                  error.c_str());
               }
             }
             for (JsonPair prop : jsonBuffer["properties"].as<JsonObject>()) {
-              Log.trace(F("Key: %s"), prop.key().c_str());
-              Log.trace(F("Unit: %s"), prop.value()["unit"].as<const char*>());
-              Log.trace(F("Name: %s"), prop.value()["name"].as<const char*>());
+              THEENGS_LOG_TRACE(F("Key: %s"), prop.key().c_str());
+              THEENGS_LOG_TRACE(F("Unit: %s"), prop.value()["unit"].as<const char*>());
+              THEENGS_LOG_TRACE(F("Name: %s"), prop.value()["name"].as<const char*>());
               String entity_name = String(model_id.c_str()) + "-" + String(prop.key().c_str());
               String unique_id = macWOdots + "-" + String(prop.key().c_str());
               String value_template = "{{ value_json." + String(prop.key().c_str()) + " | is_defined }}";
-              if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBS1 && strcmp(prop.key().c_str(), "state") != 0) {
-                String payload_on = "{\"SBS1\":\"on\",\"mac\":\"" + String(p->macAdr) + "\"}";
-                String payload_off = "{\"SBS1\":\"off\",\"mac\":\"" + String(p->macAdr) + "\"}";
-                createDiscovery("switch", //set Type
+              if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBS1 && strcmp(prop.key().c_str(), "state") == 0) {
+                String payload_on = "{\"model_id\":\"X1\",\"cmd\":\"on\",\"id\":\"" + String(p->macAdr) + "\"}";
+                String payload_off = "{\"model_id\":\"X1\",\"cmd\":\"off\",\"id\":\"" + String(p->macAdr) + "\"}";
+                createDiscovery(HASS_TYPE_SWITCH, //set Type
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
-                                will_Topic, "switch", value_template.c_str(),
+                                will_Topic, HASS_TYPE_SWITCH, value_template.c_str(),
                                 payload_on.c_str(), payload_off.c_str(), "", 0,
-                                Gateway_AnnouncementMsg, will_Message, false, subjectMQTTtoBTset,
+                                Gateway_AnnouncementMsg, will_Message, false, subjectMQTTtoBT,
                                 model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                                 stateClassNone, "off", "on");
+                unique_id = macWOdots + "-press";
+                entity_name = String(model_id.c_str()) + "-press";
+                String payload_press = "{\"model_id\":\"X1\",\"cmd\":\"press\",\"id\":\"" + String(p->macAdr) + "\"}";
+                createDiscovery(HASS_TYPE_BUTTON, //set Type
+                                discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
+                                will_Topic, HASS_TYPE_BUTTON, "",
+                                payload_press.c_str(), "", "", //set,payload_on,payload_off,unit_of_meas,
+                                0, //set  off_delay
+                                Gateway_AnnouncementMsg, will_Message, false, subjectMQTTtoBT,
+                                model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
+                                stateClassNone);
+              } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBBT && strcmp(prop.key().c_str(), "open") == 0) {
+                value_template = "{% if value_json.direction == \"up\" -%} {{ 100 - value_json.open/2 }}{% elif value_json.direction == \"down\" %}{{ value_json.open/2 }}{% else %} {{ value_json.open/2 }}{%- endif %}";
+                String command_template = "{\"model_id\":\"W270160X\",\"tilt\":{{ value | int }},\"id\":\"" + String(p->macAdr) + "\"}";
+                createDiscovery(HASS_TYPE_COVER, //set Type
+                                discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
+                                will_Topic, HASS_TYPE_COVER, value_template.c_str(),
+                                "50", "", "", 0,
+                                Gateway_AnnouncementMsg, will_Message, false, subjectMQTTtoBT,
+                                model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
+                                "blind", nullptr, nullptr, nullptr, command_template.c_str());
+              } else if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBCU && strcmp(prop.key().c_str(), "position") == 0) {
+                String command_template = "{\"model_id\":\"W070160X\",\"position\":{{ value | int }},\"id\":\"" + String(p->macAdr) + "\"}";
+                createDiscovery(HASS_TYPE_COVER, //set Type
+                                discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
+                                will_Topic, HASS_TYPE_COVER, "{{ value_json.position }}",
+                                "0", "100", "", 0,
+                                Gateway_AnnouncementMsg, will_Message, false, subjectMQTTtoBT,
+                                model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
+                                "curtain", nullptr, nullptr, nullptr, command_template.c_str());
               } else if ((p->sensorModel_id == TheengsDecoder::XMTZC04HMKG || p->sensorModel_id == TheengsDecoder::XMTZC04HMLB || p->sensorModel_id == TheengsDecoder::XMTZC05HMKG || p->sensorModel_id == TheengsDecoder::XMTZC05HMLB) &&
                          strcmp(prop.key().c_str(), "weighing_mode") == 0) {
-                createDiscovery("sensor",
+                createDiscovery(HASS_TYPE_SENSOR,
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, "enum", value_template.c_str(),
                                 "", "", prop.value()["unit"],
@@ -1063,15 +1113,19 @@ void launchBTDiscovery(bool overrideDiscovery) {
                                 stateClassMeasurement, nullptr, nullptr, "[\"person\",\"object\"]");
               } else if ((p->sensorModel_id == TheengsDecoder::XMTZC04HMKG || p->sensorModel_id == TheengsDecoder::XMTZC04HMLB || p->sensorModel_id == TheengsDecoder::XMTZC05HMKG || p->sensorModel_id == TheengsDecoder::XMTZC05HMLB) &&
                          strcmp(prop.key().c_str(), "unit") == 0) {
-                createDiscovery("sensor",
+                createDiscovery(HASS_TYPE_SENSOR,
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, "enum", value_template.c_str(),
                                 "", "", prop.value()["unit"],
                                 0, "", "", false, "",
                                 model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                                 stateClassMeasurement, nullptr, nullptr, "[\"lb\",\"kg\",\"jin\"]");
-              } else if (strcmp(prop.value()["unit"], "string") == 0 && strcmp(prop.key().c_str(), "mac") != 0) {
-                createDiscovery("sensor",
+              } else if ((strcmp(prop.value()["unit"], "string") == 0 || strcmp(prop.value()["unit"], "hex") == 0) && strcmp(prop.key().c_str(), "mac") != 0) {
+                // Non-numeric properties (e.g. iBeacon uuid/mfid/manufacturerdata
+                // carry unit "hex"). HA rejects a sensor that has state_class
+                // "measurement" but a non-numeric value, so emit these as plain
+                // text sensors: no state_class, no unit_of_measurement.
+                createDiscovery(HASS_TYPE_SENSOR,
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, prop.value()["name"], value_template.c_str(),
                                 "", "", "",
@@ -1079,7 +1133,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
                                 model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                                 stateClassNone);
               } else if (p->sensorModel_id == TheengsDecoder::MUE4094RT && strcmp(prop.value()["unit"], "status") == 0) { // This device does not a broadcast when there is nothing detected so adding a timeout
-                createDiscovery("binary_sensor",
+                createDiscovery(HASS_TYPE_BINARY_SENSOR,
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, prop.value()["name"], value_template.c_str(),
                                 "True", "False", "",
@@ -1087,7 +1141,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
                                 model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                                 stateClassNone);
               } else if (strcmp(prop.value()["unit"], "status") == 0) {
-                createDiscovery("binary_sensor",
+                createDiscovery(HASS_TYPE_BINARY_SENSOR,
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, prop.value()["name"], value_template.c_str(),
                                 "True", "False", "",
@@ -1095,7 +1149,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
                                 model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                                 stateClassNone);
               } else if (strcmp(prop.key().c_str(), "device") != 0 && strcmp(prop.key().c_str(), "mac") != 0) { // Exception on device and mac as these ones are not sensors
-                createDiscovery("sensor",
+                createDiscovery(HASS_TYPE_SENSOR,
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, prop.value()["name"], value_template.c_str(),
                                 "", "", prop.value()["unit"],
@@ -1105,10 +1159,21 @@ void launchBTDiscovery(bool overrideDiscovery) {
               }
             }
           }
+
+          String rssi_name = String(model_id.c_str()) + "-rssi"; // rssi diagnostic entity_category
+          String rssi_id = macWOdots + "-rssi";
+          createDiscovery(HASS_TYPE_SENSOR,
+                          discovery_topic.c_str(), rssi_name.c_str(), rssi_id.c_str(),
+                          will_Topic, "signal_strength", jsonRSSI,
+                          "", "", "dB",
+                          0, "", "", false, "",
+                          model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
+                          stateClassMeasurement, nullptr, nullptr, nullptr, nullptr, true);
+
         } else {
-          if (p->sensorModel_id > BLEconectable::id::MIN &&
-                  p->sensorModel_id < BLEconectable::id::MAX ||
-              p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM2) {
+          if ((p->sensorModel_id > BLEconectable::id::MIN &&
+               p->sensorModel_id < BLEconectable::id::MAX) ||
+              p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM2 || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM6) {
             // Discovery of sensors from which we retrieve data only by connect
             if (p->sensorModel_id == BLEconectable::id::DT24_BLE) {
               DT24Discovery(macWOdots.c_str(), "DT24-BLE");
@@ -1118,7 +1183,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
               BM2Discovery(macWOdots.c_str(), "BM2");
               // Device tracker discovery
               String tracker_id = macWOdots + "-tracker";
-              createDiscovery("device_tracker",
+              createDiscovery(HASS_TYPE_DEVICE_TRACKER,
                               discovery_topic.c_str(), "BM2-tracker", tracker_id.c_str(),
                               will_Topic, "occupancy", "{% if value_json.get('rssi') -%}home{%- else -%}not_home{%- endif %}",
                               "", "", "",
@@ -1126,6 +1191,19 @@ void launchBTDiscovery(bool overrideDiscovery) {
                               model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                               stateClassNone);
             }
+            if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM6) {
+              // Sensor discovery
+              BM6Discovery(macWOdots.c_str(), "BM6");
+              // Device tracker discovery
+              String tracker_id = macWOdots + "-tracker";
+              createDiscovery(HASS_TYPE_DEVICE_TRACKER,
+                              discovery_topic.c_str(), "BM6-tracker", tracker_id.c_str(),
+                              will_Topic, "occupancy", "{% if value_json.get('rssi') -%}home{%- else -%}not_home{%- endif %}",
+                              "", "", "",
+                              0, "", "", false, "",
+                              model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
+                              stateClassNone);
+            }
             if (p->sensorModel_id == BLEconectable::id::LYWSD03MMC) {
               LYWSD03MMCDiscovery(macWOdots.c_str(), "LYWSD03MMC");
             }
@@ -1139,78 +1217,274 @@ void launchBTDiscovery(bool overrideDiscovery) {
               HHCCJCY01HHCCDiscovery(macWOdots.c_str(), "HHCCJCY01HHCC");
             }
           } else {
-            Log.trace(F("Device UNKNOWN_MODEL %s" CR), p->macAdr);
+            THEENGS_LOG_TRACE(F("Device UNKNOWN_MODEL %s" CR), p->macAdr);
           }
         }
       }
       p->isDisc = true; // we don't need the semaphore and all the search magic via createOrUpdateDevice
     } else {
-      Log.trace(F("Device already discovered or that doesn't require discovery %s" CR), p->macAdr);
+      THEENGS_LOG_TRACE(F("Device already discovered or that doesn't require discovery %s" CR), p->macAdr);
     }
   }
 }
+#  else
+void launchBTDiscovery(bool overrideDiscovery) {}
+#  endif
+
+#  if BLEDecryptor
+// ** TODO - Hex string to bytes, there is probably a function for this already just need to find it
+int hexToBytes(String hex, uint8_t* out, size_t maxLen) {
+  int len = hex.length();
+  int bytesToWrite = min(len / 2, (int)maxLen);
+  if (len % 2) return -1; // Odd length is invalid
+  for (int i = 0, j = 0; j < bytesToWrite; i += 2, j++) {
+    out[j] = (uint8_t)strtol(hex.substring(i, i + 2).c_str(), nullptr, 16);
+  }
+  return bytesToWrite;
+}
+// Reverse bytes
+void reverseBytes(uint8_t* data, size_t length) {
+  size_t i;
+  for (i = 0; i < length / 2; i++) {
+    uint8_t temp = data[i];
+    data[i] = data[length - 1 - i];
+    data[length - 1 - i] = temp;
+  }
+}
 #  endif
 
-void PublishDeviceData(JsonObject& BLEdata) {
-  if (abs((int)BLEdata["rssi"] | 0) < abs(BTConfig.minRssi)) { // process only the devices close enough
-    // Decode the payload
-    process_bledata(BLEdata);
-    // If the device is a random MAC and pubRandomMACs is false we don't publish this payload
-    if (!BTConfig.pubRandomMACs && (BLEdata["type"].as<string>()).compare("RMAC") == 0) {
-      Log.trace(F("Random MAC, device filtered" CR));
-      return;
-    }
-    // If pubAdvData is false we don't publish the adv data
-    if (!BTConfig.pubAdvData) {
-      BLEdata.remove("servicedatauuid");
-      BLEdata.remove("servicedata");
-      BLEdata.remove("manufacturerdata");
-      BLEdata.remove("mac_type");
-      BLEdata.remove("adv_type");
-      // tag device properties
-      // BLEdata.remove("type");   type is used by the WebUI module to determine the template used to display the signal
-      BLEdata.remove("cidc");
-      BLEdata.remove("acts");
-      BLEdata.remove("cont");
-      BLEdata.remove("track");
-    }
-    // If the device is not a sensor and pubOnlySensors is true we don't publish this payload
-    if (!BTConfig.pubOnlySensors || BLEdata.containsKey("model")) { // Identified device
-      buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-    } else {
-      Log.notice(F("Not a sensor device filtered" CR));
-      return;
-    }
-  } else if (BLEdata.containsKey("distance")) {
-    if (BLEdata.containsKey("servicedatauuid"))
-      BLEdata.remove("servicedatauuid");
-    if (BLEdata.containsKey("servicedata"))
-      BLEdata.remove("servicedata");
-    if (BLEdata.containsKey("manufacturerdata"))
-      BLEdata.remove("manufacturerdata");
-    if (BTConfig.presenceUseBeaconUuid && BLEdata.containsKey("model_id") && BLEdata["model_id"].as<String>() == "IBEACON") {
-      BLEdata["mac"] = BLEdata["id"];
-      BLEdata["id"] = BLEdata["uuid"];
-    }
-    handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
-  } else {
-    Log.notice(F("Low rssi, device filtered" CR));
-    return;
-  }
-}
-
+#  if BLEDecoder
 void process_bledata(JsonObject& BLEdata) {
   yield(); // Necessary to let the loop run in case of connectivity issues
   if (!BLEdata.containsKey("id")) {
-    Log.error(F("No mac address in the payload" CR));
+    THEENGS_LOG_ERROR(F("No mac address in the payload" CR));
     return;
   }
   const char* mac = BLEdata["id"].as<const char*>();
-  Log.trace(F("Processing BLE data %s" CR), BLEdata["id"].as<const char*>());
+  THEENGS_LOG_TRACE(F("Processing BLE data %s" CR), BLEdata["id"].as<const char*>());
   int model_id = BTConfig.extDecoderEnable ? -1 : decoder.decodeBLEJson(BLEdata);
   int mac_type = BLEdata["mac_type"].as<int>();
 
+#    if BLEDecryptor
+  if (BLEdata["encr"] && (BLEdata["encr"].as<int>() > 0 && BLEdata["encr"].as<int>() <= 3)) {
+    // Decrypting Encrypted BLE Data PVVX, BTHome or Victron
+    THEENGS_LOG_TRACE(F("[BLEDecryptor] Decrypt ENCR:%d ModelID:%s Payload:%s" CR), BLEdata["encr"].as<int>(), BLEdata["model_id"].as<const char*>(), BLEdata["cipher"].as<const char*>());
+
+    // MAC address
+    String macWOdots = BLEdata["id"].as<String>(); // Mac Address without dots
+    macWOdots.replace(":", "");
+    unsigned char macAddress[6];
+    int maclen = hexToBytes(macWOdots, macAddress, 6);
+    if (maclen != 6) {
+      THEENGS_LOG_ERROR(F("[BLEDecryptor] Invalid MAC Address length %d" CR), maclen);
+      return;
+    }
+
+    // AES decryption key
+    unsigned char bleaeskey[16];
+    int bleaeskeylength = 0;
+    if (ble_aes_keys.containsKey(macWOdots)) {
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] Custom AES key %s" CR), ble_aes_keys[macWOdots].as<const char*>());
+      bleaeskeylength = hexToBytes(ble_aes_keys[macWOdots], bleaeskey, 16);
+    } else if (strlen(ble_aes) >= 32) {
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] Default AES key" CR));
+      bleaeskeylength = hexToBytes(ble_aes, bleaeskey, 16);
+    } else {
+      // No per-MAC key configured and no default set: skip silently rather
+      // than attempting decryption with a placeholder key.
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] No AES key configured for %s, skipping" CR), macWOdots.c_str());
+      return;
+    }
+    // Check AES Key
+    if (bleaeskeylength != 16) {
+      THEENGS_LOG_ERROR(F("[BLEDecryptor] Invalid key length %d" CR), bleaeskeylength);
+      return;
+    }
+
+    // Build nonce and aad
+    uint8_t nonce[16];
+    int noncelength = 0;
+    unsigned char aad[1];
+    int aadLength;
+
+    if (BLEdata["encr"].as<int>() == 1) { // PVVX Encrypted
+      noncelength = 11; // 11 bytes
+      reverseBytes(macAddress, 6); // 6 bytes: device address in reverse
+      memcpy(nonce, macAddress, 6);
+      int maclen = hexToBytes(macWOdots, macAddress, 6);
+
+      unsigned char servicedata[16];
+      int servicedatalen = hexToBytes(BLEdata["servicedata"].as<String>(), servicedata, 16);
+      nonce[6] = servicedatalen + 3; // 1 byte : length of (service data + type and UUID)
+      nonce[7] = 0x16; // 1 byte : "16" -> AD type for "Service Data - 16-bit UUID"
+      nonce[8] = 0x1A; // 2 bytes: "1a18" -> UUID 181a in little-endian
+      nonce[9] = 0x18; //
+      unsigned char ctr[1]; // 1 byte : counter
+      int ctrlen = hexToBytes(BLEdata["ctr"].as<String>(), ctr, 1);
+      if (ctrlen != 1) {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Invalid counter length %d" CR), ctrlen);
+        return;
+      }
+      nonce[10] = ctr[0];
+      aad[0] = 0x11;
+      aadLength = 1;
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] PVVX nonce %s" CR), NimBLEUtils::dataToHexString(nonce, noncelength).c_str());
+
+    } else if (BLEdata["encr"].as<int>() == 2) { // BTHome V2 Encrypted
+      noncelength = 13; // 13 bytes
+      memcpy(nonce, macAddress, 6);
+      nonce[6] = 0xD2; // UUID
+      nonce[7] = 0xFC;
+      nonce[8] = 0x41; // BTHome Device Data encrypted payload byte
+      unsigned char ctr[4]; // Counter
+      int ctrlen = hexToBytes(BLEdata["ctr"].as<String>(), ctr, 4);
+      if (ctrlen != 4) {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Invalid counter length %d" CR), ctrlen);
+        return;
+      }
+      memcpy(&nonce[9], ctr, 4);
+      aad[0] = 0x00;
+      aadLength = 0;
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] BTHomeV2 nonce %s" CR), NimBLEUtils::dataToHexString(nonce, noncelength).c_str());
+
+    } else if (BLEdata["encr"].as<int>() == 3) {
+      // Victron has a 16-byte zero-padded nonce with IV bytes 0,1.
+      // (The line `nonce[16] = {0};` that lived here wrote a byte one past the
+      // end of the 16-byte `nonce` array on every Victron-encrypted advert;
+      // memset below already zeroes the whole buffer, so the typo was dead.)
+      unsigned char iv[2];
+      int ivlen = hexToBytes(BLEdata["ctr"].as<String>(), iv, 2);
+      if (ivlen != 2) {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Invalid iv length %d" CR), ivlen);
+        return;
+      }
+      memcpy(nonce, iv, 2);
+      memset(nonce + 2, 0, 14); // 14 bytes: zero padding
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] Victron nonce %s" CR), NimBLEUtils::dataToHexString(nonce, 16).c_str());
+    } else {
+      return; // No match
+    }
+
+    // Ciphertext to bytes
+    String cipherHex = BLEdata["cipher"].as<String>();
+    int cipherlen = cipherHex.length() / 2; // Number of bytes in ciphertext
+    unsigned char ciphertext[cipherlen];
+    int ciphertextlen = hexToBytes(BLEdata["cipher"].as<String>(), ciphertext, cipherlen);
+    unsigned char decrypted[cipherlen];
+
+    // Decrypt ciphertext
+    if (BLEdata["encr"].as<int>() == 1 || BLEdata["encr"].as<int>() == 2) {
+      // Decrypt PVVX and BTHome V2 ciphertext using AES CCM
+      mbedtls_ccm_context ctx;
+      mbedtls_ccm_init(&ctx);
+      if (mbedtls_ccm_setkey(&ctx, MBEDTLS_CIPHER_ID_AES, bleaeskey, 128) != 0) {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Failed to set AES key to mbedtls" CR));
+        return;
+      }
+
+      // Message Integrity Check (MIC)
+      unsigned char mic[4];
+      int miclen = hexToBytes(BLEdata["mic"].as<String>(), mic, 4);
+      if (miclen != 4) {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Invalid MIC length %d" CR), miclen);
+        return;
+      }
+
+      int ret = mbedtls_ccm_auth_decrypt(
+          &ctx, // AES Key
+          ciphertextlen, // length of ciphertext
+          nonce, noncelength, // Nonce
+          aad, aadLength, // AAD
+          ciphertext, // input ciphertext
+          decrypted, // output plaintext
+          mic, sizeof(mic) // Message Integrity Check
+      );
+      mbedtls_ccm_free(&ctx);
+
+      if (ret == 0) {
+        THEENGS_LOG_NOTICE(F("[BLEDecryptor] Decryption successful" CR));
+      } else if (ret == MBEDTLS_ERR_CCM_AUTH_FAILED) {
+        if (ble_aes_keys.containsKey(macWOdots)) {
+          THEENGS_LOG_ERROR(F("[BLEDecryptor] Decryption failed for %s with key %s" CR), macWOdots.c_str(), ble_aes_keys[macWOdots].as<const char*>());
+        } else {
+          THEENGS_LOG_ERROR(F("[BLEDecryptor] Decryption failed for %s with default key" CR), macWOdots.c_str());
+        }
+        return;
+      } else {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Decryption failed with error: %X" CR), ret);
+        return;
+      }
+
+      // Build new servicedata
+      if (BLEdata["encr"].as<int>() == 1) { // PVVX
+        BLEdata["servicedata"] = NimBLEUtils::dataToHexString(decrypted, ciphertextlen);
+      } else if (BLEdata["encr"].as<int>() == 2) { // BTHomeV2
+        // Build new servicedata
+        uint8_t newservicedata[3 + ciphertextlen];
+        newservicedata[0] = 0x40; // Decrypted BTHomeV2 Packet Type
+        newservicedata[1] = 0x00; // Packet counter which the PVVX BTHome non-encrypted has but the encrypted does not
+        newservicedata[2] = 0x00; // **TODO Convert the ctr to the packet counter or just stick with 0?
+        memcpy(&newservicedata[3], decrypted, ciphertextlen);
+        BLEdata["servicedata"] = NimBLEUtils::dataToHexString(newservicedata, ciphertextlen + 3);
+      } else {
+        return;
+      }
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] Decrypted servicedata %s" CR), BLEdata["servicedata"].as<const char*>());
+
+    } else if (BLEdata["encr"].as<int>() == 3) {
+      // Decrypt Victron Energy encrypted advertisements.
+      size_t nc_off = 0;
+      uint8_t stream_block[16] = {0};
+
+      mbedtls_aes_context ctx;
+      mbedtls_aes_init(&ctx);
+      mbedtls_aes_setkey_enc(&ctx, bleaeskey, 128);
+      int ret = mbedtls_aes_crypt_ctr(
+          &ctx, // AES Key
+          ciphertextlen, // length of ciphertext
+          &nc_off,
+          nonce, // 16 byte nonce with 2 bytes iv
+          stream_block,
+          ciphertext, // input ciphertext
+          decrypted // output plaintext
+      );
+      mbedtls_aes_free(&ctx);
+
+      if (ret == 0) {
+        THEENGS_LOG_NOTICE(F("[BLEDecryptor] Victron Decryption successful" CR));
+      } else if (ret == MBEDTLS_ERR_CCM_AUTH_FAILED) {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Victron Authentication failed." CR));
+        return;
+      } else {
+        THEENGS_LOG_ERROR(F("[BLEDecryptor] Victron decryption failed with error: %X" CR), ret);
+        return;
+      }
+
+      // Build new manufacturerdata
+      unsigned char manufacturerdata[10 + ciphertextlen];
+      int manufacturerdatalen = hexToBytes(BLEdata["manufacturerdata"].as<String>(), manufacturerdata, 10);
+      manufacturerdata[2] = 0x11; // Replace byte 2 with "11" indicate decrypted data
+      manufacturerdata[7] = 0xff; // Replace byte 7 with "ff" to indicate decrypted data
+      manufacturerdata[8] = 0xff; // Replace byte 8 with "ff" to indicate decrypted data
+      memcpy(&manufacturerdata[10], decrypted, ciphertextlen); // Append the decrypted payload to the manufacturer data
+      BLEdata["manufacturerdata"] = NimBLEUtils::dataToHexString(manufacturerdata, 10 + ciphertextlen); // Rebuild manufacturerdata
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] Victron decrypted manufacturerdata %s" CR), BLEdata["manufacturerdata"].as<const char*>());
+    }
+
+    // Print before and after decoder post decryption
+    // serializeJsonPretty(BLEdata, Serial);
+    model_id = BTConfig.extDecoderEnable ? -1 : decoder.decodeBLEJson(BLEdata);
+    // serializeJsonPretty(BLEdata, Serial);
+    THEENGS_LOG_TRACE(F("[BLEDecryptor] Decrypted model_id %d" CR), model_id);
+
+    // Remove the cipher fields from BLEdata
+    BLEdata.remove("encr");
+    BLEdata.remove("cipher");
+    BLEdata.remove("ctr");
+    BLEdata.remove("mic");
+  }
+#    endif
+
   // Convert prmacs to RMACS until or if OMG gets Identity MAC/IRK decoding
   if (BLEdata["prmac"]) {
     BLEdata.remove("prmac");
@@ -1218,23 +1492,24 @@ void process_bledata(JsonObject& BLEdata) {
       BLEdata.remove("track");
     }
     BLEdata["type"] = "RMAC";
-    Log.trace(F("Potential RMAC (prmac) converted to RMAC" CR));
+    THEENGS_LOG_TRACE(F("Potential RMAC (prmac) converted to RMAC" CR));
   }
+  const char* deviceName = BLEdata["name"] | "";
 
   if ((BLEdata["type"].as<string>()).compare("RMAC") != 0 && model_id != TheengsDecoder::BLE_ID_NUM::IBEACON) { // Do not store in memory the random mac devices and iBeacons
     if (model_id >= 0) { // Broadcaster devices
-      Log.trace(F("Decoder found device: %s" CR), BLEdata["model_id"].as<const char*>());
-      if (model_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC || model_id == TheengsDecoder::BLE_ID_NUM::BM2) { // Device that broadcast and can be connected
-        createOrUpdateDevice(mac, device_flags_connect, model_id, mac_type);
+      THEENGS_LOG_TRACE(F("Decoder found device: %s" CR), BLEdata["model_id"].as<const char*>());
+      if (model_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC || model_id == TheengsDecoder::BLE_ID_NUM::BM2 || model_id == TheengsDecoder::BLE_ID_NUM::BM6) { // Device that broadcast and can be connected
+        createOrUpdateDevice(mac, device_flags_connect, model_id, mac_type, deviceName);
       } else {
-        createOrUpdateDevice(mac, device_flags_init, model_id, mac_type);
+        createOrUpdateDevice(mac, device_flags_init, model_id, mac_type, deviceName);
         if (BTConfig.adaptiveScan == true && (BTConfig.BLEinterval != MinTimeBtwScan || BTConfig.intervalActiveScan != MinTimeBtwScan)) {
           if (BLEdata.containsKey("acts") && BLEdata.containsKey("cont")) {
             if (BLEdata["acts"] && BLEdata["cont"]) {
               BTConfig.BLEinterval = MinTimeBtwScan;
               BTConfig.intervalActiveScan = MinTimeBtwScan;
               BTConfig.scanDuration = MinScanDuration;
-              Log.notice(F("Active and continuous scanning required, paramaters adapted" CR));
+              THEENGS_LOG_NOTICE(F("Active and continuous scanning required, parameters adapted" CR));
               stateBTMeasures(false);
             }
           } else if (BLEdata.containsKey("cont") && BTConfig.BLEinterval != MinTimeBtwScan) {
@@ -1243,7 +1518,7 @@ void process_bledata(JsonObject& BLEdata) {
               if ((BLEdata["type"].as<string>()).compare("CTMO") == 0) {
                 BTConfig.scanDuration = MinScanDuration;
               }
-              Log.notice(F("Passive continuous scanning required, paramaters adapted" CR));
+              THEENGS_LOG_NOTICE(F("Passive continuous scanning required, parameters adapted" CR));
               stateBTMeasures(false);
             }
           }
@@ -1262,32 +1537,123 @@ void process_bledata(JsonObject& BLEdata) {
           model_id = BLEconectable::id::XMWSDJ04MMC;
 
         if (model_id > 0) {
-          Log.trace(F("Connectable device found: %s" CR), name.c_str());
-          createOrUpdateDevice(mac, device_flags_connect, model_id, mac_type);
+          THEENGS_LOG_TRACE(F("Connectable device found: %s" CR), name.c_str());
+          createOrUpdateDevice(mac, device_flags_connect, model_id, mac_type, deviceName);
         }
       } else if (BTConfig.extDecoderEnable && model_id < 0 && BLEdata.containsKey("servicedata")) {
         const char* service_data = (const char*)(BLEdata["servicedata"] | "");
         if (strstr(service_data, "209800") != NULL) {
-          model_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC;
-          Log.trace(F("Connectable device found: HHCCJCY01HHCC" CR));
-          createOrUpdateDevice(mac, device_flags_connect, model_id, mac_type);
+          model_id = TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC;
+          THEENGS_LOG_TRACE(F("Connectable device found: HHCCJCY01HHCC" CR));
+          createOrUpdateDevice(mac, device_flags_connect, model_id, mac_type, deviceName);
         }
       }
     }
-    Log.trace(F("Random MAC or iBeacon device filtered" CR));
+  } else {
+    THEENGS_LOG_TRACE(F("Random MAC or iBeacon device filtered" CR));
   }
   if (!BTConfig.extDecoderEnable && model_id < 0) {
-    Log.trace(F("No eligible device found " CR));
+    THEENGS_LOG_TRACE(F("No eligible device found " CR));
   }
 }
+void PublishDeviceData(JsonObject& BLEdata) {
+  if (abs((int)BLEdata["rssi"] | 0) < abs(BTConfig.minRssi)) { // process only the devices close enough
+    // Decode the payload
+    process_bledata(BLEdata);
+    // If the device is a random MAC and pubRandomMACs is false we don't publish this payload
+    if (!BTConfig.pubRandomMACs && (BLEdata["type"].as<string>()).compare("RMAC") == 0) {
+      THEENGS_LOG_TRACE(F("Random MAC, device filtered" CR));
+      return;
+    }
+    // If pubAdvData is false we don't publish the adv data
+    if (!BTConfig.pubAdvData) {
+      BLEdata.remove("servicedatauuid");
+      BLEdata.remove("servicedata");
+      BLEdata.remove("manufacturerdata");
+      BLEdata.remove("mac_type");
+      BLEdata.remove("adv_type");
+      // tag device properties
+      // BLEdata.remove("type");   type is used by the WebUI module to determine the template used to display the signal
+      BLEdata.remove("cidc");
+      BLEdata.remove("acts");
+      BLEdata.remove("cont");
+      BLEdata.remove("track");
+      BLEdata.remove("ctrl");
+    }
+    // if distance available, check if presenceUseBeaconUuid is true, model_id is IBEACON then set id as uuid
+    if (BLEdata.containsKey("distance")) {
+      if (BTConfig.presenceUseBeaconUuid && BLEdata.containsKey("model_id") && BLEdata["model_id"].as<String>() == "IBEACON") {
+        BLEdata["mac"] = BLEdata["id"].as<std::string>();
+        BLEdata["id"] = BLEdata["uuid"].as<std::string>();
+      }
+      String topic = String(mqtt_topic) + BTConfig.presenceTopic + String(gateway_name);
+      THEENGS_LOG_TRACE(F("Pub HA Presence %s" CR), topic.c_str());
+      BLEdata["topic"] = topic;
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    }
+
+    // If the device is not a sensor and pubOnlySensors is true we don't publish this payload
+    if (!BTConfig.pubOnlySensors || BLEdata.containsKey("model") || !BLEDecoder) { // Identified device
+      buildTopicFromId(BLEdata, subjectBTtoMQTT);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    } else {
+      THEENGS_LOG_NOTICE(F("Not a sensor device filtered" CR));
+      return;
+    }
+
+#    if BLEDecoder
+    if (enableMultiGTWSync && BLEdata.containsKey("model_id") && BLEdata.containsKey("id")) {
+      // Publish tracker sync message
+      bool isTracker = false;
+      std::string tag = decoder.getTheengAttribute(BLEdata["model_id"].as<const char*>(), "tag");
+      if (tag.length() >= 4) {
+        isTracker = checkIfIsTracker(tag[3]);
+      }
+
+      if (isTracker) {
+        StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
+        JsonObject TrackerSyncdata = BLEdataBuffer.to<JsonObject>();
+        TrackerSyncdata["gatewayid"] = gateway_name;
+        TrackerSyncdata["trackerid"] = BLEdata["id"].as<const char*>();
+        String topic = String(mqtt_topic) + String(subjectTrackerSync);
+        TrackerSyncdata["topic"] = topic.c_str();
+        enqueueJsonObject(TrackerSyncdata);
+      }
+    }
+#    endif
+  } else {
+    THEENGS_LOG_NOTICE(F("Low rssi, device filtered" CR));
+    return;
+  }
+}
+#  else
+void process_bledata(JsonObject& BLEdata) {}
+void PublishDeviceData(JsonObject& BLEdata) {
+  if (abs((int)BLEdata["rssi"] | 0) < abs(BTConfig.minRssi)) { // process only the devices close enough
+    // if distance available, check if presenceUseBeaconUuid is true, model_id is IBEACON then set id as uuid
+    if (BLEdata.containsKey("distance")) {
+      if (BTConfig.presenceUseBeaconUuid && BLEdata.containsKey("model_id") && BLEdata["model_id"].as<String>() == "IBEACON") {
+        BLEdata["mac"] = BLEdata["id"].as<std::string>();
+        BLEdata["id"] = BLEdata["uuid"].as<std::string>();
+      }
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+    }
+    buildTopicFromId(BLEdata, subjectBTtoMQTT);
+    enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
+  } else {
+    THEENGS_LOG_NOTICE(F("Low rssi, device filtered" CR));
+    return;
+  }
+}
+#  endif
 
 void hass_presence(JsonObject& HomePresence) {
   int BLErssi = HomePresence["rssi"];
-  Log.trace(F("BLErssi %d" CR), BLErssi);
+  THEENGS_LOG_TRACE(F("BLErssi %d" CR), BLErssi);
   int txPower = HomePresence["txpower"] | 0;
   if (txPower >= 0)
     txPower = -59; //if tx power is not found we set a default calibration value
-  Log.trace(F("TxPower: %d" CR), txPower);
+  THEENGS_LOG_TRACE(F("TxPower: %d" CR), txPower);
   double ratio = BLErssi * 1.0 / txPower;
   double distance;
   if (ratio < 1.0) {
@@ -1296,17 +1662,17 @@ void hass_presence(JsonObject& HomePresence) {
     distance = (0.89976) * pow(ratio, 7.7095) + 0.111;
   }
   HomePresence["distance"] = distance;
-  Log.trace(F("Ble distance %D" CR), distance);
+  THEENGS_LOG_TRACE(F("Ble distance %D" CR), distance);
 }
 
 void BTforceScan() {
   if (!BTProcessLock) {
-    BTtoMQTT();
-    Log.trace(F("Scan done" CR));
+    BLEscan();
+    THEENGS_LOG_TRACE(F("Scan done" CR));
     if (BTConfig.bleConnect)
       BLEconnect();
   } else {
-    Log.trace(F("Cannot launch scan due to other process running" CR));
+    THEENGS_LOG_TRACE(F("Cannot launch scan due to other process running" CR));
   }
 }
 
@@ -1320,22 +1686,31 @@ void immediateBTAction(void* pvParameters) {
     }
 
     if (xSemaphoreTake(semaphoreBLEOperation, pdMS_TO_TICKS(5000)) == pdTRUE) {
-      // swap the vectors so only this device is processed
-      std::vector<BLEdevice*> dev_swap;
-      dev_swap.push_back(getDeviceByMac(BLEactions.back().addr));
-      std::swap(devices, dev_swap);
+      if (xSemaphoreTake(semaphoreCreateOrUpdateDevice, pdMS_TO_TICKS(QueueSemaphoreTimeOutTask)) == pdTRUE) {
+        // swap the vectors so only this device is processed
+        std::vector<BLEdevice*> dev_swap;
+        dev_swap.push_back(getDeviceByMac(BLEactions.back().addr.toString().c_str()));
+        std::swap(devices, dev_swap);
 
-      std::vector<BLEAction> act_swap;
-      act_swap.push_back(BLEactions.back());
-      BLEactions.pop_back();
-      std::swap(BLEactions, act_swap);
+        std::vector<BLEAction> act_swap;
+        act_swap.push_back(BLEactions.back());
+        BLEactions.pop_back();
+        std::swap(BLEactions, act_swap);
 
-      // Unlock here to allow the action to be performed
-      BTProcessLock = false;
-      BLEconnect();
-      // back to normal
-      std::swap(devices, dev_swap);
-      std::swap(BLEactions, act_swap);
+        // Unlock here to allow the action to be performed
+        BTProcessLock = false;
+        BLEconnect();
+        // back to normal
+        std::swap(devices, dev_swap);
+        std::swap(BLEactions, act_swap);
+        xSemaphoreGive(semaphoreCreateOrUpdateDevice);
+      } else {
+        THEENGS_LOG_ERROR(F("CreateOrUpdate Semaphore NOT taken" CR));
+        // Release the process lock we took above; otherwise a transient
+        // semaphore-contention failure here leaves BTProcessLock=true and
+        // wedges the BLE scanner/connect subsystem until a restart.
+        BTProcessLock = false;
+      }
 
       // If we stopped the scheduled connect for this action, do the scheduled now
       if (millis() > (timeBetweenConnect + BTConfig.intervalConnect) && BTConfig.bleConnect) {
@@ -1344,13 +1719,14 @@ void immediateBTAction(void* pvParameters) {
       }
       xSemaphoreGive(semaphoreBLEOperation);
     } else {
-      Log.error(F("BLE busy - command not sent" CR));
+      THEENGS_LOG_ERROR(F("BLE busy - immediateBTAction not sent" CR));
+      gatewayState = GatewayState::ERROR;
       StaticJsonDocument<JSON_MSG_BUFFER> BLEdataBuffer;
       JsonObject BLEdata = BLEdataBuffer.to<JsonObject>();
-      BLEdata["id"] = BLEactions.back().addr;
+      BLEdata["id"] = BLEactions.back().addr.toString();
       BLEdata["success"] = false;
       buildTopicFromId(BLEdata, subjectBTtoMQTT);
-      handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask);
+      enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
       BLEactions.pop_back();
       BTProcessLock = false;
     }
@@ -1360,34 +1736,84 @@ void immediateBTAction(void* pvParameters) {
 
 void startBTActionTask() {
   TaskHandle_t th;
-  xTaskCreatePinnedToCore(
+  xTaskCreateUniversal(
       immediateBTAction, /* Function to implement the task */
       "imActTask", /* Name of the task */
-      5120, /* Stack size in bytes */
+      8000, /* Stack size in bytes */
       NULL, /* Task input parameter */
       3, /* Priority of the task (set higher than core task) */
       &th, /* Task handle. */
       1); /* Core where the task should run */
 }
 
-void MQTTtoBTAction(JsonObject& BTdata) {
-  BLEAction action;
-  memset(&action, 0, sizeof(BLEAction));
-  if (BTdata.containsKey("SBS1")) {
-    strcpy(action.addr, (const char*)BTdata["mac"]);
-    action.write = true;
-    std::string val = BTdata["SBS1"].as<std::string>(); // Fix #1694
-    action.value = val;
-    action.ttl = 1;
-    createOrUpdateDevice(action.addr, device_flags_connect,
-                         TheengsDecoder::BLE_ID_NUM::SBS1, 1);
-    BLEactions.push_back(action);
-    startBTActionTask();
+#  if BLEDecoder
+void KnownBTActions(JsonObject& BTdata) {
+  if (!BTdata.containsKey("id")) {
+    THEENGS_LOG_ERROR(F("BLE mac address missing" CR));
+    gatewayState = GatewayState::ERROR;
     return;
   }
 
+  BLEAction action{};
+  action.write = true;
+  action.ttl = 3;
+  bool res = false;
+  if (BTdata.containsKey("model_id") && BTdata["model_id"].is<const char*>()) {
+    if (BTdata["model_id"] == "X1") {
+      if (BTdata.containsKey("cmd") && BTdata["cmd"].is<const char*>()) {
+        action.value_type = BLE_VAL_STRING;
+        std::string val = BTdata["cmd"].as<std::string>(); // Fix #1694
+        action.value = val;
+        createOrUpdateDevice(BTdata["id"].as<const char*>(), device_flags_connect,
+                             TheengsDecoder::BLE_ID_NUM::SBS1, 1);
+        res = true;
+      }
+    } else if (BTdata["model_id"] == "W270160X") {
+      if (BTdata.containsKey("tilt") && BTdata["tilt"].is<int>()) {
+        action.value_type = BLE_VAL_INT;
+        res = true;
+      } else if (BTdata.containsKey("tilt") && BTdata["tilt"].is<const char*>()) {
+        action.value_type = BLE_VAL_STRING;
+        res = true;
+      }
+      if (res) {
+        std::string val = BTdata["tilt"].as<std::string>(); // Fix #1694
+        action.value = val;
+        createOrUpdateDevice(BTdata["id"].as<const char*>(), device_flags_connect,
+                             TheengsDecoder::BLE_ID_NUM::SBBT, 1);
+      }
+    } else if (BTdata["model_id"] == "W070160X") {
+      if (BTdata.containsKey("position") && BTdata["position"].is<int>()) {
+        action.value_type = BLE_VAL_INT;
+        res = true;
+      } else if (BTdata.containsKey("position") && BTdata["position"].is<const char*>()) {
+        action.value_type = BLE_VAL_STRING;
+        res = true;
+      }
+      if (res) {
+        std::string val = BTdata["position"].as<std::string>(); // Fix #1694
+        action.value = val;
+        createOrUpdateDevice(BTdata["id"].as<const char*>(), device_flags_connect,
+                             TheengsDecoder::BLE_ID_NUM::SBCU, 1);
+      }
+    }
+    if (res) {
+      action.addr = NimBLEAddress(BTdata["id"].as<std::string>(), 1);
+      BLEactions.push_back(action);
+      startBTActionTask();
+    } else {
+      THEENGS_LOG_ERROR(F("BLE action not recognized" CR));
+      gatewayState = GatewayState::ERROR;
+    }
+  }
+}
+#  else
+void KnownBTActions(JsonObject& BTdata) {}
+#  endif
+
+void XtoBTAction(JsonObject& BTdata) {
+  BLEAction action{};
   action.ttl = BTdata.containsKey("ttl") ? (uint8_t)BTdata["ttl"] : 1;
-  action.addr_type = BTdata.containsKey("mac_type") ? BTdata["mac_type"].as<int>() : 0;
   action.value_type = BLE_VAL_STRING;
   if (BTdata.containsKey("value_type")) {
     String vt = BTdata["value_type"];
@@ -1399,39 +1825,37 @@ void MQTTtoBTAction(JsonObject& BTdata) {
     else if (vt == "FLOAT")
       action.value_type = BLE_VAL_FLOAT;
     else if (vt != "STRING") {
-      Log.error(F("BLE value type invalid %s" CR), vt.c_str());
+      THEENGS_LOG_ERROR(F("BLE value type invalid %s" CR), vt.c_str());
       return;
     }
   }
 
-  Log.trace(F("BLE ACTION TTL = %u" CR), action.ttl);
+  THEENGS_LOG_TRACE(F("BLE ACTION TTL = %u" CR), action.ttl);
   action.complete = false;
   if (BTdata.containsKey("ble_write_address") &&
       BTdata.containsKey("ble_write_service") &&
       BTdata.containsKey("ble_write_char") &&
       BTdata.containsKey("ble_write_value")) {
-    strcpy(action.addr, (const char*)BTdata["ble_write_address"]);
+    action.addr = NimBLEAddress(BTdata["ble_write_address"].as<std::string>(), BTdata.containsKey("mac_type") ? BTdata["mac_type"].as<int>() : 0);
     action.service = NimBLEUUID((const char*)BTdata["ble_write_service"]);
     action.characteristic = NimBLEUUID((const char*)BTdata["ble_write_char"]);
     std::string val = BTdata["ble_write_value"].as<std::string>(); // Fix #1694
     action.value = val;
     action.write = true;
-    Log.trace(F("BLE ACTION Write" CR));
+    THEENGS_LOG_TRACE(F("BLE ACTION Write" CR));
   } else if (BTdata.containsKey("ble_read_address") &&
              BTdata.containsKey("ble_read_service") &&
              BTdata.containsKey("ble_read_char")) {
-    strcpy(action.addr, (const char*)BTdata["ble_read_address"]);
+    action.addr = NimBLEAddress(BTdata["ble_read_address"].as<std::string>(), BTdata.containsKey("mac_type") ? BTdata["mac_type"].as<int>() : 0);
     action.service = NimBLEUUID((const char*)BTdata["ble_read_service"]);
     action.characteristic = NimBLEUUID((const char*)BTdata["ble_read_char"]);
     action.write = false;
-    Log.trace(F("BLE ACTION Read" CR));
+    THEENGS_LOG_TRACE(F("BLE ACTION Read" CR));
   } else {
     return;
   }
 
-  createOrUpdateDevice(action.addr, device_flags_connect,
-                       TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL,
-                       action.addr_type);
+  createOrUpdateDevice(action.addr.toString().c_str(), device_flags_connect, UNKWNON_MODEL, action.addr.getType());
 
   BLEactions.push_back(action);
   if (BTdata.containsKey("immediate") && BTdata["immediate"].as<bool>()) {
@@ -1439,9 +1863,9 @@ void MQTTtoBTAction(JsonObject& BTdata) {
   }
 }
 
-void MQTTtoBT(char* topicOri, JsonObject& BTdata) { // json object decoding
+void XtoBT(const char* topicOri, JsonObject& BTdata) { // json object decoding
   if (cmpToMainTopic(topicOri, subjectMQTTtoBTset)) {
-    Log.trace(F("MQTTtoBT json set" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoBT json set" CR));
 
     // Black list & white list set
     bool WorBupdated;
@@ -1457,7 +1881,7 @@ void MQTTtoBT(char* topicOri, JsonObject& BTdata) { // json object decoding
 
     // Force scan now
     if (BTdata.containsKey("interval") && BTdata["interval"] == 0) {
-      Log.notice(F("BLE forced scan" CR));
+      THEENGS_LOG_NOTICE(F("BLE forced scan" CR));
       atomic_store_explicit(&forceBTScan, 1, ::memory_order_seq_cst); // ask the other core to do the scan for us
     }
 
@@ -1478,11 +1902,23 @@ void MQTTtoBT(char* topicOri, JsonObject& BTdata) { // json object decoding
     // Load config from json if available
     BTConfig_fromJson(BTdata);
 
-    if (BTdata.containsKey("lowpowermode")) {
-      changelowpowermode((int)BTdata["lowpowermode"]);
-    }
   } else if (cmpToMainTopic(topicOri, subjectMQTTtoBT)) {
-    MQTTtoBTAction(BTdata);
+    if (xSemaphoreTake(semaphoreBLEOperation, pdMS_TO_TICKS(5000)) == pdTRUE) {
+      KnownBTActions(BTdata);
+      XtoBTAction(BTdata);
+      xSemaphoreGive(semaphoreBLEOperation);
+    } else {
+      THEENGS_LOG_ERROR(F("BLE busy - BTActions not sent" CR));
+      gatewayState = GatewayState::ERROR;
+    }
+  } else if (strstr(topicOri, subjectTrackerSync) != NULL) {
+    if (BTdata.containsKey("gatewayid") && BTdata.containsKey("trackerid") && BTdata["gatewayid"] != gateway_name) {
+      BLEdevice* device = getDeviceByMac(BTdata["trackerid"].as<const char*>());
+      if (device != &NO_BT_DEVICE_FOUND && device->lastUpdate != 0) {
+        device->lastUpdate = 0;
+        THEENGS_LOG_NOTICE(F("Tracker %s disassociated by gateway %s" CR), BTdata["trackerid"].as<const char*>(), BTdata["gatewayid"].as<const char*>());
+      }
+    }
   }
 }
 #endif
diff --git a/main/ZgatewayGFSunInverter.ino b/main/gatewayGFSunInverter.cpp
similarity index 75%
rename from main/ZgatewayGFSunInverter.ino
rename to main/gatewayGFSunInverter.cpp
index 16caa4e..11f5a49 100644
--- a/main/ZgatewayGFSunInverter.ino
+++ b/main/gatewayGFSunInverter.cpp
@@ -1,5 +1,5 @@
 /*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your GridFree SUN-2000G inverter and a MQTT broker.
    Send inverter metrics by MQTT.
@@ -27,6 +27,11 @@
 
 #ifdef ZgatewayGFSunInverter
 
+#  include <GfSun2000.h>
+
+#  include "TheengsCommon.h"
+#  include "config_GFSunInverter.h"
+
 GfSun2000 GF = GfSun2000();
 
 void GFSunInverterDataHandler(GfSun2000Data data) {
@@ -34,17 +39,17 @@ void GFSunInverterDataHandler(GfSun2000Data data) {
   JsonObject jdata = jdataBuffer.to<JsonObject>();
 
   jdata["device_id"] = (char*)data.deviceID;
-  Log.trace(F("Device ID     : %s\n" CR), data.deviceID);
+  THEENGS_LOG_TRACE(F("Device ID     : %s\n" CR), data.deviceID);
   jdata["ac_voltage"] = data.ACVoltage;
-  Log.trace(F("AC Voltage    : %.1f\tV\n" CR), data.ACVoltage);
+  THEENGS_LOG_TRACE(F("AC Voltage    : %.1f\tV\n" CR), data.ACVoltage);
   jdata["dc_voltage"] = data.DCVoltage;
-  Log.trace(F("DC Voltage    : %.1f\tV\n" CR), data.DCVoltage);
+  THEENGS_LOG_TRACE(F("DC Voltage    : %.1f\tV\n" CR), data.DCVoltage);
   jdata["power"] = data.averagePower;
-  Log.trace(F("Output Power  : %.1f\tW (5min avg)\n" CR), data.averagePower);
+  THEENGS_LOG_TRACE(F("Output Power  : %.1f\tW (5min avg)\n" CR), data.averagePower);
   jdata["c_energy"] = data.customEnergyCounter;
-  Log.trace(F("Custom Energy : %.1f\tkW/h (can be reseted)\n" CR), data.customEnergyCounter);
+  THEENGS_LOG_TRACE(F("Custom Energy : %.1f\tkW/h (can be reseted)\n" CR), data.customEnergyCounter);
   jdata["t_energy"] = data.totalEnergyCounter;
-  Log.trace(F("Total Energy  : %.1f\tkW/h\n" CR), data.totalEnergyCounter);
+  THEENGS_LOG_TRACE(F("Total Energy  : %.1f\tkW/h\n" CR), data.totalEnergyCounter);
 
 #  ifdef GFSUNINVERTER_DEVEL
   StaticJsonDocument<JSON_MSG_BUFFER> jregisterBuffer;
@@ -52,34 +57,34 @@ void GFSunInverterDataHandler(GfSun2000Data data) {
   char buffer[4];
   std::map<int16_t, int16_t>::iterator itr;
   for (itr = data.modbusRegistry.begin(); itr != data.modbusRegistry.end(); ++itr) {
-    Log.notice("%d: %d\n", itr->first, itr->second);
+    THEENGS_LOG_NOTICE("%d: %d\n", itr->first, itr->second);
     sprintf(buffer, "%d", itr->first);
     jregister[buffer] = itr->second;
   }
   jdata["register"] = jregister;
 #  endif
   jdata["origin"] = subjectRFtoMQTT;
-  handleJsonEnqueue(jdata);
+  enqueueJsonObject(jdata);
 }
 
 void GFSunInverterErrorHandler(int errorId, char* errorMessage) {
   char buffer[50];
   sprintf(buffer, "Error response: %02X - %s\n", errorId, errorMessage);
-  Log.error(buffer);
+  THEENGS_LOG_ERROR(buffer);
   StaticJsonDocument<JSON_MSG_BUFFER> jdataBuffer;
   JsonObject jdata = jdataBuffer.to<JsonObject>();
   jdata["status"] = "error";
   jdata["msg"] = errorMessage;
   jdata["id"] = errorId;
   jdata["origin"] = subjectRFtoMQTT;
-  handleJsonEnqueue(jdata);
+  enqueueJsonObject(jdata);
 }
 
 void setupGFSunInverter() {
   GF.setup(Serial2);
   GF.setDataHandler(GFSunInverterDataHandler);
   GF.setErrorHandler(GFSunInverterErrorHandler);
-  Log.trace(F("ZgatewayGFSunInverter setup done " CR));
+  THEENGS_LOG_TRACE(F("gatewayGFSunInverter setup done " CR));
 }
 
 void ZgatewayGFSunInverterMQTT() {
diff --git a/main/ZgatewayIR.ino b/main/gatewayIR.cpp
similarity index 68%
rename from main/ZgatewayIR.ino
rename to main/gatewayIR.cpp
index 328870a..81d544b 100644
--- a/main/ZgatewayIR.ino
+++ b/main/gatewayIR.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
   This gateway enables to:
@@ -28,23 +28,19 @@
 #include "User_config.h"
 
 #ifdef ZgatewayIR
+#  include <IRrecv.h> // Needed if you want to receive IR commands.
+#  include <IRremoteESP8266.h>
+#  include <IRsend.h> // Needed if you want to send IR commands.
+#  include <IRutils.h>
 
-#  if defined(ESP8266) || defined(ESP32)
-#    include <IRrecv.h> // Needed if you want to receive IR commands.
-#    include <IRremoteESP8266.h>
-#    include <IRsend.h> // Needed if you want to send IR commands.
-#    include <IRutils.h>
-#    ifdef DumpMode // in dump mode we increase the size of the buffer to catch big codes
+#  include "TheengsCommon.h"
+#  include "config_IR.h"
+#  ifdef DumpMode // in dump mode we increase the size of the buffer to catch big codes
 IRrecv irrecv(IR_RECEIVER_GPIO, 1024, 15U, true);
-#    else
-IRrecv irrecv(IR_RECEIVER_GPIO);
-#    endif
-IRsend irsend(IR_EMITTER_GPIO, IR_EMITTER_INVERTED);
 #  else
-#    include <IRremote.h>
 IRrecv irrecv(IR_RECEIVER_GPIO);
-IRsend irsend; //connect IR emitter pin to D9 on arduino, you need to comment #define IR_USE_TIMER2 and uncomment #define IR_USE_TIMER1 on library IRremote.h so as to free pin D3 for RF RECEIVER PIN
 #  endif
+IRsend irsend(IR_EMITTER_GPIO, IR_EMITTER_INVERTED);
 
 // IR protocol bits definition for Arduino (for ESP8266 they are defined in IRRemoteESP8266.h)
 #  ifndef NEC_BITS
@@ -98,108 +94,96 @@ uint64_t getUInt64fromHex(char const* str) {
 }
 
 void setupIR() {
-//IR init parameters
-#  if defined(ESP8266) || defined(ESP32)
+  //IR init parameters
   irsend.begin();
-#  endif
 
   irrecv.enableIRIn(); // Start the receiver
 
-  Log.notice(F("IR_EMITTER_GPIO: %d " CR), IR_EMITTER_GPIO);
-  Log.notice(F("IR_RECEIVER_GPIO: %d " CR), IR_RECEIVER_GPIO);
-  Log.trace(F("ZgatewayIR setup done " CR));
+  THEENGS_LOG_NOTICE(F("IR_EMITTER_GPIO: %d " CR), IR_EMITTER_GPIO);
+  THEENGS_LOG_NOTICE(F("IR_RECEIVER_GPIO: %d " CR), IR_RECEIVER_GPIO);
+  THEENGS_LOG_TRACE(F("gatewayIR setup done " CR));
 }
 
-void IRtoMQTT() {
+void IRtoX() {
   decode_results results;
 
   if (irrecv.decode(&results)) {
-    Log.trace(F("Creating IR buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating IR buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> IRdataBuffer;
     JsonObject IRdata = IRdataBuffer.to<JsonObject>();
 
-    Log.trace(F("Rcv. IR" CR));
+    THEENGS_LOG_TRACE(F("Rcv. IR" CR));
 #  ifdef ESP32
-    Log.trace(F("IR Task running on core :%d" CR), xPortGetCoreID());
+    THEENGS_LOG_TRACE(F("IR Task running on core :%d" CR), xPortGetCoreID());
 #  endif
-    IRdata["value"] = (SIGNAL_SIZE_UL_ULL)(results.value);
+    IRdata["value"] = uint64_t(results.value);
     IRdata["protocol"] = (int)(results.decode_type);
     IRdata["bits"] = (int)(results.bits);
-#  if defined(ESP8266) || defined(ESP32) //resultToHexidecimal is only available with IRremoteESP8266
     IRdata["hex"] = resultToHexidecimal(&results);
     IRdata["protocol_name"] = typeToString(results.decode_type, false);
-#  endif
     String rawCode = "";
     // Dump data
     for (uint16_t i = 1; i < results.rawlen; i++) {
-#  if defined(ESP8266) || defined(ESP32)
       if (i % 100 == 0)
         yield(); // Preemptive yield every 100th entry to feed the WDT.
       rawCode = rawCode + (results.rawbuf[i] * RAWTICK);
-#  else
-      rawCode = rawCode + (results.rawbuf[i] * USECPERTICK);
-#  endif
       if (i < results.rawlen - 1)
         rawCode = rawCode + ","; // ',' not needed on last one
     }
     IRdata["raw"] = rawCode;
 // if needed we directly resend the raw code
 #  ifdef RawDirectForward
-#    if defined(ESP8266) || defined(ESP32)
     uint16_t rawsend[results.rawlen];
     for (uint16_t i = 1; i < results.rawlen; i++) {
       if (i % 100 == 0)
         yield(); // Preemptive yield every 100th entry to feed the WDT.
-#    else
-    unsigned int rawsend[results.rawlen];
-    for (int i = 1; i < results.rawlen; i++) {
-#    endif
       rawsend[i] = results.rawbuf[i];
     }
     irsend.sendRaw(rawsend, results.rawlen, RawFrequency);
-    Log.trace(F("raw redirected" CR));
+    THEENGS_LOG_TRACE(F("raw redirected" CR));
 #  endif
     irrecv.resume(); // Receive the next value
-    SIGNAL_SIZE_UL_ULL MQTTvalue = IRdata["value"].as<SIGNAL_SIZE_UL_ULL>();
+    uint64_t MQTTvalue = IRdata["value"].as<uint64_t>();
     //trc(MQTTvalue);
     if ((pubIRunknownPrtcl == false && IRdata["protocol"].as<int>() == -1)) { // don't publish unknown IR protocol
-      Log.notice(F("--no pub unknwn prt--" CR));
+      THEENGS_LOG_NOTICE(F("--no pub unknwn prt--" CR));
     } else if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of IR -->MQTT
-      Log.trace(F("Adv data IRtoMQTT" CR));
+      THEENGS_LOG_TRACE(F("Adv data IRtoMQTT" CR));
       IRdata["origin"] = subjectIRtoMQTT;
-      handleJsonEnqueue(IRdata);
-      Log.trace(F("Store val: %D" CR), MQTTvalue);
+      enqueueJsonObject(IRdata);
+      THEENGS_LOG_TRACE(F("Store val: %D" CR), MQTTvalue);
       storeSignalValue(MQTTvalue);
       if (repeatIRwMQTT) {
-        Log.trace(F("Pub. IR for rpt" CR));
+        THEENGS_LOG_TRACE(F("Pub. IR for rpt" CR));
         pubMQTT(subjectForwardMQTTtoIR, MQTTvalue);
       }
     }
   }
 }
 
-bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data, const char* hex, unsigned int valueBITS, uint16_t valueRPT);
+bool sendIdentifiedProtocol(const char* protocol_name, uint64_t data, const char* hex, unsigned int valueBITS, uint16_t valueRPT);
 
 #  if jsonReceiving
-void MQTTtoIR(char* topicOri, JsonObject& IRdata) {
+void XtoIR(const char* topicOri, JsonObject& IRdata) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoIR)) {
-    Log.trace(F("MQTTtoIR json" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoIR json" CR));
     uint64_t data = IRdata["value"];
     const char* raw = IRdata["raw"];
     const char* hex = IRdata["hex"];
     if (hex) { // we privilegiate the hex usage over the value one (less risk of error)
-      Log.trace(F("hex: %s" CR), hex);
+      THEENGS_LOG_TRACE(F("hex: %s" CR), hex);
       data = getUInt64fromHex(hex);
     }
     if (data != 0 || raw) {
-      Log.trace(F("MQTTtoIR value || raw  detected" CR));
+      THEENGS_LOG_TRACE(F("MQTTtoIR value || raw  detected" CR));
+      irrecv.disableIRIn();
       bool signalSent = false;
       const char* protocol_name = IRdata["protocol_name"];
       unsigned int valueBITS = IRdata["bits"] | 0;
       uint16_t valueRPT = IRdata["repeat"] | repeatIRwNumber;
 
       if (raw) {
-        Log.trace(F("Raw: %s" CR), raw);
+        THEENGS_LOG_TRACE(F("Raw: %s" CR), raw);
         unsigned int s = strlen(raw);
         //number of "," value count
         int count = 0;
@@ -210,7 +194,7 @@ void MQTTtoIR(char* topicOri, JsonObject& IRdata) {
         }
 #    ifdef IR_GC
         if (strcmp(protocol_name, "GC") == 0) { // sending GC data from https://irdb.globalcache.com
-          Log.trace(F("GC" CR));
+          THEENGS_LOG_TRACE(F("GC" CR));
           //buffer allocation from char datacallback
           uint16_t GC[count + 1];
           String value = "";
@@ -231,13 +215,9 @@ void MQTTtoIR(char* topicOri, JsonObject& IRdata) {
 #    endif
 #    ifdef IR_RAW
         if (strcmp(protocol_name, "Raw") == 0) { // sending Raw data
-          Log.trace(F("Raw" CR));
-//buffer allocation from char datacallback
-#      if defined(ESP8266) || defined(ESP32)
+          THEENGS_LOG_TRACE(F("Raw" CR));
+          //buffer allocation from char datacallback
           uint16_t Raw[count + 1];
-#      else
-          unsigned int Raw[count + 1];
-#      endif
           String value = "";
           int j = 0;
           for (int i = 0; i < s; i++) {
@@ -255,34 +235,30 @@ void MQTTtoIR(char* topicOri, JsonObject& IRdata) {
         }
 #    endif
       } else if (protocol_name && (strcmp(protocol_name, "NEC") != 0)) {
-        Log.trace(F("Using Identified Protocol: %s  bits: %d repeat: %d" CR), protocol_name, valueBITS, valueRPT);
+        THEENGS_LOG_TRACE(F("Using Identified Protocol: %s  bits: %d repeat: %d" CR), protocol_name, valueBITS, valueRPT);
         signalSent = sendIdentifiedProtocol(protocol_name, data, hex, valueBITS, valueRPT);
       } else {
-        Log.trace(F("Using NEC protocol" CR));
-        Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+        THEENGS_LOG_TRACE(F("Using NEC protocol" CR));
+        THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
         if (valueBITS == 0)
           valueBITS = NEC_BITS;
-#    if defined(ESP8266) || defined(ESP32)
         irsend.sendNEC(data, valueBITS, valueRPT);
-#    else
-        for (int i = 0; i <= valueRPT; i++)
-          irsend.sendNEC(data, valueBITS);
-#    endif
         signalSent = true;
       }
       if (signalSent) { // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
-        Log.notice(F("MQTTtoIR OK" CR));
-        pub(subjectGTWIRtoMQTT, IRdata);
+        THEENGS_LOG_NOTICE(F("MQTTtoIR OK" CR));
+        IRdata["origin"] = subjectGTWIRtoMQTT;
+        enqueueJsonObject(IRdata);
       }
       irrecv.enableIRIn(); // ReStart the IR receiver (if not restarted it is not able to receive data)
     } else {
-      Log.error(F("MQTTtoIR failed json read" CR));
+      THEENGS_LOG_ERROR(F("MQTTtoIR failed json read" CR));
     }
   }
 }
 #  endif
 
-bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data, const char* hex, unsigned int valueBITS, uint16_t valueRPT) {
+bool sendIdentifiedProtocol(const char* protocol_name, uint64_t data, const char* hex, unsigned int valueBITS, uint16_t valueRPT) {
   uint8_t dataarray[valueBITS];
   if (hex) {
     const char* ptr = NULL;
@@ -292,157 +268,104 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
       ptr += 2;
     }
     for (int i = 0; i < valueBITS; i++) {
-      Log.trace(F("%x"), dataarray[i]);
+      THEENGS_LOG_TRACE(F("%x"), dataarray[i]);
     }
   }
 #  ifdef IR_WHYNTER
   if (strcmp(protocol_name, "WHYNTER") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = WHYNTER_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendWhynter(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendWhynter(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_LG
   if (strcmp(protocol_name, "LG") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = LG_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendLG(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendLG(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_SONY
   if (strcmp(protocol_name, "SONY") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
-#    if defined(ESP8266) || defined(ESP32)
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = SONY_20_BITS;
     irsend.sendSony(data, valueBITS, valueRPT);
-#    else
-    if (valueBITS == 0)
-      valueBITS = SONY_12_BITS;
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendSony(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_DISH
   if (strcmp(protocol_name, "DISH") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = DISH_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendDISH(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendDISH(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_RC5
   if (strcmp(protocol_name, "RC5") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = RC5_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendRC5(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendRC5(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_RC6
   if (strcmp(protocol_name, "RC6") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = RC6_MODE0_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendRC6(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendRC6(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_SHARP
   if (strcmp(protocol_name, "SHARP") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = SHARP_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendSharpRaw(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendSharpRaw(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_SAMSUNG
   if (strcmp(protocol_name, "SAMSUNG") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = SAMSUNG_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendSAMSUNG(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendSAMSUNG(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_JVC
   if (strcmp(protocol_name, "JVC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = JVC_BITS;
-#    if defined(ESP8266) || defined(ESP32)
     irsend.sendJVC(data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendJVC(data, valueBITS);
-#    endif
     return true;
   }
 #  endif
 #  ifdef IR_PANASONIC
   if (strcmp(protocol_name, "PANASONIC") == 0) {
-#    if defined(ESP8266) || defined(ESP32)
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = PANASONIC_BITS;
     irsend.sendPanasonic(PanasonicAddress, data, valueBITS, valueRPT);
-#    else
-    for (int i = 0; i <= valueRPT; i++)
-      irsend.sendPanasonic(PanasonicAddress, data);
-#    endif
     return true;
   }
 #  endif
 
-#  if defined(ESP8266) || defined(ESP32)
-#    ifdef IR_COOLIX
+#  ifdef IR_COOLIX
   if (strcmp(protocol_name, "COOLIX") == 0) {
-    Log.trace(F("Sending %s:" CR), protocol_name);
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_TRACE(F("Sending %s:" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kCoolixBits;
     if (valueRPT == repeatIRwNumber)
@@ -450,29 +373,29 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendCOOLIX(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_RCMM
+#  endif
+#  ifdef IR_RCMM
   if (strcmp(protocol_name, "RCMM") == 0) {
-    Log.trace(F("Sending %s:" CR), protocol_name);
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_TRACE(F("Sending %s:" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kRCMMBits;
     irsend.sendRCMM(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DENON
+#  endif
+#  ifdef IR_DENON
   if (strcmp(protocol_name, "DENON") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = DENON_BITS;
     irsend.sendDenon(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_GICABLE
+#  endif
+#  ifdef IR_GICABLE
   if (strcmp(protocol_name, "GICABLE") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kGicableBits;
     if (valueRPT == repeatIRwNumber)
@@ -480,10 +403,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendGICable(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SHERWOOD
+#  endif
+#  ifdef IR_SHERWOOD
   if (strcmp(protocol_name, "SHERWOOD") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSherwoodBits;
     if (valueRPT == repeatIRwNumber)
@@ -491,10 +414,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendSherwood(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHI
+#  endif
+#  ifdef IR_MITSUBISHI
   if (strcmp(protocol_name, "MITSUBISHI") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishiBits;
     if (valueRPT == repeatIRwNumber)
@@ -502,19 +425,19 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishi(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_NIKAI
+#  endif
+#  ifdef IR_NIKAI
   if (strcmp(protocol_name, "NIKAI") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kNikaiBits;
     irsend.sendNikai(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MIDEA
+#  endif
+#  ifdef IR_MIDEA
   if (strcmp(protocol_name, "MIDEA") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMideaBits;
     if (valueRPT == repeatIRwNumber)
@@ -522,19 +445,19 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMidea(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MAGIQUEST
+#  endif
+#  ifdef IR_MAGIQUEST
   if (strcmp(protocol_name, "MAGIQUEST") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMagiquestBits;
     irsend.sendMagiQuest(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_LASERTAG
+#  endif
+#  ifdef IR_LASERTAG
   if (strcmp(protocol_name, "LASERTAG") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kLasertagBits;
     if (valueRPT == repeatIRwNumber)
@@ -542,10 +465,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendLasertag(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_CARRIER_AC
+#  endif
+#  ifdef IR_CARRIER_AC
   if (strcmp(protocol_name, "CARRIER_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kCarrierAcBits;
     if (valueRPT == repeatIRwNumber)
@@ -553,10 +476,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendCarrierAC(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHI2
+#  endif
+#  ifdef IR_MITSUBISHI2
   if (strcmp(protocol_name, "MITSUBISHI2") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishiBits;
     if (valueRPT == repeatIRwNumber)
@@ -564,10 +487,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishi2(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_AIWA_RC_T501
+#  endif
+#  ifdef IR_AIWA_RC_T501
   if (strcmp(protocol_name, "AIWA_RC_T501") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kAiwaRcT501Bits;
     if (valueRPT == repeatIRwNumber)
@@ -575,10 +498,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendAiwaRCT501(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN
+#  endif
+#  ifdef IR_DAIKIN
   if (strcmp(protocol_name, "DAIKIN") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikinStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -586,10 +509,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_KELVINATOR
+#  endif
+#  ifdef IR_KELVINATOR
   if (strcmp(protocol_name, "KELVINATOR") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kKelvinatorStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -597,10 +520,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendKelvinator(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHI_AC
+#  endif
+#  ifdef IR_MITSUBISHI_AC
   if (strcmp(protocol_name, "MITSUBISHI_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishiACStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -608,19 +531,19 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishiAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SANYO
+#  endif
+#  ifdef IR_SANYO
   if (strcmp(protocol_name, "SANYOLC7461") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSanyoLC7461Bits;
     irsend.sendSanyoLC7461(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_GREE
+#  endif
+#  ifdef IR_GREE
   if (strcmp(protocol_name, "GREE") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kGreeStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -628,10 +551,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendGree(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_ARGO
+#  endif
+#  ifdef IR_ARGO
   if (strcmp(protocol_name, "ARGO") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kArgoStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -639,10 +562,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendArgo(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TROTEC
+#  endif
+#  ifdef IR_TROTEC
   if (strcmp(protocol_name, "TROTEC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kTrotecStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -650,10 +573,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendTrotec(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TOSHIBA_AC
+#  endif
+#  ifdef IR_TOSHIBA_AC
   if (strcmp(protocol_name, "TOSHIBA_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kToshibaACBits;
     if (valueRPT == repeatIRwNumber)
@@ -661,18 +584,18 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendToshibaAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_FUJITSU_AC
+#  endif
+#  ifdef IR_FUJITSU_AC
   if (strcmp(protocol_name, "FUJITSU_AC") == 0) {
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kFujitsuAcMinRepeat);
     irsend.sendFujitsuAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HAIER_AC
+#  endif
+#  ifdef IR_HAIER_AC
   if (strcmp(protocol_name, "HAIER_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHaierACStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -680,10 +603,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendHaierAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC
+#  endif
+#  ifdef IR_HITACHI_AC
   if (strcmp(protocol_name, "HITACHI_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAcStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -691,10 +614,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendHitachiAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC1
+#  endif
+#  ifdef IR_HITACHI_AC1
   if (strcmp(protocol_name, "HITACHI_AC1") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAc1StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -702,10 +625,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendHitachiAC1(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC2
+#  endif
+#  ifdef IR_HITACHI_AC2
   if (strcmp(protocol_name, "HITACHI_AC2") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAc2StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -713,10 +636,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendHitachiAC2(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HAIER_AC_YRW02
+#  endif
+#  ifdef IR_HAIER_AC_YRW02
   if (strcmp(protocol_name, "HAIER_AC_YRW02") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHaierACYRW02StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -724,10 +647,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendHaierACYRW02(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_WHIRLPOOL_AC
+#  endif
+#  ifdef IR_WHIRLPOOL_AC
   if (strcmp(protocol_name, "WHIRLPOOL_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kWhirlpoolAcStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -735,10 +658,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendWhirlpoolAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SAMSUNG_AC
+#  endif
+#  ifdef IR_SAMSUNG_AC
   if (strcmp(protocol_name, "SAMSUNG_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSamsungAcStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -746,28 +669,28 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendSamsungAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_LUTRON
+#  endif
+#  ifdef IR_LUTRON
   if (strcmp(protocol_name, "LUTRON") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kLutronBits;
     irsend.sendLutron(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_ELECTRA_AC
+#  endif
+#  ifdef IR_ELECTRA_AC
   if (strcmp(protocol_name, "ELECTRA_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kElectraAcStateLength;
     irsend.sendElectraAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_PANASONIC_AC
+#  endif
+#  ifdef IR_PANASONIC_AC
   if (strcmp(protocol_name, "PANASONIC_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kPanasonicAcStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -775,34 +698,34 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendPanasonicAC(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_PIONEER
+#  endif
+#  ifdef IR_PIONEER
   if (strcmp(protocol_name, "PIONEER") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kPioneerBits;
     irsend.sendPioneer(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_LG2
+#  endif
+#  ifdef IR_LG2
   if (strcmp(protocol_name, "LG2") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kLgBits;
     irsend.sendLG2(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MWM
+#  endif
+#  ifdef IR_MWM
   if (strcmp(protocol_name, "MWM") == 0) {
     irsend.sendMWM(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN2
+#  endif
+#  ifdef IR_DAIKIN2
   if (strcmp(protocol_name, "DAIKIN2") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikin2StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -810,28 +733,28 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin2(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_VESTEL_AC
+#  endif
+#  ifdef IR_VESTEL_AC
   if (strcmp(protocol_name, "VESTEL_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kVestelAcBits;
     irsend.sendVestelAc(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SAMSUNG36
+#  endif
+#  ifdef IR_SAMSUNG36
   if (strcmp(protocol_name, "SAMSUNG36") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSamsung36Bits;
     irsend.sendSamsung36(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TCL112AC
+#  endif
+#  ifdef IR_TCL112AC
   if (strcmp(protocol_name, "TCL112AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kTcl112AcStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -839,19 +762,19 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendTcl112Ac(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TECO
+#  endif
+#  ifdef IR_TECO
   if (strcmp(protocol_name, "TECO") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kTecoBits;
     irsend.sendTeco(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_LEGOPF
+#  endif
+#  ifdef IR_LEGOPF
   if (strcmp(protocol_name, "LEGOPF") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kLegoPfBits;
     if (valueRPT == repeatIRwNumber)
@@ -859,10 +782,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendLegoPf(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHIHEAVY88
+#  endif
+#  ifdef IR_MITSUBISHIHEAVY88
   if (strcmp(protocol_name, "MITSUBISHIHEAVY88") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishiHeavy88StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -870,10 +793,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishiHeavy88(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHIHEAVY152
+#  endif
+#  ifdef IR_MITSUBISHIHEAVY152
   if (strcmp(protocol_name, "MITSUBISHIHEAVY152") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishiHeavy152StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -881,10 +804,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishiHeavy152(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN216
+#  endif
+#  ifdef IR_DAIKIN216
   if (strcmp(protocol_name, "DAIKIN216") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikin216StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -892,10 +815,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin216(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SHARP_AC
+#  endif
+#  ifdef IR_SHARP_AC
   if (strcmp(protocol_name, "SHARP_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSharpAcStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -903,10 +826,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendSharpAc(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_GOODWEATHER
+#  endif
+#  ifdef IR_GOODWEATHER
   if (strcmp(protocol_name, "GOODWEATHER_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kGoodweatherBits;
     if (valueRPT == repeatIRwNumber)
@@ -914,10 +837,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendGoodweather(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_INAX
+#  endif
+#  ifdef IR_INAX
   if (strcmp(protocol_name, "INAX") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kInaxBits;
     if (valueRPT == repeatIRwNumber)
@@ -925,10 +848,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendInax(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN160
+#  endif
+#  ifdef IR_DAIKIN160
   if (strcmp(protocol_name, "DAIKIN160") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikin160StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -936,10 +859,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin160(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_NEOCLIMA
+#  endif
+#  ifdef IR_NEOCLIMA
   if (strcmp(protocol_name, "NEOCLIMA") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kNeoclimaStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -947,10 +870,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendNeoclima(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN176
+#  endif
+#  ifdef IR_DAIKIN176
   if (strcmp(protocol_name, "DAIKIN176") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikin176StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -958,10 +881,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin176(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN128
+#  endif
+#  ifdef IR_DAIKIN128
   if (strcmp(protocol_name, "DAIKIN128") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikin128StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -969,10 +892,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin128(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_AMCOR
+#  endif
+#  ifdef IR_AMCOR
   if (strcmp(protocol_name, "AMCOR") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kAmcorStateLength;
     if (valueRPT == repeatIRwNumber)
@@ -980,10 +903,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendAmcor(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN152
+#  endif
+#  ifdef IR_DAIKIN152
   if (strcmp(protocol_name, "DAIKIN152") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDaikin152StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -991,10 +914,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin152(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHI136
+#  endif
+#  ifdef IR_MITSUBISHI136
   if (strcmp(protocol_name, "MITSUBISHI136") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishi136StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -1002,10 +925,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishi136(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MITSUBISHI112
+#  endif
+#  ifdef IR_MITSUBISHI112
   if (strcmp(protocol_name, "MITSUBISHI112") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kMitsubishi112StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -1013,10 +936,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMitsubishi112(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC424
+#  endif
+#  ifdef IR_HITACHI_AC424
   if (strcmp(protocol_name, "HITACHI_AC424") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAc424StateLength;
     if (valueRPT == repeatIRwNumber)
@@ -1024,10 +947,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendHitachiAc424(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SONY_38K
+#  endif
+#  ifdef IR_SONY_38K
   if (strcmp(protocol_name, "SONY_38K") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, (uint16_t)(kSonyMinRepeat + 1));
     if (valueBITS == 0)
@@ -1035,10 +958,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendSony38(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_EPSON
+#  endif
+#  ifdef IR_EPSON
   if (strcmp(protocol_name, "EPSON") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kEpsonMinRepeat);
     if (valueBITS == 0)
@@ -1046,10 +969,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendEpson(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SYMPHONY
+#  endif
+#  ifdef IR_SYMPHONY
   if (strcmp(protocol_name, "SYMPHONY") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kSymphonyDefaultRepeat);
     if (valueBITS == 0)
@@ -1057,21 +980,21 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendSymphony(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC3
+#  endif
+#  ifdef IR_HITACHI_AC3
   if (strcmp(protocol_name, "HITACHI_AC3") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kHitachiAcDefaultRepeat);
     if (valueBITS == 0)
-      Log.error(F("For this protocol you should have a BIT number as there is no default one defined" CR));
+      THEENGS_LOG_ERROR(F("For this protocol you should have a BIT number as there is no default one defined" CR));
     irsend.sendHitachiAc3(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DAIKIN64
+#  endif
+#  ifdef IR_DAIKIN64
   if (strcmp(protocol_name, "DAIKIN64") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kDaikin64DefaultRepeat);
     if (valueBITS == 0)
@@ -1079,10 +1002,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDaikin64(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_AIRWELL
+#  endif
+#  ifdef IR_AIRWELL
   if (strcmp(protocol_name, "AIRWELL") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kAirwellMinRepeats);
     if (valueBITS == 0)
@@ -1090,10 +1013,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendAirwell(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DELONGHI_AC
+#  endif
+#  ifdef IR_DELONGHI_AC
   if (strcmp(protocol_name, "DELONGHI_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kDelonghiAcDefaultRepeat);
     if (valueBITS == 0)
@@ -1101,19 +1024,19 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendDelonghiAc(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_DOSHISHA
+#  endif
+#  ifdef IR_DOSHISHA
   if (strcmp(protocol_name, "DOSHISHA") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kDoshishaBits;
     irsend.sendDoshisha(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_CARRIER_AC40
+#  endif
+#  ifdef IR_CARRIER_AC40
   if (strcmp(protocol_name, "CARRIER_AC40") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kCarrierAc40MinRepeat);
     if (valueBITS == 0)
@@ -1121,10 +1044,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendCarrierAC40(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_CARRIER_AC64
+#  endif
+#  ifdef IR_CARRIER_AC64
   if (strcmp(protocol_name, "CARRIER_AC64") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kCarrierAc64MinRepeat);
     if (valueBITS == 0)
@@ -1132,28 +1055,28 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendCarrierAC64(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC344
+#  endif
+#  ifdef IR_HITACHI_AC344
   if (strcmp(protocol_name, "HITACHI_AC344") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAc344StateLength;
     irsend.sendHitachiAc344(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_CORONA_AC
+#  endif
+#  ifdef IR_CORONA_AC
   if (strcmp(protocol_name, "CORONA_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kCoronaAcStateLength;
     irsend.sendCoronaAc(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MIDEA24
+#  endif
+#  ifdef IR_MIDEA24
   if (strcmp(protocol_name, "MIDEA24") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kMidea24MinRepeat);
     if (valueBITS == 0)
@@ -1161,10 +1084,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMidea24(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_ZEPEAL
-  if (strcmp(protocol_name, "ZEPEAL") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+#  endif
+#  ifdef IR_ZEPEAL
+  if (strcmp(protocol_name, "EPEAL") == 0) {
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kZepealMinRepeat);
     if (valueBITS == 0)
@@ -1172,28 +1095,28 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendZepeal(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SANYO_AC
+#  endif
+#  ifdef IR_SANYO_AC
   if (strcmp(protocol_name, "SANYO_AC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSanyoAcStateLength;
     irsend.sendSanyoAc(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_VOLTAS
+#  endif
+#  ifdef IR_VOLTAS
   if (strcmp(protocol_name, "VOLTAS") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kVoltasStateLength;
     irsend.sendVoltas(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_METZ
+#  endif
+#  ifdef IR_METZ
   if (strcmp(protocol_name, "METZ") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kMetzMinRepeat);
     if (valueBITS == 0)
@@ -1201,10 +1124,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMetz(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TRANSCOLD
+#  endif
+#  ifdef IR_TRANSCOLD
   if (strcmp(protocol_name, "TRANSCOLD") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kTranscoldDefaultRepeat);
     if (valueBITS == 0)
@@ -1212,10 +1135,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendTranscold(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TECHNIBEL_AC
+#  endif
+#  ifdef IR_TECHNIBEL_AC
   if (strcmp(protocol_name, "TECHNIBELAC") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kTechnibelAcDefaultRepeat);
     if (valueBITS == 0)
@@ -1223,10 +1146,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendTechnibelAc(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MIRAGE
+#  endif
+#  ifdef IR_MIRAGE
   if (strcmp(protocol_name, "MIRAGE") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kMirageMinRepeat);
     if (valueBITS == 0)
@@ -1234,10 +1157,10 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMirage(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_ELITESCREENS
+#  endif
+#  ifdef IR_ELITESCREENS
   if (strcmp(protocol_name, "ELITESCREENS") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kEliteScreensDefaultRepeat);
     if (valueBITS == 0)
@@ -1245,19 +1168,19 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendElitescreens(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_PANASONIC_AC32
+#  endif
+#  ifdef IR_PANASONIC_AC32
   if (strcmp(protocol_name, "PANASONIC_AC32") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kPioneerBits;
     irsend.sendPanasonicAC32(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_MILESTAG2
+#  endif
+#  ifdef IR_MILESTAG2
   if (strcmp(protocol_name, "MILESTAG2") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueRPT == repeatIRwNumber)
       valueRPT = std::max(valueRPT, kMilesMinRepeat);
     if (valueBITS == 0)
@@ -1265,135 +1188,134 @@ bool sendIdentifiedProtocol(const char* protocol_name, SIGNAL_SIZE_UL_ULL data,
     irsend.sendMilestag2(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_ECOCLIM
+#  endif
+#  ifdef IR_ECOCLIM
   if (strcmp(protocol_name, "ECOCLIM") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kEcoclimBits;
     irsend.sendEcoclim(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_XMP
+#  endif
+#  ifdef IR_XMP
   if (strcmp(protocol_name, "XMP") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kXmpBits;
     irsend.sendXmp(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_KELON168
+#  endif
+#  ifdef IR_KELON168
   if (strcmp(protocol_name, "KELON168") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kKelon168Bits;
     irsend.sendKelon168(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TEKNOPOINT
+#  endif
+#  ifdef IR_TEKNOPOINT
   if (strcmp(protocol_name, "TEKNOPOINT") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kTeknopointBits;
     irsend.sendTeknopoint(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HAIER_AC176
+#  endif
+#  ifdef IR_HAIER_AC176
   if (strcmp(protocol_name, "HAIER_AC176") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHaierAC176Bits;
     irsend.sendHaierAC176(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_BOSE
+#  endif
+#  ifdef IR_BOSE
   if (strcmp(protocol_name, "BOSE") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kBoseBits;
     irsend.sendBose(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_SANYO_AC88
+#  endif
+#  ifdef IR_SANYO_AC88
   if (strcmp(protocol_name, "SANYO_AC88") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kSanyoAc88Bits;
     irsend.sendSanyoAc88(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_TROTEC_3550
+#  endif
+#  ifdef IR_TROTEC_3550
   if (strcmp(protocol_name, "TROTEC_3550") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kTrotecBits;
     irsend.sendTrotec3550(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_ARRIS
+#  endif
+#  ifdef IR_ARRIS
   if (strcmp(protocol_name, "ARRIS") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kArrisBits;
     irsend.sendArris(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_RHOSS
+#  endif
+#  ifdef IR_RHOSS
   if (strcmp(protocol_name, "RHOSS") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kRhossBits;
     irsend.sendRhoss(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_AIRTON
+#  endif
+#  ifdef IR_AIRTON
   if (strcmp(protocol_name, "AIRTON") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kAirtonBits;
     irsend.sendAirton(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_COOLIX48
+#  endif
+#  ifdef IR_COOLIX48
   if (strcmp(protocol_name, "COOLIX48") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kCoolix48Bits;
     irsend.sendCoolix48(data, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC264
+#  endif
+#  ifdef IR_HITACHI_AC264
   if (strcmp(protocol_name, "HITACHI_AC264") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAc264Bits;
     irsend.sendHitachiAc264(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-#    ifdef IR_HITACHI_AC296
+#  endif
+#  ifdef IR_HITACHI_AC296
   if (strcmp(protocol_name, "HITACHI_AC296") == 0) {
-    Log.notice(F("Sending IR signal with %s" CR), protocol_name);
+    THEENGS_LOG_NOTICE(F("Sending IR signal with %s" CR), protocol_name);
     if (valueBITS == 0)
       valueBITS = kHitachiAc296Bits;
     irsend.sendHitachiAc296(dataarray, valueBITS, valueRPT);
     return true;
   }
-#    endif
-  Log.warning(F("Unknown IR protocol" CR));
-  return false;
 #  endif
+  THEENGS_LOG_WARNING(F("Unknown IR protocol" CR));
+  return false;
 }
 #endif
diff --git a/main/ZgatewayLORA.ino b/main/gatewayLORA.cpp
similarity index 73%
rename from main/ZgatewayLORA.ino
rename to main/gatewayLORA.cpp
index a88c3e3..7915aa4 100644
--- a/main/ZgatewayLORA.ino
+++ b/main/gatewayLORA.cpp
@@ -1,5 +1,5 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your 433mhz/infrared IR/BLE signal  and a MQTT broker 
    Send and receiving command by MQTT
@@ -28,18 +28,36 @@
 #include "User_config.h"
 
 #ifdef ZgatewayLORA
-
 #  include <LoRa.h>
 #  include <SPI.h>
+#  include <TheengsUtils.h>
 #  include <Wire.h>
 
+#  include "TheengsCommon.h"
+#  include "config_LORA.h"
+#  include "config_mqttDiscovery.h"
+
 #  define WIPHONE_MESSAGE_MAGIC   0x6c6d
 #  define WIPHONE_MESSAGE_MIN_LEN sizeof(wiphone_message) - WIPHONE_MAX_MESSAGE_LEN
 #  define WIPHONE_MAX_MESSAGE_LEN 230
 
 LORAConfig_s LORAConfig;
 
+void LORAConfig_fromJson(JsonObject& LORAdata);
+void LORAConfig_apply();
+String stateLORAMeasures();
+
 #  ifdef ZmqttDiscovery
+#    include "config_mqttDiscovery.h"
+extern void createDiscovery(const char* sensor_type,
+                            const char* st_topic, const char* s_name, const char* unique_id,
+                            const char* availability_topic, const char* device_class, const char* value_template,
+                            const char* payload_on, const char* payload_off, const char* unit_of_meas,
+                            int off_delay,
+                            const char* payload_available, const char* payload_not_available, bool gateway_entity, const char* cmd_topic,
+                            const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_id, bool retainCmd,
+                            const char* state_class, const char* state_off, const char* state_on, const char* enum_options, const char* command_template);
+
 SemaphoreHandle_t semaphorecreateOrUpdateDeviceLORA;
 std::vector<LORAdevice*> LORAdevices;
 int newLORADevices = 0;
@@ -50,7 +68,7 @@ static LORAdevice NO_LORA_DEVICE_FOUND = {{0},
 
 LORAdevice* getDeviceById(const char* id); // Declared here to avoid pre-compilation issue (misplaced auto declaration by pio)
 LORAdevice* getDeviceById(const char* id) {
-  Log.trace(F("getDeviceById %s" CR), id);
+  THEENGS_LOG_TRACE(F("getDeviceById %s" CR), id);
 
   for (std::vector<LORAdevice*>::iterator it = LORAdevices.begin(); it != LORAdevices.end(); ++it) {
     if ((strcmp((*it)->uniqueId, id) == 0)) {
@@ -63,34 +81,34 @@ LORAdevice* getDeviceById(const char* id) {
 void dumpLORADevices() {
   for (std::vector<LORAdevice*>::iterator it = LORAdevices.begin(); it != LORAdevices.end(); ++it) {
     LORAdevice* p = *it;
-    Log.trace(F("uniqueId %s" CR), p->uniqueId);
-    Log.trace(F("modelName %s" CR), p->modelName);
-    Log.trace(F("isDisc %d" CR), p->isDisc);
+    THEENGS_LOG_TRACE(F("uniqueId %s" CR), p->uniqueId);
+    THEENGS_LOG_TRACE(F("modelName %s" CR), p->modelName);
+    THEENGS_LOG_TRACE(F("isDisc %d" CR), p->isDisc);
   }
 }
 
 void createOrUpdateDeviceLORA(const char* id, const char* model, uint8_t flags) {
   if (xSemaphoreTake(semaphorecreateOrUpdateDeviceLORA, pdMS_TO_TICKS(30000)) == pdFALSE) {
-    Log.error(F("[LORA] semaphorecreateOrUpdateDeviceLORA Semaphore NOT taken" CR));
+    THEENGS_LOG_ERROR(F("[LORA] semaphorecreateOrUpdateDeviceLORA Semaphore NOT taken" CR));
     return;
   }
 
   LORAdevice* device = getDeviceById(id);
   if (device == &NO_LORA_DEVICE_FOUND) {
-    Log.trace(F("add %s" CR), id);
+    THEENGS_LOG_TRACE(F("add %s" CR), id);
     //new device
     device = new LORAdevice();
     if (strlcpy(device->uniqueId, id, uniqueIdSize) > uniqueIdSize) {
-      Log.warning(F("[LORA] Device id %s exceeds available space" CR), id); // Remove from production release ?
+      THEENGS_LOG_WARNING(F("[LORA] Device id %s exceeds available space" CR), id); // Remove from production release ?
     };
     if (strlcpy(device->modelName, model, modelNameSize) > modelNameSize) {
-      Log.warning(F("[LORA] Device model %s exceeds available space" CR), id); // Remove from production release ?
+      THEENGS_LOG_WARNING(F("[LORA] Device model %s exceeds available space" CR), id); // Remove from production release ?
     };
     device->isDisc = flags & device_flags_isDisc;
     LORAdevices.push_back(device);
     newLORADevices++;
   } else {
-    Log.trace(F("update %s" CR), id);
+    THEENGS_LOG_TRACE(F("update %s" CR), id);
 
     if (flags & device_flags_isDisc) {
       device->isDisc = true;
@@ -106,7 +124,7 @@ void launchLORADiscovery(bool overrideDiscovery) {
   if (!overrideDiscovery && newLORADevices == 0)
     return;
   if (xSemaphoreTake(semaphorecreateOrUpdateDeviceLORA, pdMS_TO_TICKS(QueueSemaphoreTimeOutLoop)) == pdFALSE) {
-    Log.error(F("[LORA] semaphorecreateOrUpdateDeviceLORA Semaphore NOT taken" CR));
+    THEENGS_LOG_ERROR(F("[LORA] semaphorecreateOrUpdateDeviceLORA Semaphore NOT taken" CR));
     return;
   }
   newLORADevices = 0;
@@ -114,7 +132,7 @@ void launchLORADiscovery(bool overrideDiscovery) {
   xSemaphoreGive(semaphorecreateOrUpdateDeviceLORA);
   for (std::vector<LORAdevice*>::iterator it = localDevices.begin(); it != localDevices.end(); ++it) {
     LORAdevice* pdevice = *it;
-    Log.trace(F("Device id %s" CR), pdevice->uniqueId);
+    THEENGS_LOG_TRACE(F("Device id %s" CR), pdevice->uniqueId);
     // Do not launch discovery for the LORAdevices already discovered (unless we have overrideDiscovery) or that are not unique by their MAC Address (Ibeacon, GAEN and Microsoft Cdp)
     if (overrideDiscovery || !isDiscovered(pdevice)) {
       size_t numRows = sizeof(LORAparameters) / sizeof(LORAparameters[0]);
@@ -123,7 +141,7 @@ void launchLORADiscovery(bool overrideDiscovery) {
           // Remove the key from the unique id to extract the device id
           String idWoKey = pdevice->uniqueId;
           idWoKey.remove(idWoKey.length() - (strlen(LORAparameters[i][0]) + 1));
-          Log.trace(F("idWoKey %s" CR), idWoKey.c_str());
+          THEENGS_LOG_TRACE(F("idWoKey %s" CR), idWoKey.c_str());
           String value_template = "{{ value_json." + String(LORAparameters[i][0]) + " | is_defined }}";
 
           String topic = idWoKey;
@@ -144,10 +162,10 @@ void launchLORADiscovery(bool overrideDiscovery) {
         }
       }
       if (!pdevice->isDisc) {
-        Log.trace(F("Device id %s was not discovered" CR), pdevice->uniqueId); // Remove from production release ?
+        THEENGS_LOG_TRACE(F("Device id %s was not discovered" CR), pdevice->uniqueId); // Remove from production release ?
       }
     } else {
-      Log.trace(F("Device already discovered or that doesn't require discovery %s" CR), pdevice->uniqueId);
+      THEENGS_LOG_TRACE(F("Device already discovered or that doesn't require discovery %s" CR), pdevice->uniqueId);
     }
   }
 }
@@ -222,7 +240,7 @@ uint8_t _determineDevice(JsonObject& LORAdata) {
 /*
 Create JSON information from WiPhone packet
  */
-boolean _WiPhoneToMQTT(byte* packet, JsonObject& LORAdata) {
+boolean _WiPhonetoX(byte* packet, JsonObject& LORAdata) {
   // Decode the LoRa packet and send over MQTT
   wiphone_message* msg = (wiphone_message*)packet;
 
@@ -281,21 +299,21 @@ void LORAConfig_load() {
   if (preferences.isKey("LORAConfig")) {
     auto error = deserializeJson(jsonBuffer, preferences.getString("LORAConfig", "{}"));
     preferences.end();
-    Log.notice(F("LORA Config loaded" CR));
+    THEENGS_LOG_NOTICE(F("LORA Config loaded" CR));
     if (error) {
-      Log.error(F("LORA Config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      THEENGS_LOG_ERROR(F("LORA Config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
       return;
     }
     if (jsonBuffer.isNull()) {
-      Log.warning(F("LORA Config is null" CR));
+      THEENGS_LOG_WARNING(F("LORA Config is null" CR));
       return;
     }
     JsonObject jo = jsonBuffer.as<JsonObject>();
     LORAConfig_fromJson(jo);
-    Log.notice(F("LORA Config loaded" CR));
+    THEENGS_LOG_NOTICE(F("LORA Config loaded" CR));
   } else {
     preferences.end();
-    Log.notice(F("LORA Config not found" CR));
+    THEENGS_LOG_NOTICE(F("LORA Config not found" CR));
   }
 }
 
@@ -303,6 +321,18 @@ byte hexStringToByte(const String& hexString) {
   return (byte)strtol(hexString.c_str(), NULL, 16);
 }
 
+void LORAConfig_apply() {
+  LoRa.setFrequency(LORAConfig.frequency);
+  LoRa.setTxPower(LORAConfig.txPower);
+  LoRa.setSpreadingFactor(LORAConfig.spreadingFactor);
+  LoRa.setSignalBandwidth(LORAConfig.signalBandwidth);
+  LoRa.setCodingRate4(LORAConfig.codingRateDenominator);
+  LoRa.setPreambleLength(LORAConfig.preambleLength);
+  LoRa.setSyncWord(LORAConfig.syncWord);
+  LORAConfig.crc ? LoRa.enableCrc() : LoRa.disableCrc();
+  LORAConfig.invertIQ ? LoRa.enableInvertIQ() : LoRa.disableInvertIQ();
+}
+
 void LORAConfig_fromJson(JsonObject& LORAdata) {
   Config_update(LORAdata, "frequency", LORAConfig.frequency);
   Config_update(LORAdata, "txpower", LORAConfig.txPower);
@@ -311,35 +341,30 @@ void LORAConfig_fromJson(JsonObject& LORAdata) {
   Config_update(LORAdata, "codingrate", LORAConfig.codingRateDenominator);
   Config_update(LORAdata, "preamblelength", LORAConfig.preambleLength);
   Config_update(LORAdata, "onlyknown", LORAConfig.onlyKnown);
-  // Handle syncword separately
+  // Handle syncword separately as it requires hex string conversion
   if (LORAdata.containsKey("syncword")) {
     String syncWordStr = LORAdata["syncword"].as<String>();
-    LORAConfig.syncWord = hexStringToByte(syncWordStr);
-    Log.notice(F("Config syncword changed: %d" CR), LORAConfig.syncWord);
+    byte newSyncWord = hexStringToByte(syncWordStr);
+    if (newSyncWord != LORAConfig.syncWord) {
+      LORAConfig.syncWord = newSyncWord;
+      THEENGS_LOG_NOTICE(F("Config syncword changed: %d" CR), LORAConfig.syncWord);
+    } else {
+      THEENGS_LOG_NOTICE(F("Config syncword unchanged, currently: %d" CR), LORAConfig.syncWord);
+    }
   }
   Config_update(LORAdata, "enablecrc", LORAConfig.crc);
   Config_update(LORAdata, "invertiq", LORAConfig.invertIQ);
 
-  LoRa.setFrequency(LORAConfig.frequency);
-  LoRa.setTxPower(LORAConfig.txPower);
-  LoRa.setSpreadingFactor(LORAConfig.spreadingFactor);
-  LoRa.setSignalBandwidth(LORAConfig.signalBandwidth);
-  LoRa.setCodingRate4(LORAConfig.codingRateDenominator);
-  LoRa.setPreambleLength(LORAConfig.preambleLength);
-  LoRa.setSyncWord(LORAConfig.syncWord);
-  LORAConfig.crc ? LoRa.enableCrc() : LoRa.disableCrc();
-  LORAConfig.invertIQ ? LoRa.enableInvertIQ() : LoRa.disableInvertIQ();
-
   if (LORAdata.containsKey("erase") && LORAdata["erase"].as<bool>()) {
     // Erase config from NVS (non-volatile storage)
     preferences.begin(Gateway_Short_Name, false);
     if (preferences.isKey("LORAConfig")) {
       int result = preferences.remove("LORAConfig");
-      Log.notice(F("LORA config erase result: %d" CR), result);
+      THEENGS_LOG_NOTICE(F("LORA config erase result: %d" CR), result);
       preferences.end();
       return; // Erase prevails on save, so skipping save
     } else {
-      Log.notice(F("LORA config not found" CR));
+      THEENGS_LOG_NOTICE(F("LORA config not found" CR));
       preferences.end();
     }
   }
@@ -347,13 +372,28 @@ void LORAConfig_fromJson(JsonObject& LORAdata) {
     StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
     JsonObject jo = jsonBuffer.to<JsonObject>();
     jo["frequency"] = LORAConfig.frequency;
+    jo["txpower"] = LORAConfig.txPower;
+    jo["spreadingfactor"] = LORAConfig.spreadingFactor;
+    jo["signalbandwidth"] = LORAConfig.signalBandwidth;
+    jo["codingrate"] = LORAConfig.codingRateDenominator;
+    jo["preamblelength"] = LORAConfig.preambleLength;
+    if (LORAConfig.syncWord < 0 || LORAConfig.syncWord > 255) {
+      THEENGS_LOG_ERROR(F("Invalid syncWord value: %d" CR), LORAConfig.syncWord);
+    } else {
+      char syncWordHex[5];
+      snprintf(syncWordHex, sizeof(syncWordHex), "0x%02X", LORAConfig.syncWord);
+      jo["syncword"] = syncWordHex;
+    }
+    jo["enablecrc"] = LORAConfig.crc;
+    jo["invertiq"] = LORAConfig.invertIQ;
+    jo["onlyknown"] = LORAConfig.onlyKnown;
     // Save config into NVS (non-volatile storage)
     String conf = "";
     serializeJson(jsonBuffer, conf);
     preferences.begin(Gateway_Short_Name, false);
     int result = preferences.putString("LORAConfig", conf);
     preferences.end();
-    Log.notice(F("LORA Config_save: %s, result: %d" CR), conf.c_str(), result);
+    THEENGS_LOG_NOTICE(F("LORA Config_save: %s, result: %d" CR), conf.c_str(), result);
   }
 }
 
@@ -364,7 +404,7 @@ void setupLORA() {
   semaphorecreateOrUpdateDeviceLORA = xSemaphoreCreateBinary();
   xSemaphoreGive(semaphorecreateOrUpdateDeviceLORA);
 #  endif
-  Log.notice(F("LORA Frequency: %d" CR), LORAConfig.frequency);
+  THEENGS_LOG_NOTICE(F("LORA Frequency: %d" CR), LORAConfig.frequency);
 #  ifdef ESP8266
   SPI.begin();
 #  else
@@ -374,26 +414,26 @@ void setupLORA() {
   LoRa.setPins(LORA_SS, LORA_RST, LORA_DI0);
 
   if (!LoRa.begin(LORAConfig.frequency)) {
-    Log.error(F("ZgatewayLORA setup failed!" CR));
-    while (1)
-      ;
+    THEENGS_LOG_ERROR(F("gatewayLORA setup failed!" CR));
+    while (1);
   }
+  LORAConfig_apply();
   LoRa.receive();
-  Log.notice(F("LORA_SCK: %d" CR), LORA_SCK);
-  Log.notice(F("LORA_MISO: %d" CR), LORA_MISO);
-  Log.notice(F("LORA_MOSI: %d" CR), LORA_MOSI);
-  Log.notice(F("LORA_SS: %d" CR), LORA_SS);
-  Log.notice(F("LORA_RST: %d" CR), LORA_RST);
-  Log.notice(F("LORA_DI0: %d" CR), LORA_DI0);
-  Log.trace(F("ZgatewayLORA setup done" CR));
+  THEENGS_LOG_NOTICE(F("LORA_SCK: %d" CR), LORA_SCK);
+  THEENGS_LOG_NOTICE(F("LORA_MISO: %d" CR), LORA_MISO);
+  THEENGS_LOG_NOTICE(F("LORA_MOSI: %d" CR), LORA_MOSI);
+  THEENGS_LOG_NOTICE(F("LORA_SS: %d" CR), LORA_SS);
+  THEENGS_LOG_NOTICE(F("LORA_RST: %d" CR), LORA_RST);
+  THEENGS_LOG_NOTICE(F("LORA_DI0: %d" CR), LORA_DI0);
+  THEENGS_LOG_TRACE(F("gatewayLORA setup done" CR));
 }
 
-void LORAtoMQTT() {
+void LORAtoX() {
   int packetSize = LoRa.parsePacket();
   if (packetSize) {
     StaticJsonDocument<JSON_MSG_BUFFER> LORAdataBuffer;
     JsonObject LORAdata = LORAdataBuffer.to<JsonObject>();
-    Log.trace(F("Rcv. LORA" CR));
+    THEENGS_LOG_TRACE(F("Rcv. LORA" CR));
 #  ifdef ESP32
     String taskMessage = "LORA Task running on core ";
     taskMessage = taskMessage + xPortGetCoreID();
@@ -412,15 +452,15 @@ void LORAtoMQTT() {
     packet[packetSize] = 0;
     uint8_t deviceId = _determineDevice(packet, packetSize);
     if (deviceId == WIPHONE) {
-      _WiPhoneToMQTT(packet, LORAdata);
+      _WiPhonetoX(packet, LORAdata);
     } else if (binary) {
       if (LORAConfig.onlyKnown) {
-        Log.trace(F("Ignoring non identifiable packet" CR));
+        THEENGS_LOG_TRACE(F("Ignoring non identifiable packet" CR));
         return;
       }
       // We have non-ascii data: create hex string of the data
-      char hex[packetSize * 2 + 1];
-      _rawToHex(packet, hex, packetSize);
+      char hex[packetSize * 2 + 2]; // _rawToHex writes "%02X\r" per byte: needs 2 * size + 2
+      TheengsUtils::_rawToHex(packet, hex, packetSize);
       // Terminate with a null character
       hex[packetSize * 2] = 0;
 
@@ -430,11 +470,11 @@ void LORAtoMQTT() {
       std::string packetStrStd = (char*)packet;
       auto result = deserializeJson(LORAdataBuffer, packetStrStd);
       if (result) {
-        Log.notice(F("LORA packet deserialization failed, not a json, sending raw message" CR));
+        THEENGS_LOG_NOTICE(F("LORA packet deserialization failed, not a json, sending raw message" CR));
         LORAdata = LORAdataBuffer.to<JsonObject>();
         LORAdata["message"] = (char*)packet;
       } else {
-        Log.trace(F("LORA packet deserialization OK" CR));
+        THEENGS_LOG_TRACE(F("LORA packet deserialization OK" CR));
       }
     }
 
@@ -458,22 +498,23 @@ void LORAtoMQTT() {
       LORAdataBuffer["origin"] = subjectLORAtoMQTT;
     }
 
-    handleJsonEnqueue(LORAdata);
+    enqueueJsonObject(LORAdata);
     if (repeatLORAwMQTT) {
-      Log.trace(F("Pub LORA for rpt" CR));
+      THEENGS_LOG_TRACE(F("Pub LORA for rpt" CR));
       LORAdata["origin"] = subjectMQTTtoLORA;
-      handleJsonEnqueue(LORAdata);
+      enqueueJsonObject(LORAdata);
     }
   }
 }
 
 #  if jsonReceiving
-void MQTTtoLORA(char* topicOri, JsonObject& LORAdata) { // json object decoding
+void XtoLORA(const char* topicOri, JsonObject& LORAdata) { // json object decoding
   if (cmpToMainTopic(topicOri, subjectMQTTtoLORA)) {
-    Log.trace(F("MQTTtoLORA json" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoLORA json" CR));
     const char* message = LORAdata["message"];
     const char* hex = LORAdata["hex"];
     LORAConfig_fromJson(LORAdata);
+    LORAConfig_apply();
     if (message || hex) {
       LoRa.beginPacket();
       uint8_t deviceId = _determineDevice(LORAdata);
@@ -482,7 +523,7 @@ void MQTTtoLORA(char* topicOri, JsonObject& LORAdata) { // json object decoding
       } else if (hex) {
         // We have hex data: create convert to binary
         byte raw[strlen(hex) / 2];
-        _hexToRaw(hex, raw, sizeof(raw));
+        TheengsUtils::_hexToRaw(hex, raw, sizeof(raw));
         LoRa.write((uint8_t*)raw, sizeof(raw));
       } else {
         // ascii payload
@@ -490,15 +531,16 @@ void MQTTtoLORA(char* topicOri, JsonObject& LORAdata) { // json object decoding
       }
 
       LoRa.endPacket();
-      Log.trace(F("MQTTtoLORA OK" CR));
+      THEENGS_LOG_TRACE(F("MQTTtoLORA OK" CR));
       // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
-      pub(subjectGTWLORAtoMQTT, LORAdata);
+      LORAdata["origin"] = subjectGTWLORAtoMQTT;
+      enqueueJsonObject(LORAdata);
     } else {
-      Log.error(F("MQTTtoLORA Fail json" CR));
+      THEENGS_LOG_ERROR(F("MQTTtoLORA Fail json" CR));
     }
   }
   if (cmpToMainTopic(topicOri, subjectMQTTtoLORAset)) {
-    Log.trace(F("MQTTtoLORA json set" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoLORA json set" CR));
     /*
      * Configuration modifications priorities:
      *  First `init=true` and `load=true` commands are executed (if both are present, INIT prevails on LOAD)
@@ -515,17 +557,18 @@ void MQTTtoLORA(char* topicOri, JsonObject& LORAdata) { // json object decoding
 
     // Load config from json if available
     LORAConfig_fromJson(LORAdata);
+    LORAConfig_apply();
     stateLORAMeasures();
   }
 }
 #  endif
 #  if simpleReceiving
-void MQTTtoLORA(char* topicOri, char* LORAarray) { // json object decoding
+void XtoLORA(const char* topicOri, const char* LORAarray) { // json object decoding
   if (cmpToMainTopic(topicOri, subjectMQTTtoLORA)) {
     LoRa.beginPacket();
     LoRa.print(LORAarray);
     LoRa.endPacket();
-    Log.notice(F("MQTTtoLORA OK" CR));
+    THEENGS_LOG_NOTICE(F("MQTTtoLORA OK" CR));
     // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
     pub(subjectGTWLORAtoMQTT, LORAarray);
   }
@@ -541,15 +584,18 @@ String stateLORAMeasures() {
   LORAdata["signalbandwidth"] = LORAConfig.signalBandwidth;
   LORAdata["codingrate"] = LORAConfig.codingRateDenominator;
   LORAdata["preamblelength"] = LORAConfig.preambleLength;
-  // Convert syncWord to a hexadecimal string and store it in the JSON
-  char syncWordHex[5]; // Enough space for 0xXX and null terminator
-  snprintf(syncWordHex, sizeof(syncWordHex), "0x%02X", LORAConfig.syncWord);
-  LORAdata["syncword"] = syncWordHex;
+  if (LORAConfig.syncWord < 0 || LORAConfig.syncWord > 255) {
+    THEENGS_LOG_ERROR(F("Invalid syncWord value: %d" CR), LORAConfig.syncWord);
+  } else {
+    char syncWordHex[5];
+    snprintf(syncWordHex, sizeof(syncWordHex), "0x%02X", LORAConfig.syncWord);
+    LORAdata["syncword"] = syncWordHex;
+  }
   LORAdata["enablecrc"] = LORAConfig.crc;
   LORAdata["invertiq"] = LORAConfig.invertIQ;
   LORAdata["onlyknown"] = LORAConfig.onlyKnown;
-
-  pub(subjectGTWLORAtoMQTT, LORAdata);
+  LORAdata["origin"] = subjectGTWLORAtoMQTT;
+  enqueueJsonObject(LORAdata);
 
   String output;
   serializeJson(LORAdata, output);
diff --git a/main/ZgatewayPilight.ino b/main/gatewayPilight.cpp
similarity index 62%
rename from main/ZgatewayPilight.ino
rename to main/gatewayPilight.cpp
index eb2b841..50fcbc1 100644
--- a/main/ZgatewayPilight.ino
+++ b/main/gatewayPilight.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
   This gateway enables to:
@@ -28,6 +28,15 @@
 #include "User_config.h"
 
 #ifdef ZgatewayPilight
+#  include "TheengsCommon.h"
+
+#  if defined(ESP32)
+#    include <SPIFFS.h>
+#  else
+#    include <FS.h>
+#  endif
+
+#  include "config_RF.h"
 
 #  ifdef ZradioCC1101
 #    include <ELECHOUSE_CC1101_SRC_DRV.h>
@@ -35,57 +44,63 @@
 
 #  include <ESPiLight.h>
 ESPiLight rf(RF_EMITTER_GPIO); // use -1 to disable transmitter
-
+extern int currentReceiver;
 #  ifdef Pilight_rawEnabled
 // raw output support
 bool pilightRawEnabled = 0;
 #  endif
 
+void disableCurrentReceiver();
+void initCC1101();
+void enableActiveReceiver();
+
 void pilightCallback(const String& protocol, const String& message, int status,
                      size_t repeats, const String& deviceID) {
   if (status == VALID) {
-    Log.trace(F("Creating RF PiLight buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating RF PiLight buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> RFPiLightdataBuffer;
     JsonObject RFPiLightdata = RFPiLightdataBuffer.to<JsonObject>();
     StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer2;
     JsonObject msg = jsonBuffer2.to<JsonObject>();
+
     if (message.length() > 0) {
       auto error = deserializeJson(jsonBuffer2, message);
       if (error) {
-        Log.error(F("deserializeJson() failed: %s" CR), error.c_str());
+        THEENGS_LOG_ERROR(F("deserializeJson() failed: %s" CR), error.c_str());
         return;
       }
       RFPiLightdata["message"] = msg;
     }
+
     if (protocol.length() > 0) {
       RFPiLightdata["protocol"] = protocol;
     }
-    if (deviceID.length() > 0) {
-      RFPiLightdata["value"] = deviceID;
-      const char* device_id = deviceID.c_str();
-      if (!strlen(device_id) && !msg.isNull()) {
-        // deviceID returned from Pilight is only extracted from id field
-        // but some device may use another name as unique identifier
-        char* choices[] = {"key", "unit", "device_id", "systemcode", "unitcode", "programcode"};
 
-        for (uint8_t i = 0; i < 6; i++) {
-          if (msg[choices[i]]) {
-            device_id = (const char*)msg[choices[i]];
-            break;
-          }
+    if (deviceID.length() > 0) {
+      // If deviceID is non-empty, use it directly for value
+      RFPiLightdata["value"] = deviceID;
+    } else if (!msg.isNull()) {
+      // deviceID returned from Pilight is only extracted from id field
+      // but some device may use another name as unique identifier
+      char* choices[] = {"key", "unit", "device_id", "systemcode", "unitcode", "programcode"};
+
+      for (uint8_t i = 0; i < 6; i++) {
+        if (msg.containsKey(choices[i])) {
+          // Set value directly from msg; supports both strings and integers
+          RFPiLightdata["value"] = msg[choices[i]];
+          break;
         }
       }
-      RFPiLightdata["value"] = device_id;
     }
 
     RFPiLightdata["repeats"] = (int)repeats;
     RFPiLightdata["status"] = (int)status;
     RFPiLightdata["origin"] = subjectPilighttoMQTT;
-    handleJsonEnqueue(RFPiLightdata);
+    enqueueJsonObject(RFPiLightdata);
     if (repeatPilightwMQTT) {
-      Log.trace(F("Pub Pilight for rpt" CR));
+      THEENGS_LOG_TRACE(F("Pub Pilight for rpt" CR));
       RFPiLightdata["origin"] = subjectMQTTtoPilight;
-      handleJsonEnqueue(RFPiLightdata);
+      enqueueJsonObject(RFPiLightdata);
     }
   }
 }
@@ -95,7 +110,7 @@ void pilightRawCallback(const uint16_t* pulses, size_t length) {
   uint16_t pulse;
 
   if (!pilightRawEnabled) {
-    Log.trace(F("Pilight RAW not enabled" CR));
+    THEENGS_LOG_TRACE(F("Pilight RAW not enabled" CR));
     return;
   }
 
@@ -108,18 +123,18 @@ void pilightRawCallback(const uint16_t* pulses, size_t length) {
 
   // Enqueue data
   RFPiLightdata["origin"] = subjectPilighttoMQTT;
-  handleJsonEnqueue(RFPiLightdata);
+  enqueueJsonObject(RFPiLightdata);
 }
 #  endif
 
 void savePilightConfig() {
-  Log.trace(F("saving Pilight config" CR));
+  THEENGS_LOG_TRACE(F("saving Pilight config" CR));
   DynamicJsonDocument json(4096);
   deserializeJson(json, rf.enabledProtocols());
 
   File configFile = SPIFFS.open("/pilight.json", "w");
   if (!configFile) {
-    Log.error(F("failed to open config file for writing" CR));
+    THEENGS_LOG_ERROR(F("failed to open config file for writing" CR));
   }
 
   serializeJsonPretty(json, Serial);
@@ -128,14 +143,14 @@ void savePilightConfig() {
 }
 
 void loadPilightConfig() {
-  Log.trace(F("reading Pilight config file" CR));
+  THEENGS_LOG_TRACE(F("reading Pilight config file" CR));
   File configFile = SPIFFS.open("/pilight.json", "r");
   if (configFile) {
-    Log.trace(F("opened Pilight config file" CR));
+    THEENGS_LOG_TRACE(F("opened Pilight config file" CR));
     DynamicJsonDocument json(configFile.size() * 4);
     auto error = deserializeJson(json, configFile);
     if (error) {
-      Log.error(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
+      THEENGS_LOG_ERROR(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
     }
     serializeJson(json, Serial);
     if (!json.isNull()) {
@@ -143,17 +158,17 @@ void loadPilightConfig() {
       serializeJson(json, rflimit);
       rf.limitProtocols(rflimit);
     } else {
-      Log.warning(F("failed to load json config" CR));
+      THEENGS_LOG_WARNING(F("failed to load json config" CR));
     }
     configFile.close();
   }
 }
 
-void PilighttoMQTT() {
+void PilighttoX() {
   rf.loop();
 }
 
-void MQTTtoPilight(char* topicOri, JsonObject& Pilightdata) {
+void XtoPilight(const char* topicOri, JsonObject& Pilightdata) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoPilightProtocol)) {
     bool success = false;
     if (Pilightdata.containsKey("reset")) {
@@ -169,44 +184,47 @@ void MQTTtoPilight(char* topicOri, JsonObject& Pilightdata) {
       success = true;
     }
     if (Pilightdata.containsKey("enabled")) {
-      Log.notice(F("PiLight protocols enabled: %s" CR), rf.enabledProtocols().c_str());
+      THEENGS_LOG_NOTICE(F("PiLight protocols enabled: %s" CR), rf.enabledProtocols().c_str());
       success = true;
     }
     if (Pilightdata.containsKey("available")) {
-      Log.notice(F("PiLight protocols available: %s" CR), rf.availableProtocols().c_str());
+      THEENGS_LOG_NOTICE(F("PiLight protocols available: %s" CR), rf.availableProtocols().c_str());
       success = true;
     }
 #  ifdef Pilight_rawEnabled
     if (Pilightdata.containsKey("rawEnabled")) {
-      Log.notice(F("Setting PiLight raw output enabled: %T" CR), (bool)Pilightdata["rawEnabled"]);
+      THEENGS_LOG_NOTICE(F("Setting PiLight raw output enabled: %T" CR), (bool)Pilightdata["rawEnabled"]);
       pilightRawEnabled = (bool)Pilightdata["rawEnabled"];
-      disablePilightReceive();
-      delay(1);
-      enablePilightReceive();
-      success = true;
+      if (currentReceiver == ACTIVE_PILIGHT) {
+        disablePilightReceive();
+        delay(1);
+        enablePilightReceive();
+        success = true;
+      }
     }
 #  endif
 
     if (success) {
       // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
-      pub(subjectGTWPilighttoMQTT, Pilightdata);
+      Pilightdata["origin"] = subjectGTWPilighttoMQTT;
+      enqueueJsonObject(Pilightdata);
     } else {
       pub(subjectGTWPilighttoMQTT, "{\"Status\": \"Error\"}"); // Fail feedback
-      Log.error(F("MQTTtoPilightProtocol Fail json" CR));
+      THEENGS_LOG_ERROR(F("MQTTtoPilightProtocol Fail json" CR));
     }
   } else if (cmpToMainTopic(topicOri, subjectMQTTtoPilight)) {
     const char* message = Pilightdata["message"];
-    Log.notice(F("MQTTtoPilight message: %s" CR), message);
+    THEENGS_LOG_NOTICE(F("MQTTtoPilight message: %s" CR), message);
     const char* protocol = Pilightdata["protocol"];
-    Log.notice(F("MQTTtoPilight protocol: %s" CR), protocol);
+    THEENGS_LOG_NOTICE(F("MQTTtoPilight protocol: %s" CR), protocol);
     const char* raw = Pilightdata["raw"];
-    float txFrequency = Pilightdata["frequency"] | RFConfig.frequency;
+    float txFrequency = Pilightdata["frequency"] | iRFConfig.getFrequency();
     bool success = false;
     disableCurrentReceiver();
     initCC1101();
 #  ifdef ZradioCC1101 // set Receive off and Transmitt on
     ELECHOUSE_cc1101.SetTx(txFrequency);
-    Log.notice(F("Transmit frequency: %F" CR), txFrequency);
+    THEENGS_LOG_NOTICE(F("Transmit frequency: %F" CR), txFrequency);
 #  endif
     pinMode(RF_EMITTER_GPIO, OUTPUT);
     if (raw) {
@@ -215,10 +233,10 @@ void MQTTtoPilight(char* topicOri, JsonObject& Pilightdata) {
       if (repeats < 0) {
         switch (repeats) {
           case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_R:
-            Log.trace(F("'r' not found in string, or has no data" CR));
+            THEENGS_LOG_TRACE(F("'r' not found in string, or has no data" CR));
             break;
           case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_END:
-            Log.trace(F("';' or '@' not found in data string" CR));
+            THEENGS_LOG_TRACE(F("';' or '@' not found in data string" CR));
             break;
         }
         repeats = 10;
@@ -226,73 +244,73 @@ void MQTTtoPilight(char* topicOri, JsonObject& Pilightdata) {
       int msgLength = rf.stringToPulseTrain(raw, codes, MAXPULSESTREAMLENGTH);
       if (msgLength > 0) {
         rf.sendPulseTrain(codes, msgLength, repeats);
-        Log.notice(F("MQTTtoPilight raw ok" CR));
+        THEENGS_LOG_NOTICE(F("MQTTtoPilight raw ok" CR));
         success = true;
       } else {
-        Log.trace(F("MQTTtoPilight raw KO" CR));
+        THEENGS_LOG_TRACE(F("MQTTtoPilight raw KO" CR));
         switch (msgLength) {
           case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_C:
-            Log.trace(F("'c' not found in string, or has no data" CR));
+            THEENGS_LOG_TRACE(F("'c' not found in string, or has no data" CR));
             break;
           case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_P:
-            Log.trace(F("'p' not found in string, or has no data" CR));
+            THEENGS_LOG_TRACE(F("'p' not found in string, or has no data" CR));
             break;
           case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_END:
-            Log.trace(F("';' or '@' not found in data string" CR));
+            THEENGS_LOG_TRACE(F("';' or '@' not found in data string" CR));
             break;
           case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_TYPE:
-            Log.trace(F("pulse type not defined" CR));
+            THEENGS_LOG_TRACE(F("pulse type not defined" CR));
             break;
         }
-        Log.error(F("Invalid JSON: raw data malformed" CR));
+        THEENGS_LOG_ERROR(F("Invalid JSON: raw data malformed" CR));
       }
     }
     if (message && protocol) {
-      Log.trace(F("MQTTtoPilight msg & protocol ok" CR));
+      THEENGS_LOG_TRACE(F("MQTTtoPilight msg & protocol ok" CR));
       int msgLength = rf.send(protocol, message);
       if (msgLength > 0) {
-        Log.trace(F("Adv data MQTTtoPilight push state via PilighttoMQTT" CR));
+        THEENGS_LOG_TRACE(F("Adv data XtoPilight push state via PilighttoMQTT" CR));
         // Acknowledgement
         pub(subjectGTWPilighttoMQTT, message);
         success = true;
       } else {
         switch (msgLength) {
           case ESPiLight::ERROR_UNAVAILABLE_PROTOCOL:
-            Log.error(F("protocol is not available" CR));
+            THEENGS_LOG_ERROR(F("protocol is not available" CR));
             break;
           case ESPiLight::ERROR_INVALID_PILIGHT_MSG:
-            Log.error(F("message is invalid" CR));
+            THEENGS_LOG_ERROR(F("message is invalid" CR));
             break;
           case ESPiLight::ERROR_INVALID_JSON:
-            Log.error(F("message is not a proper json object" CR));
+            THEENGS_LOG_ERROR(F("message is not a proper json object" CR));
             break;
           case ESPiLight::ERROR_NO_OUTPUT_PIN:
-            Log.error(F("no transmitter pin" CR));
+            THEENGS_LOG_ERROR(F("no transmitter pin" CR));
             break;
           default:
-            Log.error(F("Invalid JSON: can't read message/protocol" CR));
+            THEENGS_LOG_ERROR(F("Invalid JSON: can't read message/protocol" CR));
         }
       }
     }
     if (!success) {
       pub(subjectGTWPilighttoMQTT, "{\"Status\": \"Error\"}"); // Fail feedback
-      Log.error(F("MQTTtoPilight Fail json" CR));
+      THEENGS_LOG_ERROR(F("MQTTtoPilight Fail json" CR));
     }
     enableActiveReceiver();
   }
 }
 
 extern void disablePilightReceive() {
-  Log.trace(F("disablePilightReceive" CR));
+  THEENGS_LOG_TRACE(F("disablePilightReceive" CR));
   rf.initReceiver(-1);
   rf.disableReceiver();
 };
 
 extern void enablePilightReceive() {
-  Log.notice(F("Switching to Pilight Receiver: %F" CR), RFConfig.frequency);
-  Log.notice(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
-  Log.notice(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);
-  Log.trace(F("ZgatewayPilight command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoPilight);
+  THEENGS_LOG_NOTICE(F("Switching to Pilight Receiver: %F" CR), iRFConfig.getFrequency());
+  THEENGS_LOG_NOTICE(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
+  THEENGS_LOG_NOTICE(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);
+  THEENGS_LOG_TRACE(F("gatewayPilight command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoPilight);
 
   initCC1101();
 
@@ -306,6 +324,6 @@ extern void enablePilightReceive() {
   pinMode(RF_EMITTER_GPIO, OUTPUT); // Set this here, because if this is the RX pin it was reset to INPUT by Serial.end();
   rf.enableReceiver();
   loadPilightConfig();
-  Log.trace(F("ZgatewayPilight setup done " CR));
+  THEENGS_LOG_TRACE(F("gatewayPilight setup done " CR));
 };
 #endif
diff --git a/main/gatewayRF.cpp b/main/gatewayRF.cpp
new file mode 100644
index 0000000..87b5a8e
--- /dev/null
+++ b/main/gatewayRF.cpp
@@ -0,0 +1,419 @@
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
+   Send and receiving command by MQTT
+
+  This gateway enables to:
+ - receive MQTT data from a topic and send RF 433Mhz signal corresponding to the received MQTT data
+ - publish MQTT data to a different topic related to received 433Mhz signal
+
+    Copyright: (c)Florian ROBERT
+
+    This file is part of OpenMQTTGateway.
+
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+#include "User_config.h"
+
+#ifdef ZgatewayRF
+#  include "TheengsCommon.h"
+#  include "config_RF.h"
+
+#  ifdef ZradioCC1101
+#    include <ELECHOUSE_CC1101_SRC_DRV.h>
+extern void initCC1101();
+#  endif
+
+#  include <RCSwitch.h> // library for controling Radio frequency switch
+
+void disableCurrentReceiver();
+void enableActiveReceiver();
+
+RCSwitch mySwitch = RCSwitch();
+
+/**
+ * @brief Converts a binary string to a tristate string.
+ *
+ * This function takes a binary string as input and converts it to a tristate string.
+ * The tristate string is composed of '0', '1', and 'F' characters, where:
+ * - '0' represents "00" in the binary string
+ * - '1' represents "11" in the binary string
+ * - 'F' represents "01" in the binary string
+ *
+ * If the input binary string contains any other combination, the function returns "-".
+ *
+ * @note CONVERSION function from https://github.com/sui77/rc-switch/tree/master/examples/ReceiveDemo_Advanced
+ *
+ * @param bin The input binary string.
+ * @return A pointer to the tristate string.
+ */
+static const char* bin2tristate(const char* bin) {
+  static char returnValue[50];
+  int pos = 0;
+  int pos2 = 0;
+  while (bin[pos] != '\0' && bin[pos + 1] != '\0') {
+    if (bin[pos] == '0' && bin[pos + 1] == '0') {
+      returnValue[pos2] = '0';
+    } else if (bin[pos] == '1' && bin[pos + 1] == '1') {
+      returnValue[pos2] = '1';
+    } else if (bin[pos] == '0' && bin[pos + 1] == '1') {
+      returnValue[pos2] = 'F';
+    } else {
+      return "-";
+    }
+    pos = pos + 2;
+    pos2++;
+  }
+  returnValue[pos2] = '\0';
+  return returnValue;
+}
+
+/**
+ * @brief Converts a decimal number to a binary string with zero fill.
+ *
+ * This function takes an unsigned long decimal number and converts it to a binary string
+ * representation, ensuring that the resulting string is zero-padded to the specified bit length.
+ *
+ * @param Dec The decimal number to be converted.
+ * @param bitLength The length of the resulting binary string, including leading zeros.
+ * @return A pointer to a static character array containing the binary string representation.
+ *
+ * @note The returned string is stored in a static buffer, so it will be overwritten by subsequent
+ * calls to this function. The buffer size is fixed at 64 characters.
+ *
+ * @note CONVERSION function from https://github.com/sui77/rc-switch/tree/master/examples/ReceiveDemo_Advanced
+ *
+ */
+static char* dec2binWzerofill(unsigned long Dec, unsigned int bitLength) {
+  static char bin[64];
+  unsigned int i = 0;
+
+  while (Dec > 0) {
+    bin[32 + i++] = ((Dec & 1) > 0) ? '1' : '0';
+    Dec = Dec >> 1;
+  }
+
+  for (unsigned int j = 0; j < bitLength; j++) {
+    if (j >= bitLength - i) {
+      bin[j] = bin[31 + i - (j - (bitLength - i))];
+    } else {
+      bin[j] = '0';
+    }
+  }
+  bin[bitLength] = '\0';
+
+  return bin;
+}
+
+#  if defined(ZmqttDiscovery) && defined(RF_on_HAS_as_DeviceTrigger)
+/**
+ * @brief Announces RF signal data to Home Assistant via MQTT for device trigger configuration.
+ *
+ * This function creates and publishes a Home Assistant configuration message
+ * for an RF signal received by the gateway. It constructs the necessary
+ * MQTT topic and payload to announce the RF signal as a device trigger
+ * in Home Assistant, allowing it to be used as an automation trigger.
+ *
+ * @param MQTTvalue The RF signal value to be published to MQTT.
+ */
+void announceGatewayTriggerTypeToHASS(uint64_t MQTTvalue) {
+  char val[11];
+  sprintf(val, "%lu", MQTTvalue);
+  String iSignal = String(val);
+#    if valueAsATopic
+  String discovery_topic = String(subjectRFtoMQTT) + "/" + iSignal;
+#    else
+  String discovery_topic = String(subjectRFtoMQTT);
+#    endif
+  THEENGS_LOG_TRACE(F("[RF] Entity Discovered, create HA Discovery CFG" CR));
+  announceGatewayTrigger(
+      discovery_topic.c_str(), // topic
+      "Received", // type
+      String("RF-" + iSignal).c_str(), // subtype
+      iSignal.c_str(), //signal id
+      "{{trigger.value.raw}}" // value template
+  );
+}
+#  endif
+
+/**
+ * @brief Processes received RF signals and converts them to JSON format for further handling.
+ *
+ * This function checks if an RF signal is available, extracts relevant data from the signal,
+ * and stores it in a JSON object. It also handles duplicate signal detection and optionally
+ * publishes the signal data for MQTT discovery and repetition.
+ *
+ * @note This function is designed to work with both ESP32 and ESP8266 platforms.
+ *
+ * @details The function performs the following steps:
+ * - Checks if an RF signal is available.
+ * - Logs the reception of the RF signal.
+ * - Extracts the value, protocol, length, delay, tristate, and binary representation of the signal.
+ * - For ESP32 and ESP8266, extracts the raw data of the signal.
+ * - If the ZradioCC1101 is defined, includes the frequency in the JSON object.
+ * - Resets the availability status of the RF signal.
+ * - Checks for duplicate signals and processes the signal if it is not a duplicate.
+ * - Optionally publishes the signal data for MQTT discovery and repetition.
+ *
+ * @param None
+ * @return void
+ */
+void RFtoX() {
+  if (mySwitch.available()) {
+    StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
+    JsonObject RFdata = RFdataBuffer.to<JsonObject>();
+#  ifdef ESP32
+    THEENGS_LOG_TRACE(F("[RF] Rcv. RF - Task running on core :%d" CR), xPortGetCoreID());
+#  else
+    THEENGS_LOG_TRACE(F("[RF] Rcv. RF" CR));
+#  endif
+    uint64_t MQTTvalue = mySwitch.getReceivedValue();
+    int length = mySwitch.getReceivedBitlength();
+    const char* binary = dec2binWzerofill(MQTTvalue, length);
+
+    RFdata["value"] = (uint64_t)MQTTvalue;
+    RFdata["protocol"] = (int)mySwitch.getReceivedProtocol();
+    RFdata["length"] = (int)mySwitch.getReceivedBitlength();
+    RFdata["delay"] = (int)mySwitch.getReceivedDelay();
+    RFdata["tre_state"] = bin2tristate(binary);
+    RFdata["binary"] = binary;
+
+#  if defined(ESP32) || defined(ESP8266)
+    unsigned int* raw = mySwitch.getReceivedRawdata();
+    std::string rawDump;
+    for (unsigned int i = 0; i < length * 2; i++) {
+      if (i != 0)
+        rawDump += ",";
+      rawDump += std::to_string(raw[i]);
+    }
+    RFdata["raw"] = rawDump;
+#  endif
+
+#  ifdef ZradioCC1101 // set Receive off and Transmitt on
+    RFdata["frequency"] = iRFConfig.getFrequency();
+#  endif
+
+    mySwitch.resetAvailable();
+
+    if (MQTTvalue != 0 && !isAduplicateSignal(MQTTvalue)) { // conditions to avoid duplications of RF -->MQTT
+#  if defined(ZmqttDiscovery) && defined(RF_on_HAS_as_DeviceTrigger)
+      if (SYSConfig.discovery)
+        announceGatewayTriggerTypeToHASS(MQTTvalue);
+#  endif
+      RFdata["origin"] = subjectRFtoMQTT;
+      enqueueJsonObject(RFdata);
+      // Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
+      THEENGS_LOG_TRACE(F("[RF] Store val: %u" CR), (unsigned long)MQTTvalue);
+      storeSignalValue(MQTTvalue);
+      if (repeatRFwMQTT) {
+        THEENGS_LOG_TRACE(F("[RF] Pub RF for rpt" CR));
+        RFdata["origin"] = subjectMQTTtoRF;
+        enqueueJsonObject(RFdata);
+      }
+    } else {
+      THEENGS_LOG_TRACE(F("[RF] RF signal received but already managed" CR));
+    }
+  }
+  // else {
+  //    No RF signal received
+  // }
+}
+
+#  if simpleReceiving // FALSE MEAN you don't want to use old way reception analysis
+/**
+ * @brief Transmits RF signals based on the provided MQTT topic and data.
+ *
+ * This function processes the MQTT topic and data to determine the RF protocol,
+ * pulse length, and number of bits to use for transmission. It then transmits
+ * the RF signal using the specified parameters. If no specific parameters are
+ * provided, default values are used.
+ *
+ * @param topicOri The original MQTT topic string.
+ * @param datacallback The data to be transmitted, provided as a string.
+ *
+ * The function performs the following steps:
+ * 1. Disables the current RF receiver and enables the transmitter if ZradioCC1101 is defined.
+ * 2. Converts the data string to a 64-bit unsigned integer.
+ * 3. Analyzes the topic string to extract RF protocol, pulse length, and bit count.
+ * 4. Transmits the RF signal using the extracted or default parameters.
+ * 5. Publishes an acknowledgment to the GTWRF topic.
+ * 6. Re-enables the RF receiver and disables the transmitter if ZradioCC1101 is defined.
+ */
+void XtoRF(const char* topicOri, const char* datacallback) {
+#    ifdef ZradioCC1101 // set Receive off and Transmitt on
+  disableCurrentReceiver();
+  ELECHOUSE_cc1101.SetTx(iRFConfig.getFrequency());
+  THEENGS_LOG_NOTICE(F("[RF] Transmit frequency: %F" CR), iRFConfig.getFrequency());
+#    endif
+  mySwitch.disableReceive();
+  mySwitch.enableTransmit(RF_EMITTER_GPIO);
+  uint64_t data = strtoull(datacallback, NULL, 10); // we will not be able to pass values > 4294967295 on Arduino boards
+
+  // RF DATA ANALYSIS
+  //We look into the subject to see if a special RF protocol is defined
+  String topic = topicOri;
+  int valuePRT = 0;
+  int valuePLSL = 0;
+  int valueBITS = 0;
+  int pos = topic.lastIndexOf(RFprotocolKey);
+  if (pos != -1) {
+    pos = pos + +strlen(RFprotocolKey);
+    valuePRT = (topic.substring(pos, pos + 1)).toInt();
+  }
+  //We look into the subject to see if a special RF pulselength is defined
+  int pos2 = topic.lastIndexOf(RFpulselengthKey);
+  if (pos2 != -1) {
+    pos2 = pos2 + strlen(RFpulselengthKey);
+    valuePLSL = (topic.substring(pos2, pos2 + 3)).toInt();
+  }
+  int pos3 = topic.lastIndexOf(RFbitsKey);
+  if (pos3 != -1) {
+    pos3 = pos3 + strlen(RFbitsKey);
+    valueBITS = (topic.substring(pos3, pos3 + 2)).toInt();
+  }
+
+  if ((cmpToMainTopic(topicOri, subjectMQTTtoRF)) && (valuePRT == 0) && (valuePLSL == 0) && (valueBITS == 0)) {
+    THEENGS_LOG_TRACE(F("[RF] MQTTtoRF dflt" CR));
+    mySwitch.setProtocol(1, 350);
+    mySwitch.send(data, 24);
+    // Acknowledgement to the GTWRF topic
+    pub(subjectGTWRFtoMQTT, datacallback);
+  } else if ((valuePRT != 0) || (valuePLSL != 0) || (valueBITS != 0)) {
+    THEENGS_LOG_TRACE(F("[RF] MQTTtoRF usr par." CR));
+    if (valuePRT == 0)
+      valuePRT = 1;
+    if (valuePLSL == 0)
+      valuePLSL = 350;
+    if (valueBITS == 0)
+      valueBITS = 24;
+    THEENGS_LOG_NOTICE(F("[RF] Protocol: %d, Pulse Lgth: %d, Bits nb: %d" CR), valuePRT, valuePLSL, valueBITS);
+    mySwitch.setProtocol(valuePRT, valuePLSL);
+    mySwitch.send(data, valueBITS);
+    // Acknowledgement to the GTWRF topic
+    pub(subjectGTWRFtoMQTT, datacallback); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
+  }
+#    ifdef ZradioCC1101 // set Receive on and Transmitt off
+  ELECHOUSE_cc1101.SetRx(iRFConfig.getFrequency());
+  mySwitch.disableTransmit();
+  mySwitch.enableReceive(RF_RECEIVER_GPIO);
+#    endif
+}
+#  endif
+
+#  if jsonReceiving // FALSE MEAN you don't want to use Json  reception analysis
+/**
+ * @brief Handles the conversion of MQTT messages to RF signals.
+ *
+ * This function decodes a JSON object received via MQTT and transmits the corresponding RF signal.
+ * It supports different RF protocols and configurations.
+ *
+ * @param topicOri The original MQTT topic.
+ * @param RFdata The JSON object containing RF data to be transmitted.
+ *
+ * The JSON object should contain the following fields:
+ * - "value": The RF signal value to be transmitted (required).
+ * - "protocol": The RF protocol to be used (optional, default is 1).
+ * - "delay": The pulse length in microseconds (optional, default is 350).
+ * - "length": The number of bits in the RF signal (optional, default is 24).
+ * - "repeat": The number of times the RF signal should be repeated (optional, default is RF_EMITTER_REPEAT).
+ * - "txpower": The transmission power for CC1101 (optional, default is RF_CC1101_TXPOWER).
+ * - "frequency": The transmission frequency for CC1101 (optional, default is iRFConfig.getFrequency()).
+ *
+ * The function logs the transmission details and acknowledges the sending by publishing the value to an acknowledgement topic.
+ * It also restores the default repeat transmit value after sending the signal.
+ */
+void XtoRF(const char* topicOri, JsonObject& RFdata) {
+  if (cmpToMainTopic(topicOri, subjectMQTTtoRF)) {
+    THEENGS_LOG_TRACE(F("[RF] MQTTtoRF json" CR));
+    uint64_t data = RFdata["value"];
+    if (data != 0) {
+      int valuePRT = RFdata["protocol"] | 1;
+      int valuePLSL = RFdata["delay"] | 350;
+      int valueBITS = RFdata["length"] | 24;
+      int valueRPT = RFdata["repeat"] | RF_EMITTER_REPEAT;
+      THEENGS_LOG_NOTICE(F("[RF] Protocol:%d, Pulse Lgth: %d, Bits nb: %d" CR), valuePRT, valuePLSL, valueBITS);
+      disableCurrentReceiver();
+#    ifdef ZradioCC1101
+      initCC1101();
+      int txPower = RFdata["txpower"] | RF_CC1101_TXPOWER;
+      ELECHOUSE_cc1101.setPA((int)txPower);
+      THEENGS_LOG_NOTICE(F("[RF] CC1101 TX Power: %d" CR), txPower);
+      float txFrequency = RFdata["frequency"] | iRFConfig.getFrequency();
+      ELECHOUSE_cc1101.SetTx(txFrequency);
+      THEENGS_LOG_NOTICE(F("[RF] Transmit frequency: %F" CR), txFrequency);
+#    endif
+      mySwitch.enableTransmit(RF_EMITTER_GPIO);
+      mySwitch.setRepeatTransmit(valueRPT);
+      mySwitch.setProtocol(valuePRT, valuePLSL);
+      mySwitch.send(data, valueBITS);
+      THEENGS_LOG_NOTICE(F("[RF] MQTTtoRF OK" CR));
+      // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
+      RFdata["origin"] = subjectGTWRFtoMQTT;
+      enqueueJsonObject(RFdata);
+      mySwitch.setRepeatTransmit(RF_EMITTER_REPEAT); // Restore the default value
+    }
+
+    enableActiveReceiver();
+  }
+}
+#  endif
+
+/**
+ * @brief Disables the RF receiver.
+ *
+ * This function disables the RF receiver by calling the disableReceive method
+ * on the mySwitch object. It also logs a trace message indicating that the RF
+ * receiver has been disabled, along with the GPIO pin number used for the RF
+ * receiver.
+ *
+ * @note THIS SEEMS LIKE A DEAD CODE. THE FUNCTION IS NOT CALLED ANYWHERE.
+ */
+void disableRFReceive() {
+  THEENGS_LOG_TRACE(F("[RF] disable RFReceive %d" CR), RF_RECEIVER_GPIO);
+  mySwitch.disableReceive();
+}
+
+/**
+ * @brief Enables the RF receiver and optionally the RF transmitter.
+ *
+ * This function initializes the RF receiver on the specified GPIO pin and, if not disabled,
+ * initializes the RF transmitter on the specified GPIO pin. It also sets the RF frequency
+ * and logs the configuration details.
+ *
+ * @param rfFrequency The frequency for the RF communication in MHz. Default is iRFConfig.getFrequency().
+ * @param rfReceiverGPIO The GPIO pin number for the RF receiver. Default is RF_RECEIVER_GPIO.
+ * @param rfEmitterGPIO The GPIO pin number for the RF transmitter. Default is RF_EMITTER_GPIO.
+ *
+ * @note If RF_DISABLE_TRANSMIT is defined, the RF transmitter will be disabled.
+ */
+void enableRFReceive(
+    float rfFrequency = iRFConfig.getFrequency(),
+    int rfReceiverGPIO = RF_RECEIVER_GPIO,
+    int rfEmitterGPIO = RF_EMITTER_GPIO) {
+  THEENGS_LOG_NOTICE(F("[RF] Enable RF Receiver: %F Mhz, RF_EMITTER_GPIO: %d, RF_RECEIVER_GPIO: %d" CR), rfFrequency, rfEmitterGPIO, rfReceiverGPIO);
+
+#  ifdef RF_DISABLE_TRANSMIT
+  mySwitch.disableTransmit();
+#  else
+  mySwitch.enableTransmit(rfEmitterGPIO);
+#  endif
+
+  mySwitch.setRepeatTransmit(RF_EMITTER_REPEAT);
+  mySwitch.enableReceive(rfReceiverGPIO);
+
+  THEENGS_LOG_TRACE(F("[RF] Setup command topic: %s%s%s\n Setup done" CR), (const char*)mqtt_topic, (const char*)gateway_name, (const char*)subjectMQTTtoRF);
+}
+
+#endif
diff --git a/main/ZgatewayRF2.ino b/main/gatewayRF2.cpp
similarity index 75%
rename from main/ZgatewayRF2.ino
rename to main/gatewayRF2.cpp
index 843c38b..c8cb070 100644
--- a/main/ZgatewayRF2.ino
+++ b/main/gatewayRF2.cpp
@@ -1,17 +1,17 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
- 
+
   This gateway enables to:
  - publish MQTT data to a different topic related to received 433Mhz signal DIO/new kaku protocol
 
     Copyright: (c)Florian ROBERT
     Copyright: (c)Randy Simons http://randysimons.nl/
-  
+
     This file is part of OpenMQTTGateway.
-    
+
     OpenMQTTGateway 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
@@ -36,14 +36,21 @@ sudo mosquitto_pub -t home/commands/MQTTtoRF2/CODE_8233372/UNIT_0/PERIOD_272 -m/
 #include "User_config.h"
 
 #ifdef ZgatewayRF2
+#  include "TheengsCommon.h"
+#  include "TheengsUtils.h"
+#  include "config_RF.h"
 
 #  ifdef ZradioCC1101
 #    include <ELECHOUSE_CC1101_SRC_DRV.h>
+extern void initCC1101();
 #  endif
 
 #  include <NewRemoteReceiver.h>
 #  include <NewRemoteTransmitter.h>
 
+void disableCurrentReceiver();
+void enableActiveReceiver();
+
 struct RF2rxd {
   unsigned int period;
   unsigned long address;
@@ -56,9 +63,12 @@ struct RF2rxd {
 RF2rxd rf2rd;
 
 #  ifdef ZmqttDiscovery
+#    include "config_mqttDiscovery.h"
+extern String getUniqueId(String name, String sufix);
+
 //Register for autodiscover in Home Assistant
 void RF2toMQTTdiscovery(JsonObject& data) {
-  Log.trace(F("switchRF2Discovery" CR));
+  THEENGS_LOG_TRACE(F("switchRF2Discovery" CR));
   String payloadonstr;
   String payloadoffstr;
 
@@ -85,7 +95,7 @@ void RF2toMQTTdiscovery(JsonObject& data) {
   // component type,name,availability topic,device class,value template,payload
   // on, payload off, unit of measurement
 
-  Log.trace(F("CreateDiscoverySwitch: %s" CR), switchRF[1]);
+  THEENGS_LOG_TRACE(F("CreateDiscoverySwitch: %s" CR), switchRF[1]);
 
   // As RF2 433Mhz switches do not render their state, no state topic should be
   // provided in the discovery. This will cause the switch to be in optimistic
@@ -101,13 +111,13 @@ void RF2toMQTTdiscovery(JsonObject& data) {
 }
 #  endif
 
-void RF2toMQTT() {
+void RF2toX() {
   if (rf2rd.hasNewData) {
     StaticJsonDocument<JSON_MSG_BUFFER> RF2dataBuffer;
     JsonObject RF2data = RF2dataBuffer.to<JsonObject>();
     rf2rd.hasNewData = false;
 
-    Log.trace(F("Rcv. RF2" CR));
+    THEENGS_LOG_TRACE(F("Rcv. RF2" CR));
     RF2data["unit"] = (int)rf2rd.unit;
     RF2data["groupBit"] = (int)rf2rd.groupBit;
     RF2data["period"] = (int)rf2rd.period;
@@ -118,7 +128,7 @@ void RF2toMQTT() {
       RF2toMQTTdiscovery(RF2data);
 #  endif
     RF2data["origin"] = subjectRF2toMQTT;
-    handleJsonEnqueue(RF2data);
+    enqueueJsonObject(RF2data);
   }
 }
 
@@ -132,16 +142,24 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group
 }
 
 #  if simpleReceiving
-void MQTTtoRF2(char* topicOri, char* datacallback) {
-  NewRemoteReceiver::disable();
+void XtoRF2(const char* topicOri, const char* datacallback) {
+  disableCurrentReceiver();
   pinMode(RF_EMITTER_GPIO, OUTPUT);
+#    ifdef ZradioCC1101
   initCC1101();
+  int txPower = RF_CC1101_TXPOWER;
+  ELECHOUSE_cc1101.setPA((int)txPower);
+  THEENGS_LOG_NOTICE(F("[RF] CC1101 TX Power: %d" CR), txPower);
+  float txFrequency = iRFConfig.getFrequency();
+  ELECHOUSE_cc1101.SetTx(txFrequency);
+  THEENGS_LOG_NOTICE(F("[RF] Transmit frequency: %F" CR), txFrequency);
+#    endif
 
   // RF DATA ANALYSIS
   //We look into the subject to see if a special RF protocol is defined
   String topic = topicOri;
   bool boolSWITCHTYPE;
-  boolSWITCHTYPE = to_bool(datacallback);
+  boolSWITCHTYPE = TheengsUtils::to_bool(datacallback);
   bool isDimCommand = false;
 
   long valueCODE = 0;
@@ -154,35 +172,35 @@ void MQTTtoRF2(char* topicOri, char* datacallback) {
   if (pos != -1) {
     pos = pos + +strlen(RF2codeKey);
     valueCODE = (topic.substring(pos, pos + 8)).toInt();
-    Log.notice(F("RF2 code: %l" CR), valueCODE);
+    THEENGS_LOG_NOTICE(F("RF2 code: %l" CR), valueCODE);
   }
   int pos2 = topic.lastIndexOf(RF2periodKey);
   if (pos2 != -1) {
     pos2 = pos2 + strlen(RF2periodKey);
     valuePERIOD = (topic.substring(pos2, pos2 + 3)).toInt();
-    Log.notice(F("RF2 Period: %d" CR), valuePERIOD);
+    THEENGS_LOG_NOTICE(F("RF2 Period: %d" CR), valuePERIOD);
   }
   int pos3 = topic.lastIndexOf(RF2unitKey);
   if (pos3 != -1) {
     pos3 = pos3 + strlen(RF2unitKey);
     valueUNIT = (topic.substring(pos3, topic.indexOf("/", pos3))).toInt();
-    Log.notice(F("Unit: %d" CR), valueUNIT);
+    THEENGS_LOG_NOTICE(F("Unit: %d" CR), valueUNIT);
   }
   int pos4 = topic.lastIndexOf(RF2groupKey);
   if (pos4 != -1) {
     pos4 = pos4 + strlen(RF2groupKey);
     valueGROUP = (topic.substring(pos4, pos4 + 1)).toInt();
-    Log.notice(F("RF2 Group: %d" CR), valueGROUP);
+    THEENGS_LOG_NOTICE(F("RF2 Group: %d" CR), valueGROUP);
   }
   int pos5 = topic.lastIndexOf(RF2dimKey);
   if (pos5 != -1) {
     isDimCommand = true;
     valueDIM = atoi(datacallback);
-    Log.notice(F("RF2 Dim: %d" CR), valueDIM);
+    THEENGS_LOG_NOTICE(F("RF2 Dim: %d" CR), valueDIM);
   }
 
   if ((topic == subjectMQTTtoRF2) || (valueCODE != 0) || (valueUNIT != -1) || (valuePERIOD != 0)) {
-    Log.trace(F("MQTTtoRF2" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoRF2" CR));
     if (valueCODE == 0)
       valueCODE = 8233378;
     if (valueUNIT == -1)
@@ -190,9 +208,9 @@ void MQTTtoRF2(char* topicOri, char* datacallback) {
     if (valuePERIOD == 0)
       valuePERIOD = 272;
     NewRemoteReceiver::disable();
-    Log.trace(F("Creating transmitter" CR));
+    THEENGS_LOG_TRACE(F("Creating transmitter" CR));
     NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_GPIO, valuePERIOD, RF2_EMITTER_REPEAT);
-    Log.trace(F("Sending data" CR));
+    THEENGS_LOG_TRACE(F("Sending data" CR));
     if (valueGROUP) {
       if (isDimCommand) {
         transmitter.sendGroupDim(valueDIM);
@@ -206,7 +224,7 @@ void MQTTtoRF2(char* topicOri, char* datacallback) {
         transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
       }
     }
-    Log.trace(F("Data sent" CR));
+    THEENGS_LOG_TRACE(F("Data sent" CR));
     NewRemoteReceiver::enable();
 
     // Publish state change back to MQTT
@@ -224,7 +242,7 @@ void MQTTtoRF2(char* topicOri, char* datacallback) {
     MQTTswitchType = String(boolSWITCHTYPE);
     MQTTdimLevel = String(valueDIM);
     String MQTTRF2string;
-    Log.trace(F("Adv data MQTTtoRF2 push state via RF2toMQTT" CR));
+    THEENGS_LOG_TRACE(F("Adv data XtoRF2 push state via RF2toMQTT" CR));
     if (isDimCommand) {
       MQTTRF2string = subjectRF2toMQTT + String("/") + RF2codeKey + MQTTAddress + String("/") + RF2unitKey + MQTTunit + String("/") + RF2groupKey + MQTTgroupBit + String("/") + RF2dimKey + String("/") + RF2periodKey + MQTTperiod;
       pub((char*)MQTTRF2string.c_str(), (char*)MQTTdimLevel.c_str());
@@ -234,24 +252,32 @@ void MQTTtoRF2(char* topicOri, char* datacallback) {
     }
   }
 #    ifdef ZradioCC1101
-  ELECHOUSE_cc1101.SetRx(RFConfig.frequency); // set Receive on
-  NewRemoteReceiver::enable();
+  ELECHOUSE_cc1101.SetRx(iRFConfig.getFrequency()); // set Receive on
 #    endif
+  enableActiveReceiver();
 }
 #  endif
 
 #  if jsonReceiving
-void MQTTtoRF2(char* topicOri, JsonObject& RF2data) { // json object decoding
+void XtoRF2(const char* topicOri, JsonObject& RF2data) { // json object decoding
 
   if (cmpToMainTopic(topicOri, subjectMQTTtoRF2)) {
-    Log.trace(F("MQTTtoRF2 json" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoRF2 json" CR));
     int boolSWITCHTYPE = RF2data["switchType"] | 99;
     bool success = false;
     if (boolSWITCHTYPE != 99) {
-      NewRemoteReceiver::disable();
+      disableCurrentReceiver();
       pinMode(RF_EMITTER_GPIO, OUTPUT);
+#    ifdef ZradioCC1101
       initCC1101();
-      Log.trace(F("MQTTtoRF2 switch type ok" CR));
+      int txPower = RF2data["txpower"] | RF_CC1101_TXPOWER;
+      ELECHOUSE_cc1101.setPA((int)txPower);
+      THEENGS_LOG_NOTICE(F("[RF] CC1101 TX Power: %d" CR), txPower);
+      float txFrequency = RF2data["frequency"] | iRFConfig.getFrequency();
+      ELECHOUSE_cc1101.SetTx(txFrequency);
+      THEENGS_LOG_NOTICE(F("[RF] Transmit frequency: %F" CR), txFrequency);
+#    endif
+      THEENGS_LOG_TRACE(F("MQTTtoRF2 switch type ok" CR));
       bool isDimCommand = boolSWITCHTYPE == 2;
       unsigned long valueCODE = RF2data["address"];
       int valueUNIT = RF2data["unit"] | -1;
@@ -259,16 +285,15 @@ void MQTTtoRF2(char* topicOri, JsonObject& RF2data) { // json object decoding
       int valueGROUP = RF2data["group"];
       int valueDIM = RF2data["dim"] | -1;
       if ((valueCODE != 0) || (valueUNIT != -1) || (valuePERIOD != 0)) {
-        Log.trace(F("MQTTtoRF2" CR));
+        THEENGS_LOG_TRACE(F("MQTTtoRF2" CR));
         if (valueCODE == 0)
           valueCODE = 8233378;
         if (valueUNIT == -1)
           valueUNIT = 0;
         if (valuePERIOD == 0)
           valuePERIOD = 272;
-        NewRemoteReceiver::disable();
         NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_GPIO, valuePERIOD, RF2_EMITTER_REPEAT);
-        Log.trace(F("Sending" CR));
+        THEENGS_LOG_TRACE(F("Sending" CR));
         if (valueGROUP) {
           if (isDimCommand) {
             transmitter.sendGroupDim(valueDIM);
@@ -282,20 +307,18 @@ void MQTTtoRF2(char* topicOri, JsonObject& RF2data) { // json object decoding
             transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
           }
         }
-        Log.notice(F("MQTTtoRF2 OK" CR));
-        NewRemoteReceiver::enable();
+        THEENGS_LOG_NOTICE(F("MQTTtoRF2 OK" CR));
 
         success = true;
       }
     }
     if (success) {
       // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
-      pub(subjectRF2toMQTT, RF2data);
+      RF2data["origin"] = subjectRF2toMQTT;
+      enqueueJsonObject(RF2data);
     } else {
-#    ifndef ARDUINO_AVR_UNO // Space issues with the UNO
       pub(subjectGTWRF2toMQTT, "{\"Status\": \"Error\"}"); // Fail feedback
-#    endif
-      Log.error(F("MQTTtoRF2 failed json read" CR));
+      THEENGS_LOG_ERROR(F("MQTTtoRF2 failed json read" CR));
     }
     enableActiveReceiver();
   }
@@ -303,20 +326,20 @@ void MQTTtoRF2(char* topicOri, JsonObject& RF2data) { // json object decoding
 #  endif
 
 void disableRF2Receive() {
-  Log.trace(F("disableRF2Receive" CR));
+  THEENGS_LOG_TRACE(F("disableRF2Receive" CR));
   NewRemoteReceiver::disable();
 }
 
 void enableRF2Receive() {
-  Log.trace(F("enableRF2Receive" CR));
+  THEENGS_LOG_TRACE(F("enableRF2Receive" CR));
   NewRemoteReceiver::init(RF_RECEIVER_GPIO, 2, rf2Callback);
 
-  Log.notice(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
-  Log.notice(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);
-  Log.trace(F("ZgatewayRF2 command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoRF2);
+  THEENGS_LOG_NOTICE(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
+  THEENGS_LOG_NOTICE(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);
+  THEENGS_LOG_TRACE(F("gatewayRF2 command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoRF2);
   pinMode(RF_EMITTER_GPIO, OUTPUT);
   digitalWrite(RF_EMITTER_GPIO, LOW);
-  Log.trace(F("ZgatewayRF2 setup done " CR));
+  THEENGS_LOG_TRACE(F("gatewayRF2 setup done " CR));
 }
 
 #endif
diff --git a/main/ZgatewayRFM69.ino b/main/gatewayRFM69.cpp
similarity index 77%
rename from main/ZgatewayRFM69.ino
rename to main/gatewayRFM69.cpp
index c9aa059..e4d1f76 100644
--- a/main/ZgatewayRFM69.ino
+++ b/main/gatewayRFM69.cpp
@@ -1,5 +1,5 @@
 /*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your RF/infrared IR signal  and a MQTT broker
    Send and receiving command by MQTT
@@ -31,15 +31,21 @@
 #include "User_config.h"
 
 #ifdef ZgatewayRFM69
-
 #  include <EEPROM.h>
 #  include <RFM69.h> //https://www.github.com/lowpowerlab/rfm69
 
-char RadioConfig[128];
+#  include "TheengsCommon.h"
+#  include "config_RFM69.h"
 
-// vvvvvvvvv Global Configuration vvvvvvvvvvv
+static char RadioConfig[128];
+static const char* PROGMEM ENCRYPTKEY = RFM69_ENCRYPTKEY;
+static const char* PROGMEM MDNS_NAME = RFM69_MDNS_NAME;
+static const char* PROGMEM MQTT_BROKER = RFM69_MQTT_BROKER;
+static const char* PROGMEM RFM69AP_NAME = RFM69_RFM69AP_NAME
 
-struct _GLOBAL_CONFIG {
+    // vvvvvvvvv Global Configuration vvvvvvvvvvv
+
+    struct _GLOBAL_CONFIG {
   uint32_t checksum;
   char rfmapname[32];
   char encryptkey[16 + 1];
@@ -66,32 +72,28 @@ uint32_t gc_checksum() {
   return checksum;
 }
 
-#  if defined(ESP8266) || defined(ESP32)
 void eeprom_setup() {
   EEPROM.begin(4096);
   pGC = (struct _GLOBAL_CONFIG*)EEPROM.getDataPtr();
   // if checksum bad init GC else use GC values
   if (gc_checksum() != pGC->checksum) {
-    Log.trace(F("Factory reset" CR));
+    THEENGS_LOG_TRACE(F("Factory reset" CR));
     memset(pGC, 0, sizeof(*pGC));
     strcpy_P(pGC->encryptkey, ENCRYPTKEY);
     strcpy_P(pGC->rfmapname, RFM69AP_NAME);
-    pGC->networkid = NETWORKID;
-    pGC->nodeid = NODEID;
+    pGC->networkid = RFM69_NETWORKID;
+    pGC->nodeid = RFM69_NODEID;
     pGC->powerlevel = ((IS_RFM69HCW) ? 0x80 : 0x00) | POWER_LEVEL;
     pGC->rfmfrequency = FREQUENCY;
     pGC->checksum = gc_checksum();
     EEPROM.commit();
   }
 }
-#  endif
 
 RFM69 radio;
 
 void setupRFM69(void) {
-#  if defined(ESP8266) || defined(ESP32)
   eeprom_setup();
-#  endif
   int freq;
   static const char PROGMEM JSONtemplate[] =
       R"({"msgType":"config","freq":%d,"rfm69hcw":%d,"netid":%d,"power":%d})";
@@ -101,7 +103,7 @@ void setupRFM69(void) {
 
   // Initialize radio
   if (!radio.initialize(pGC->rfmfrequency, pGC->nodeid, pGC->networkid)) {
-    Log.error(F("ZgatewayRFM69 initialization failed" CR));
+    THEENGS_LOG_ERROR(F("gatewayRFM69 initialization failed" CR));
   }
 
   if (GC_IS_RFM69HCW) {
@@ -129,16 +131,16 @@ void setupRFM69(void) {
       freq = -1;
       break;
   }
-  Log.notice(F("ZgatewayRFM69 Listening and transmitting at: %d" CR), freq);
+  THEENGS_LOG_NOTICE(F("gatewayRFM69 Listening and transmitting at: %d" CR), freq);
 
   size_t len = snprintf_P(RadioConfig, sizeof(RadioConfig), JSONtemplate,
                           freq, GC_IS_RFM69HCW, pGC->networkid, GC_POWER_LEVEL);
   if (len >= sizeof(RadioConfig)) {
-    Log.trace(F("\n\n*** RFM69 config truncated ***\n" CR));
+    THEENGS_LOG_TRACE(F("\n\n*** RFM69 config truncated ***\n" CR));
   }
 }
 
-bool RFM69toMQTT(void) {
+bool RFM69toX(void) {
   //check if something was received (could be an interrupt from the radio)
   if (radio.receiveDone()) {
     StaticJsonDocument<JSON_MSG_BUFFER> RFM69dataBuffer;
@@ -159,14 +161,15 @@ bool RFM69toMQTT(void) {
     }
     //updateClients(senderId, rssi, (const char *)data);
 
-    Log.trace(F("Data received: %s" CR), (const char*)data);
+    THEENGS_LOG_TRACE(F("Data received: %s" CR), (const char*)data);
 
     char buff[sizeof(subjectRFM69toMQTT) + 4];
     sprintf(buff, "%s/%d", subjectRFM69toMQTT, SENDERID);
     RFM69data["data"] = (char*)data;
     RFM69data["rssi"] = (int)radio.RSSI;
     RFM69data["senderid"] = (int)radio.SENDERID;
-    pub(buff, RFM69data);
+    RFM69data["origin"] = buff;
+    enqueueJsonObject(RFM69data);
 
     return true;
   } else {
@@ -175,9 +178,9 @@ bool RFM69toMQTT(void) {
 }
 
 #  if simpleReceiving
-void MQTTtoRFM69(char* topicOri, char* datacallback) {
+void XtoRFM69(const char* topicOri, const char* datacallback) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoRFM69)) {
-    Log.trace(F("MQTTtoRFM69 data analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoRFM69 data analysis" CR));
     char data[RF69_MAX_DATA_LEN + 1];
     memcpy(data, (void*)datacallback, RF69_MAX_DATA_LEN);
     data[RF69_MAX_DATA_LEN] = '\0';
@@ -189,39 +192,39 @@ void MQTTtoRFM69(char* topicOri, char* datacallback) {
     if (pos != -1) {
       pos = pos + +strlen(RFM69receiverKey);
       valueRCV = (topic.substring(pos, pos + 3)).toInt();
-      Log.notice(F("RFM69 receiver ID: %d" CR), valueRCV);
+      THEENGS_LOG_NOTICE(F("RFM69 receiver ID: %d" CR), valueRCV);
     }
     if (radio.sendWithRetry(valueRCV, data, strlen(data), 10)) {
-      Log.notice(F(" OK " CR));
+      THEENGS_LOG_NOTICE(F(" OK " CR));
       // Acknowledgement to the GTWRF topic
       char buff[sizeof(subjectGTWRFM69toMQTT) + 4];
       sprintf(buff, "%s/%d", subjectGTWRFM69toMQTT, radio.SENDERID);
       pub(buff, data);
     } else {
-      Log.error(F("RFM69 sending failed" CR));
+      THEENGS_LOG_ERROR(F("RFM69 sending failed" CR));
     }
   }
 }
 #  endif
 #  if jsonReceiving
-void MQTTtoRFM69(char* topicOri, JsonObject& RFM69data) {
+void XtoRFM69(const char* topicOri, JsonObject& RFM69data) {
   if (cmpToMainTopic(topicOri, subjectMQTTtoRFM69)) {
     const char* data = RFM69data["data"];
-    Log.trace(F("MQTTtoRFM69 json data analysis" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoRFM69 json data analysis" CR));
     if (data) {
-      Log.trace(F("MQTTtoRFM69 data ok" CR));
+      THEENGS_LOG_TRACE(F("MQTTtoRFM69 data ok" CR));
       int valueRCV = RFM69data["receiverid"] | defaultRFM69ReceiverId; //default receiver id value
-      Log.notice(F("RFM69 receiver ID: %d" CR), valueRCV);
+      THEENGS_LOG_NOTICE(F("RFM69 receiver ID: %d" CR), valueRCV);
       if (radio.sendWithRetry(valueRCV, data, strlen(data), 10)) {
-        Log.notice(F(" OK " CR));
+        THEENGS_LOG_NOTICE(F(" OK " CR));
         // Acknowledgement to the GTWRF topic
         RFM69data["origin"] = subjectGTWRFM69toMQTT;
-        handleJsonEnqueue(RFM69data);
+        enqueueJsonObject(RFM69data);
       } else {
-        Log.error(F("MQTTtoRFM69 sending failed" CR));
+        THEENGS_LOG_ERROR(F("MQTTtoRFM69 sending failed" CR));
       }
     } else {
-      Log.error(F("MQTTtoRFM69 failed json read" CR));
+      THEENGS_LOG_ERROR(F("MQTTtoRFM69 failed json read" CR));
     }
   }
 }
diff --git a/main/ZgatewayRTL_433.ino b/main/gatewayRTL_433.cpp
similarity index 57%
rename from main/ZgatewayRTL_433.ino
rename to main/gatewayRTL_433.cpp
index 45589ff..97d37e2 100644
--- a/main/ZgatewayRTL_433.ino
+++ b/main/gatewayRTL_433.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
   This gateway enables to:
@@ -26,19 +26,22 @@
     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 ZgatewayRTL_433
 
-#  include <ArduinoJson.h>
-#  include <config_RF.h>
+#include "User_config.h"
+
+#ifdef ZgatewayRTL_433
 #  include <rtl_433_ESP.h>
 
-#  include "ArduinoLog.h"
-#  include "User_config.h"
+#  include "TheengsCommon.h"
+#  include "config_RF.h"
 #  ifdef ZmqttDiscovery
 #    include "config_mqttDiscovery.h"
 #  endif
 
-char messageBuffer[JSON_MSG_BUFFER];
+#  include <vector>
+
+static char messageBuffer[JSON_MSG_BUFFER];
+rtl_433_ESP rtl_433;
 
 #  ifdef ZmqttDiscovery
 SemaphoreHandle_t semaphorecreateOrUpdateDeviceRTL_433;
@@ -66,13 +69,14 @@ void dumpRTL_433Devices() {
     RTL_433device* p = *it;
     DISCOVERY_TRACE_LOG(F("uniqueId %s" CR), p->uniqueId);
     DISCOVERY_TRACE_LOG(F("modelName %s" CR), p->modelName);
+    DISCOVERY_TRACE_LOG(F("type %s" CR), p->type);
     DISCOVERY_TRACE_LOG(F("isDisc %d" CR), p->isDisc);
   }
 }
 
-void createOrUpdateDeviceRTL_433(const char* id, const char* model, uint8_t flags) {
+void createOrUpdateDeviceRTL_433(const char* id, const char* model, const char* type, uint8_t flags) {
   if (xSemaphoreTake(semaphorecreateOrUpdateDeviceRTL_433, pdMS_TO_TICKS(30000)) == pdFALSE) {
-    Log.error(F("[rtl_433] semaphorecreateOrUpdateDeviceRTL_433 Semaphore NOT taken" CR));
+    THEENGS_LOG_ERROR(F("[rtl_433] semaphorecreateOrUpdateDeviceRTL_433 Semaphore NOT taken" CR));
     return;
   }
 
@@ -82,11 +86,15 @@ void createOrUpdateDeviceRTL_433(const char* id, const char* model, uint8_t flag
     //new device
     device = new RTL_433device();
     if (strlcpy(device->uniqueId, id, uniqueIdSize) > uniqueIdSize) {
-      Log.warning(F("[rtl_433] Device id %s exceeds available space" CR), id); // Remove from production release ?
+      THEENGS_LOG_WARNING(F("[rtl_433] Device id %s exceeds available space" CR), id); // Remove from production release ?
     };
     if (strlcpy(device->modelName, model, modelNameSize) > modelNameSize) {
-      Log.warning(F("[rtl_433] Device model %s exceeds available space" CR), id); // Remove from production release ?
+      THEENGS_LOG_WARNING(F("[rtl_433] Device model %s exceeds available space" CR), model); // Remove from production release ?
     };
+    if (strlcpy(device->type, type, typeSize) > typeSize) {
+      THEENGS_LOG_WARNING(F("[rtl_433] Device type %s exceeds available space" CR), type); // Remove from production release ?
+    }
+    DISCOVERY_TRACE_LOG(F("[rtl_433] Device type is %s." CR), device->type); // Remove from production release ?
     device->isDisc = flags & device_flags_isDisc;
     RTL_433devices.push_back(device);
     newRTL_433Devices++;
@@ -107,7 +115,7 @@ void launchRTL_433Discovery(bool overrideDiscovery) {
   if (!overrideDiscovery && newRTL_433Devices == 0)
     return;
   if (xSemaphoreTake(semaphorecreateOrUpdateDeviceRTL_433, pdMS_TO_TICKS(QueueSemaphoreTimeOutLoop)) == pdFALSE) {
-    Log.error(F("[rtl_433] semaphorecreateOrUpdateDeviceRTL_433 Semaphore NOT taken" CR));
+    THEENGS_LOG_ERROR(F("[rtl_433] semaphorecreateOrUpdateDeviceRTL_433 Semaphore NOT taken" CR));
     return;
   }
   newRTL_433Devices = 0;
@@ -120,29 +128,58 @@ void launchRTL_433Discovery(bool overrideDiscovery) {
     if (overrideDiscovery || !isDiscovered(pdevice)) {
       size_t numRows = sizeof(parameters) / sizeof(parameters[0]);
       for (int i = 0; i < numRows; i++) {
-        if (strstr(pdevice->uniqueId, parameters[i][0]) != 0) {
+        char deviceKeyParameter[25];
+        memcpy(deviceKeyParameter, &pdevice->uniqueId[strlen(pdevice->uniqueId) - strlen(parameters[i][0])], strlen(parameters[i][0]));
+        deviceKeyParameter[strlen(parameters[i][0])] = '\0';
+        THEENGS_LOG_TRACE(F("deviceKeyParameter: %s" CR), deviceKeyParameter);
+
+        if (strcmp(deviceKeyParameter, parameters[i][0]) == 0) {
           // Remove the key from the unique id to extract the device id
           String idWoKey = pdevice->uniqueId;
           idWoKey.remove(idWoKey.length() - (strlen(parameters[i][0]) + 1));
           DISCOVERY_TRACE_LOG(F("idWoKey %s" CR), idWoKey.c_str());
-          String value_template = "{{ value_json." + String(parameters[i][0]) + " | is_defined }}";
-          if (strcmp(parameters[i][0], "battery_ok") == 0) {
-            if (SYSConfig.ohdiscovery) {
-              value_template = "{{ value_json." + String(parameters[i][0]) + " * 99 + 1 }}"; // https://github.com/merbanan/rtl_433/blob/93f0f30c28cfb6b82b8cc3753415b01a85bee91d/examples/rtl_433_mqtt_hass.py#L187
-            } else {
-              value_template = "{{ float(value_json." + String(parameters[i][0]) + ") * 99 + 1 | is_defined }}"; // https://github.com/merbanan/rtl_433/blob/93f0f30c28cfb6b82b8cc3753415b01a85bee91d/examples/rtl_433_mqtt_hass.py#L187
-            }
-          }
+          String value_template = "";
+          value_template = "{{ value_json." + String(parameters[i][0]) + " | is_defined }}";
           String topic = subjectRTL_433toMQTT;
 #    if valueAsATopic
           // Remove the key from the unique id to extract the device id
           String idWoKeyAndModel = idWoKey;
-          idWoKeyAndModel.remove(0, strlen(pdevice->modelName));
-          idWoKeyAndModel.replace("-", "/");
+          if (strcmp(pdevice->type, "null")) {
+            idWoKeyAndModel.remove(0, (strlen(pdevice->modelName) + strlen(pdevice->type) + 1)); // type is present
+            topic = topic + "/" + String(pdevice->type) + "/" + String(pdevice->modelName);
+          } else {
+            idWoKeyAndModel.remove(0, (strlen(pdevice->modelName)));
+            topic = topic + "/" + String(pdevice->modelName);
+          }
           DISCOVERY_TRACE_LOG(F("idWoKeyAndModel %s" CR), idWoKeyAndModel.c_str());
-          topic = topic + "/" + String(pdevice->modelName) + idWoKeyAndModel;
+          idWoKeyAndModel.replace("-", "/");
+          idWoKeyAndModel.replace("//", "/-");
+          topic = topic + idWoKeyAndModel;
 #    endif
-          if (strcmp(parameters[i][0], "tamper") == 0 || strcmp(parameters[i][0], "alarm") == 0 || strcmp(parameters[i][0], "motion") == 0) {
+          if (strcmp(parameters[i][0], "battery_ok") == 0) {
+            if (strcmp(pdevice->modelName, "Govee-Water") == 0 || strcmp(pdevice->modelName, "Govee-Contact") == 0 || strcmp(pdevice->modelName, "Archos-TBH") == 0 || strcmp(pdevice->modelName, "FineOffset-WH31L") == 0 || strcmp(pdevice->modelName, "Fineoffset-WH45") == 0 || strcmp(pdevice->modelName, "Fineoffset-WN34") == 0 || strcmp(pdevice->modelName, "Fineoffset-WS80") == 0 || strcmp(pdevice->modelName, "Fineoffset-WH0290") == 0 || strcmp(pdevice->modelName, "Fineoffset-WH51") == 0 || strcmp(pdevice->modelName, "Kedsum-TH") == 0 || strcmp(pdevice->modelName, "AVE") == 0 || strcmp(pdevice->modelName, "TPMS") == 0) {
+              value_template = "{{ (float(value_json." + String(parameters[i][0]) + ") * 100) | round(0) | is_defined }}";
+              createDiscovery("sensor", //set Type
+                              (char*)topic.c_str(), parameters[i][1], pdevice->uniqueId, //set state_topic,name,uniqueId
+                              "", parameters[i][3], (char*)value_template.c_str(), //set availability_topic,device_class,value_template,
+                              "", "", HASS_UNIT_PERCENT, //set,payload_on,payload_off,unit_of_meas,
+                              0, //set  off_delay
+                              "", "", false, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
+                              (char*)idWoKey.c_str(), "", pdevice->modelName, (char*)idWoKey.c_str(), false, // device name, device manufacturer, device model, device ID, retain
+                              stateClassMeasurement //State Class
+              );
+            } else {
+              createDiscovery("binary_sensor", //set Type
+                              (char*)topic.c_str(), parameters[i][1], pdevice->uniqueId, //set state_topic,name,uniqueId
+                              "", parameters[i][3], (char*)value_template.c_str(), //set availability_topic,device_class,value_template,
+                              "0", "1", "", //set,payload_on,payload_off,unit_of_meas,
+                              0, //set  off_delay
+                              "", "", false, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
+                              (char*)idWoKey.c_str(), "", pdevice->modelName, (char*)idWoKey.c_str(), false, // device name, device manufacturer, device model, device ID, retain
+                              "" //State Class
+              );
+            }
+          } else if (strcmp(parameters[i][0], "tamper") == 0 || strcmp(parameters[i][0], "alarm") == 0 || strcmp(parameters[i][0], "motion") == 0) {
             createDiscovery("binary_sensor", //set Type
                             (char*)topic.c_str(), parameters[i][1], pdevice->uniqueId, //set state_topic,name,uniqueId
                             "", parameters[i][3], (char*)value_template.c_str(), //set availability_topic,device_class,value_template,
@@ -152,6 +189,16 @@ void launchRTL_433Discovery(bool overrideDiscovery) {
                             (char*)idWoKey.c_str(), "", pdevice->modelName, (char*)idWoKey.c_str(), false, // device name, device manufacturer, device model, device ID, retain
                             "" //State Class
             );
+          } else if (strcmp(parameters[i][0], "state") == 0 && (strcmp(pdevice->modelName, "Nexa-Security") == 0 || strcmp(pdevice->modelName, "Brennenstuhl-RCS2044") == 0 || strcmp(pdevice->modelName, "Proove-Security") == 0 || strcmp(pdevice->modelName, "Waveman-Switch") == 0)) {
+            createDiscovery("binary_sensor", //set Type
+                            (char*)topic.c_str(), parameters[i][1], pdevice->uniqueId, //set state_topic,name,uniqueId
+                            "", parameters[i][3], (char*)value_template.c_str(), //set availability_topic,device_class,value_template,
+                            "ON", "OFF", parameters[i][2], //set,payload_on,payload_off,unit_of_meas,
+                            0, //set  off_delay
+                            "", "", false, "", //set,payload_available,payload_not available   ,is a gateway entity, command topic
+                            (char*)idWoKey.c_str(), "", pdevice->modelName, (char*)idWoKey.c_str(), false, // device name, device manufacturer, device model, device ID, retain
+                            "" //State Class
+            );
           } else if (strcmp(parameters[i][0], "strike_count") == 0) {
             createDiscovery("sensor", //set Type
                             (char*)topic.c_str(), parameters[i][1], pdevice->uniqueId, //set state_topic,name,uniqueId
@@ -197,7 +244,7 @@ void launchRTL_433Discovery(bool overrideDiscovery) {
   }
 }
 
-void storeRTL_433Discovery(JsonObject& RFrtl_433_ESPdata, const char* model, const char* uniqueid) {
+void storeRTL_433Discovery(JsonObject& RFrtl_433_ESPdata, const char* model, const char* type, const char* uniqueid) {
   //Sanitize model name
   String modelSanitized = model;
   modelSanitized.replace(" ", "_");
@@ -211,7 +258,7 @@ void storeRTL_433Discovery(JsonObject& RFrtl_433_ESPdata, const char* model, con
   for (int i = 0; i < numRows; i++) {
     if (RFrtl_433_ESPdata.containsKey(parameters[i][0])) {
       String key_id = String(uniqueid) + "-" + String(parameters[i][0]);
-      createOrUpdateDeviceRTL_433((char*)key_id.c_str(), (char*)modelSanitized.c_str(), device_flags_init);
+      createOrUpdateDeviceRTL_433((char*)key_id.c_str(), (char*)modelSanitized.c_str(), (char*)type, device_flags_init);
     }
   }
 }
@@ -222,23 +269,57 @@ void rtl_433_Callback(char* message) {
   JsonObject RFrtl_433_ESPdata = jsonBuffer2.to<JsonObject>();
   auto error = deserializeJson(jsonBuffer2, message);
   if (error) {
-    Log.error(F("[rtl_433] deserializeJson() failed: %s" CR), error.c_str());
+    THEENGS_LOG_ERROR(F("[rtl_433] deserializeJson() failed: %s" CR), error.c_str());
     return;
   }
 
-  unsigned long MQTTvalue = (int)RFrtl_433_ESPdata["id"] + round((float)RFrtl_433_ESPdata["temperature_C"]);
+  // Hash the message payload excluding volatile fields (time, rssi, snr, noise_floor)
+  // that change between retransmissions of the same physical signal. This replaces the
+  // previous id+temperature_C approach which failed for devices lacking temperature_C.
+  // Use an order-independent (additive) combination of per-key hashes since JsonObject
+  // iteration order is not guaranteed to be consistent.
+  unsigned long MQTTvalue = 0;
+  for (JsonPair kv : RFrtl_433_ESPdata) {
+    const char* key = kv.key().c_str();
+    if (strcmp(key, "time") == 0 || strcmp(key, "time_ms") == 0 || strcmp(key, "rssi") == 0 ||
+        strcmp(key, "snr") == 0 || strcmp(key, "noise_floor") == 0 || strcmp(key, "pulses") == 0 ||
+        strcmp(key, "duration") == 0) {
+      continue;
+    }
+    unsigned long kvHash = 0;
+    for (int i = 0; key[i] != '\0'; i++)
+      kvHash = kvHash * 31 + (unsigned char)key[i];
+    kvHash = kvHash * 31 + 0xFF; // separator between key and value
+    String val;
+    serializeJson(kv.value(), val);
+    for (unsigned int i = 0; i < val.length(); i++)
+      kvHash = kvHash * 31 + (unsigned char)val[i];
+    kvHash ^= kvHash >> 16;
+    kvHash *= 0x85ebca6bUL;
+    kvHash ^= kvHash >> 13;
+    kvHash *= 0xc2b2ae35UL;
+    kvHash ^= kvHash >> 16;
+    MQTTvalue += kvHash; // additive combination is order-independent
+  }
   String topic = subjectRTL_433toMQTT;
   String model = RFrtl_433_ESPdata["model"];
+  model.replace("/", "_"); // Some rtl_devices have / in the model string
+  String type = RFrtl_433_ESPdata["type"];
   String uniqueid;
 
   const char naming_keys[5][8] = {"type", "model", "subtype", "channel", "id"}; // from rtl_433_mqtt_hass.py
   size_t numRows = sizeof(naming_keys) / sizeof(naming_keys[0]);
   for (int i = 0; i < numRows; i++) {
     if (RFrtl_433_ESPdata.containsKey(naming_keys[i])) {
+      String namingValue = RFrtl_433_ESPdata[naming_keys[i]].as<String>();
+      if (strcmp(naming_keys[i], "model") == 0)
+        namingValue = model;
+      else if (strcmp(naming_keys[i], "type") == 0)
+        namingValue = type;
       if (uniqueid == 0) {
-        uniqueid = RFrtl_433_ESPdata[naming_keys[i]].as<String>(); // Start of the unique id with the first key
+        uniqueid = namingValue; // Start of the unique id with the first key
       } else {
-        uniqueid = uniqueid + "/" + RFrtl_433_ESPdata[naming_keys[i]].as<String>(); // Following keys
+        uniqueid = uniqueid + "/" + namingValue; // Following keys
       }
     }
   }
@@ -249,20 +330,18 @@ void rtl_433_Callback(char* message) {
 
   uniqueid.replace("/", "-");
 
-  // Log.notice(F("uniqueid: %s" CR), uniqueid.c_str());
+  DISCOVERY_TRACE_LOG(F("uniqueid: %s" CR), uniqueid.c_str());
   if (!isAduplicateSignal(MQTTvalue)) {
 #  ifdef ZmqttDiscovery
     if (SYSConfig.discovery)
-      storeRTL_433Discovery(RFrtl_433_ESPdata, (char*)model.c_str(), (char*)uniqueid.c_str());
+      storeRTL_433Discovery(RFrtl_433_ESPdata, (char*)model.c_str(), (char*)type.c_str(), (char*)uniqueid.c_str());
 #  endif
-    //RFrtl_433_ESPdata["origin"] = (char*)topic.c_str();
-    //handleJsonEnqueue(RFrtl_433_ESPdata);
-    pub(topic.c_str(), RFrtl_433_ESPdata);
+    RFrtl_433_ESPdata["origin"] = (char*)topic.c_str();
+    enqueueJsonObject(RFrtl_433_ESPdata);
     storeSignalValue(MQTTvalue);
-    pubOled((char*)topic.c_str(), RFrtl_433_ESPdata);
   }
 #  ifdef MEMORY_DEBUG
-  Log.trace(F("Post rtl_433_Callback: %d" CR), ESP.getFreeHeap());
+  THEENGS_LOG_TRACE(F("Post rtl_433_Callback: %d" CR), ESP.getFreeHeap());
 #  endif
 }
 
@@ -272,8 +351,8 @@ void setupRTL_433() {
   semaphorecreateOrUpdateDeviceRTL_433 = xSemaphoreCreateBinary();
   xSemaphoreGive(semaphorecreateOrUpdateDeviceRTL_433);
 #  endif
-  Log.trace(F("ZgatewayRTL_433 command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoRFset);
-  Log.notice(F("ZgatewayRTL_433 setup done " CR));
+  THEENGS_LOG_TRACE(F("gatewayRTL_433 command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoRFset);
+  THEENGS_LOG_NOTICE(F("gatewayRTL_433 setup done " CR));
 }
 
 void RTL_433Loop() {
@@ -281,13 +360,13 @@ void RTL_433Loop() {
 }
 
 extern void enableRTLreceive() {
-  Log.notice(F("Enable RTL_433 Receiver: %FMhz" CR), RFConfig.frequency);
-  rtl_433.initReceiver(RF_MODULE_RECEIVER_GPIO, RFConfig.frequency);
+  THEENGS_LOG_NOTICE(F("Enable RTL_433 Receiver: %FMhz" CR), iRFConfig.getFrequency());
+  rtl_433.initReceiver(RF_MODULE_RECEIVER_GPIO, iRFConfig.getFrequency());
   rtl_433.enableReceiver();
 }
 
 extern void disableRTLreceive() {
-  Log.trace(F("disableRTLreceive" CR));
+  THEENGS_LOG_TRACE(F("disableRTLreceive" CR));
   rtl_433.disableReceiver();
 }
 
diff --git a/main/gatewaySERIAL.cpp b/main/gatewaySERIAL.cpp
new file mode 100644
index 0000000..ea6cc88
--- /dev/null
+++ b/main/gatewaySERIAL.cpp
@@ -0,0 +1,383 @@
+/*  
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+
+   Act as a wifi or ethernet gateway between your SERIAL device and a MQTT broker 
+   Send and receiving command by MQTT
+ 
+  This gateway enables to:
+ - receive MQTT data from a topic and send SERIAL signal corresponding to the received MQTT data
+ - publish MQTT data to a different topic related to received SERIAL signal
+
+    Copyright: (c)Florian ROBERT
+  
+    This file is part of OpenMQTTGateway.
+    
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+#include "User_config.h"
+
+#ifdef ZgatewaySERIAL
+#  include "TheengsCommon.h"
+#  include "config_SERIAL.h"
+
+#  ifndef SERIAL_UART // software serial mode
+#    include <SoftwareSerial.h>
+SoftwareSerial SERIALSoftSerial(SERIAL_RX_GPIO, SERIAL_TX_GPIO); // RX, TX
+#  endif
+
+#  ifdef ESP32
+SemaphoreHandle_t serialSemaphore = NULL;
+const TickType_t semaphoreTimeout = pdMS_TO_TICKS(1000); // 1 second timeout
+#    undef SEMAPHORE_SERIAL
+#    undef SEMAPHORE_SERIAL_GIVE
+#    define SEMAPHORE_SERIAL      xSemaphoreTake(serialSemaphore, semaphoreTimeout) == pdTRUE
+#    define SEMAPHORE_SERIAL_GIVE xSemaphoreGive(serialSemaphore)
+#  else
+#    undef SEMAPHORE_SERIAL
+#    undef SEMAPHORE_SERIAL_GIVE
+#    define SEMAPHORE_SERIAL true
+#    define SEMAPHORE_SERIAL_GIVE
+#  endif
+
+extern void receivingDATA(const char* topicOri, const char* datacallback);
+
+// use pointer to stream class for serial communication to make code
+// compatible with both softwareSerial as hardwareSerial.
+Stream* SERIALStream = NULL;
+//unsigned long msgCount = 0;
+
+bool receiverReady = false;
+unsigned long lastHeartbeatReceived = 0;
+unsigned long lastHeartbeatAckReceived = 0;
+unsigned long lastHeartbeatSent = 0;
+unsigned long lastHeartbeatAckReceivedCheck = 0;
+const unsigned long heartbeatTimeout = 15000; // 15 seconds timeout for ack
+const unsigned long heartbeatAckCheckInterval = 5000; // Check for ack every 5 seconds
+const unsigned long maxHeartbeatInterval = 60000; // Maximum interval of 1 minute
+unsigned long heartbeatInterval = 5000; // 5 seconds
+bool isOverflow = false;
+
+static void sendHeartbeat();
+static void sendHeartbeatAck();
+static void handleHeartbeat();
+
+void setupSERIAL() {
+//Initalize serial port
+#  ifdef SERIAL_UART // Hardware serial
+#    if SERIAL_UART == 0 // init UART0
+  Serial.end(); // stop if already initialized
+#      ifdef ESP32
+  Serial.begin(SERIALBaud, SERIAL_CONFIG, SERIAL_RX_GPIO, SERIAL_TX_GPIO);
+#      else
+  Serial.begin(SERIALBaud, SERIAL_CONFIG);
+#      endif
+#      if defined(ESP8266) && defined(SERIAL_UART0_SWAP)
+  Serial.swap(); // swap UART0 ports from (GPIO1,GPIO3) to (GPIO15,GPIO13)
+#      endif
+  SERIALStream = &Serial;
+  THEENGS_LOG_NOTICE(F("SERIAL HW UART0" CR));
+
+#    elif SERIAL_UART == 1 // init UART1
+  Serial1.end(); // stop if already initialized
+#      ifdef ESP32
+  Serial1.begin(SERIALBaud, SERIAL_CONFIG, SERIAL_RX_GPIO, SERIAL_TX_GPIO);
+#      else
+  Serial1.begin(SERIALBaud, SERIAL_CONFIG);
+#      endif
+  SERIALStream = &Serial1;
+  THEENGS_LOG_NOTICE(F("SERIAL HW UART1" CR));
+
+#    elif SERIAL_UART == 2 // init UART2
+  Serial2.end(); // stop if already initialized
+#      ifdef ESP32
+  Serial2.begin(SERIALBaud, SERIAL_CONFIG, SERIAL_RX_GPIO, SERIAL_TX_GPIO);
+#      else
+  Serial2.begin(SERIALBaud, SERIAL_CONFIG);
+#      endif
+  SERIALStream = &Serial2;
+  THEENGS_LOG_NOTICE(F("SERIAL HW UART2" CR));
+
+#    elif SERIAL_UART == 3 // init UART3
+  Serial3.end(); // stop if already initialized
+  Serial3.begin(SERIALBaud, SERIAL_CONFIG);
+  SERIALStream = &Serial3;
+  THEENGS_LOG_NOTICE(F("SERIAL HW UART3" CR));
+#    endif
+
+#  else // Software serial
+  // define pin modes for RX, TX:
+  pinMode(SERIAL_RX_GPIO, INPUT);
+  pinMode(SERIAL_TX_GPIO, OUTPUT);
+  SERIALSoftSerial.begin(SERIALBaud);
+  SERIALStream = &SERIALSoftSerial; // get stream of serial
+
+  THEENGS_LOG_NOTICE(F("SERIAL_RX_GPIO: %d" CR), SERIAL_RX_GPIO);
+  THEENGS_LOG_NOTICE(F("SERIAL_TX_GPIO: %d" CR), SERIAL_TX_GPIO);
+#  endif
+
+#  ifdef ESP32
+  serialSemaphore = xSemaphoreCreateMutex();
+  if (serialSemaphore == NULL) {
+    THEENGS_LOG_ERROR(F("Failed to create serialSemaphore" CR));
+  }
+#  endif
+
+  // Flush all bytes in the "link" serial port buffer
+  while (SERIALStream->available() > 0)
+    SERIALStream->read();
+
+  THEENGS_LOG_NOTICE(F("SERIALBaud: %d" CR), SERIALBaud);
+  THEENGS_LOG_TRACE(F("gatewaySERIAL setup done" CR));
+}
+
+#  if SERIALtoMQTTmode == 0 // Convert received data to single MQTT topic
+void SERIALtoX() {
+  // Send all SERIAL output (up to SERIALInPost char revieved) as MQTT message
+  //This function is Blocking, but there should only ever be a few bytes, usually an ACK or a NACK.
+  if (SERIALStream->available()) {
+    THEENGS_LOG_TRACE(F("SERIALtoMQTT" CR));
+    static char SERIALdata[MAX_INPUT];
+    static unsigned int input_pos = 0;
+    static char inChar;
+    do {
+      if (SERIALStream->available()) {
+        inChar = SERIALStream->read();
+        SERIALdata[input_pos] = inChar;
+        input_pos++;
+      }
+    } while (inChar != SERIALInPost && input_pos < MAX_INPUT);
+    SERIALdata[input_pos] = 0;
+    input_pos = 0;
+
+    char* output = SERIALdata + sizeof(SERIALPre) - 1;
+    THEENGS_LOG_NOTICE(F("SERIAL data: %s" CR), output);
+    pub(subjectSERIALtoMQTT, output);
+  }
+}
+
+#  elif SERIALtoMQTTmode == 1 // Convert received JSON data to one or multiple MQTT topics
+void sendHeartbeat() {
+  if (SEMAPHORE_SERIAL) {
+    SERIALStream->print(SERIALPre);
+    SERIALStream->print("{\"type\":\"heartbeat\"}");
+    SERIALStream->print(SERIALPost);
+    SERIALStream->flush();
+    THEENGS_LOG_NOTICE(F("Sent Serial heartbeat" CR));
+    SEMAPHORE_SERIAL_GIVE;
+  } else {
+    THEENGS_LOG_ERROR(F("Failed to take serialSemaphore" CR));
+  }
+}
+
+void sendHeartbeatAck() {
+  if (SEMAPHORE_SERIAL) {
+    SERIALStream->print(SERIALPre);
+    SERIALStream->print("{\"type\":\"heartbeat_ack\"}");
+    SERIALStream->print(SERIALPost);
+    SERIALStream->flush();
+    THEENGS_LOG_NOTICE(F("Sent heartbeat ack" CR));
+    SEMAPHORE_SERIAL_GIVE;
+  } else {
+    THEENGS_LOG_ERROR(F("Failed to take serialSemaphore" CR));
+  }
+}
+
+void SERIALtoX() {
+  static String buffer = ""; // Static buffer to store incomplete messages
+  unsigned long currentTime = millis();
+
+#    ifdef SENDER_SERIAL_HEARTBEAT
+  // Check if it's time to send a heartbeat and we're not in overflow
+  if (!isOverflow && currentTime - lastHeartbeatSent > heartbeatInterval) {
+    sendHeartbeat();
+    lastHeartbeatSent = currentTime;
+  }
+  if (currentTime - lastHeartbeatAckReceivedCheck > heartbeatAckCheckInterval) {
+    lastHeartbeatAckReceivedCheck = currentTime;
+    // Check if we received an ack for the last heartbeat
+    if (currentTime - lastHeartbeatAckReceived > heartbeatTimeout) {
+      // No ack received, increase the interval (with a maximum limit)
+      unsigned long newHeartbeatInterval = heartbeatInterval * 1.25;
+      heartbeatInterval = min(newHeartbeatInterval, maxHeartbeatInterval);
+      THEENGS_LOG_WARNING(F("No heartbeat ack received. Increasing interval to %lu ms" CR), heartbeatInterval);
+      receiverReady = false;
+    } else {
+      // Ack received, reset the interval
+      heartbeatInterval = 5000;
+    }
+  }
+#    else
+  receiverReady = true;
+#    endif
+  while (SERIALStream->available()) {
+    unsigned long now = millis();
+    char c = SERIALStream->read();
+    buffer += c;
+
+    // Check if we have a complete message
+    if (buffer.startsWith(SERIALPre) && buffer.endsWith(SERIALPost)) {
+      isOverflow = false;
+      // Remove prefix and postfix
+      String jsonString = buffer.substring(strlen(SERIALPre), buffer.length() - strlen(SERIALPost));
+
+      // Allocate the JSON document
+      StaticJsonDocument<JSON_MSG_BUFFER> SERIALBuffer;
+      JsonObject SERIALdata = SERIALBuffer.to<JsonObject>();
+
+      // Deserialize the JSON string
+      DeserializationError err = deserializeJson(SERIALBuffer, jsonString);
+
+      if (err == DeserializationError::Ok) {
+        // Check if this is a heartbeat message
+        if (SERIALdata.containsKey("type") && strcmp(SERIALdata["type"], "heartbeat") == 0) {
+          handleHeartbeat();
+        } else if (SERIALdata.containsKey("type") && strcmp(SERIALdata["type"], "heartbeat_ack") == 0) {
+          lastHeartbeatAckReceived = now;
+          receiverReady = true;
+          THEENGS_LOG_NOTICE(F("Heartbeat ack received" CR));
+        } else {
+          // Process normal messages
+          THEENGS_LOG_NOTICE(F("SERIAL msg received: %s" CR), jsonString.c_str());
+#    if jsonPublishing
+          if (SERIALdata.containsKey("target")) {
+            receivingDATA("", jsonString.c_str());
+          } else {
+            // send as json
+            if (SERIALdata.containsKey("origin") || SERIALdata.containsKey("topic")) {
+#      ifdef SecondaryModule
+              // We need to assign the discovery message to the primary module instead of the secondary module
+              if (SERIALdata.containsKey("device") && SERIALdata["device"].containsKey("via_device")) {
+                SERIALdata["device"]["via_device"] = gateway_name;
+              }
+#      endif
+              enqueueJsonObject(SERIALdata);
+            } else {
+              SERIALdata["origin"] = subjectSERIALtoMQTT;
+              enqueueJsonObject(SERIALdata);
+            }
+          }
+#    endif
+#    if simplePublishing
+          // send as MQTT topics
+          char topic[mqtt_topic_max_size + 1] = subjectSERIALtoMQTT;
+          sendMQTTfromNestedJson(SERIALBuffer.as<JsonVariant>(), topic, 0, SERIALmaxJSONlevel);
+#    endif
+        }
+      } else {
+        // Print error to serial log
+        THEENGS_LOG_ERROR(F("Error in SERIALJSONtoMQTT, deserializeJson() returned %s" CR), err.c_str());
+      }
+
+      // Clear the buffer for the next message
+      buffer = "";
+    } else if (buffer.endsWith(SERIALPost)) {
+      // If the buffer ends with the postfix but does not start with the prefix, clear it
+      THEENGS_LOG_ERROR(F("Buffer error, clearing buffer. Partial content: %s" CR), buffer.c_str());
+      buffer = "";
+    } else if (buffer.length() > JSON_MSG_BUFFER) {
+      // If the buffer gets too large without finding a complete message, clear it
+      THEENGS_LOG_ERROR(F("Buffer overflow, clearing buffer. Partial content: %s" CR), buffer.c_str());
+      buffer = "";
+      isOverflow = true;
+    }
+  }
+}
+
+void sendMQTTfromNestedJson(JsonVariant obj, char* topic, int level, int maxLevel) {
+  // recursively step through JSON data and send MQTT messages
+  if (level < maxLevel && obj.is<JsonObject>()) {
+    int topicLength = strlen(topic);
+    // loop over fields
+    for (JsonPair pair : obj.as<JsonObject>()) {
+      // check if new key still fits in topic cstring
+      const char* key = pair.key().c_str();
+      THEENGS_LOG_TRACE(F("level=%d, key='%s'" CR), level, pair.key().c_str());
+      if (topicLength + 2 + strlen(key) <= mqtt_topic_max_size) {
+        // add new level to existing topic cstring
+        topic[topicLength] = '/'; // add slash
+        topic[topicLength + 1] = '\0'; // terminate
+        strncat(topic + topicLength, key, mqtt_topic_max_size - topicLength - 2);
+
+        // step recursively into next level
+        sendMQTTfromNestedJson(pair.value(), topic, level + 1, maxLevel);
+
+        // restore topic
+        topic[topicLength] = '\0';
+      } else {
+        THEENGS_LOG_ERROR(F("Nested key '%s' at level %d does not fit within max topic length of %d, skipping"),
+                          key, level, mqtt_topic_max_size);
+      }
+    }
+
+  } else {
+    // output value at current json level
+    char output[MAX_INPUT + 1];
+    serializeJson(obj, output, MAX_INPUT);
+    THEENGS_LOG_NOTICE(F("level=%d, topic=%s, value: %s\n"), level, topic, output);
+
+    // send MQTT message
+    pub(topic, &output[0]);
+  }
+}
+#  endif
+
+bool XtoSERIAL(const char* topicOri, JsonObject& SERIALdata) {
+  bool res = false;
+  if (SEMAPHORE_SERIAL) {
+    if (receiverReady && (cmpToMainTopic(topicOri, subjectMQTTtoSERIAL) ||
+                          (SYSConfig.serial && SERIALdata.containsKey("origin") && SERIALdata["origin"].is<const char*>()) ||
+                          (SYSConfig.serial && SERIALdata.containsKey("topic") && SERIALdata["topic"].is<const char*>()))) {
+      THEENGS_LOG_TRACE(F("XtoSERIAL" CR));
+      // Prepare the data string
+      std::string data;
+      if (SYSConfig.serial ||
+          (SERIALdata.containsKey("origin") && SERIALdata["origin"].is<const char*>()) || // Module like BT to SERIAL
+          (SERIALdata.containsKey("target") && SERIALdata["target"].is<const char*>())) { // Command to send to a specific target example MQTTtoBT through SERIAL
+        //SERIALdata["msgcount"] = msgCount++;
+        serializeJson(SERIALdata, data);
+      } else if (SERIALdata.containsKey("value")) {
+        data = SERIALdata["value"].as<std::string>();
+      }
+
+      // Send the message
+      const char* prefix = SERIALdata["prefix"] | SERIALPre;
+      const char* postfix = SERIALdata["postfix"] | SERIALPost;
+      SERIALStream->print(prefix);
+      SERIALStream->print(data.c_str());
+      SERIALStream->print(postfix);
+      SERIALStream->flush();
+
+      THEENGS_LOG_NOTICE(F("[ OMG->SERIAL ] data sent: %s" CR), data.c_str());
+      res = true;
+      delay(100);
+    }
+    SEMAPHORE_SERIAL_GIVE;
+  } else {
+    THEENGS_LOG_ERROR(F("Failed to take serialSemaphore" CR));
+  }
+  return res;
+}
+
+bool isSerialReady() {
+  return receiverReady;
+}
+
+// This function should be called when a heartbeat is received from the emitter
+void handleHeartbeat() {
+  lastHeartbeatReceived = millis();
+  if (gatewayState == GatewayState::BROKER_CONNECTED) {
+    sendHeartbeatAck();
+  }
+}
+#endif
\ No newline at end of file
diff --git a/main/ZgatewaySRFB.ino b/main/gatewaySRFB.cpp
similarity index 70%
rename from main/ZgatewaySRFB.ino
rename to main/gatewaySRFB.cpp
index 558fef1..ca7d521 100644
--- a/main/ZgatewaySRFB.ino
+++ b/main/gatewaySRFB.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
   This gateway enables to:
@@ -31,13 +31,20 @@
 #include "User_config.h"
 
 #ifdef ZgatewaySRFB
+#  include <TheengsUtils.h>
+
+#  include "TheengsCommon.h"
+#  include "config_SRFB.h"
 
 unsigned char _uartbuf[RF_MESSAGE_SIZE + 3] = {0};
 unsigned char _uartpos = 0;
 
+void _rfbDecode();
+void _rfbAck();
+
 void setupSRFB() {
-  Log.trace(F("ZgatewaySRFB setup done " CR));
-  Log.trace(F("Serial Baud: %l" CR), SERIAL_BAUD);
+  THEENGS_LOG_TRACE(F("gatewaySRFB setup done " CR));
+  THEENGS_LOG_TRACE(F("Serial Baud: %l" CR), SERIAL_BAUD);
 }
 
 void _rfbSend(byte* message) {
@@ -53,9 +60,11 @@ void _rfbSend(byte* message) {
 }
 
 void _rfbSend(byte* message, int times) {
-  char buffer[RF_MESSAGE_SIZE];
-  _rawToHex(message, buffer, RF_MESSAGE_SIZE);
-  Log.notice(F("[RFBRIDGE] Sending MESSAGE" CR));
+  // _rawToHex writes 3 bytes per input byte (two hex chars + CR) followed by a
+  // terminating NUL, so the buffer needs 2 * RF_MESSAGE_SIZE + 2 bytes.
+  char buffer[RF_MESSAGE_SIZE * 2 + 2] = {0};
+  TheengsUtils::_rawToHex(message, buffer, RF_MESSAGE_SIZE);
+  THEENGS_LOG_NOTICE(F("[RFBRIDGE] Sending MESSAGE" CR));
 
   for (int i = 0; i < times; i++) {
     if (i > 0) {
@@ -67,7 +76,7 @@ void _rfbSend(byte* message, int times) {
   }
 }
 
-bool SRFBtoMQTT() {
+bool SRFBtoX() {
   static bool receiving = false;
 
   while (Serial.available()) {
@@ -78,8 +87,15 @@ bool SRFBtoMQTT() {
       if (c == RF_CODE_STOP) {
         _rfbDecode();
         receiving = false;
-      } else {
+      } else if (_uartpos < sizeof(_uartbuf)) {
         _uartbuf[_uartpos++] = c;
+      } else {
+        // Frame longer than expected — drop it rather than overrun _uartbuf.
+        // A crafted 433 MHz transmission that emits START but never STOP would
+        // otherwise let _uartpos grow up to 255 and trample adjacent globals.
+        THEENGS_LOG_WARNING(F("[RFBRIDGE] RF frame too long, dropping" CR));
+        receiving = false;
+        _uartpos = 0;
       }
     } else if (c == RF_CODE_START) {
       _uartpos = 0;
@@ -99,35 +115,35 @@ void _rfbDecode() {
   char buffer[RF_MESSAGE_SIZE * 2 + 1] = {0};
 
   if (action == RF_CODE_RFIN) {
-    _rawToHex(&_uartbuf[1], buffer, RF_MESSAGE_SIZE);
+    TheengsUtils::_rawToHex(&_uartbuf[1], buffer, RF_MESSAGE_SIZE);
 
-    Log.trace(F("Creating SRFB buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating SRFB buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> SRFBdataBuffer;
     JsonObject SRFBdata = SRFBdataBuffer.to<JsonObject>();
     SRFBdata["raw"] = String(buffer).substring(0, 18);
 
-    int val_Tsyn = (int)(int)value_from_hex_data(buffer, 0, 4, false, false);
+    int val_Tsyn = (int)(int)TheengsUtils::value_from_hex_data(buffer, 0, 4, false, false);
     SRFBdata["delay"] = (int)val_Tsyn;
 
-    int val_Tlow = (int)value_from_hex_data(buffer, 4, 4, false, false);
+    int val_Tlow = (int)TheengsUtils::value_from_hex_data(buffer, 4, 4, false, false);
     SRFBdata["val_Tlow"] = (int)val_Tlow;
 
-    int val_Thigh = (int)value_from_hex_data(buffer, 8, 4, false, false);
+    int val_Thigh = (int)TheengsUtils::value_from_hex_data(buffer, 8, 4, false, false);
     SRFBdata["val_Thigh"] = (int)val_Thigh;
 
-    unsigned long MQTTvalue = (unsigned long)value_from_hex_data(buffer, 12, 8, false, false);
+    unsigned long MQTTvalue = (unsigned long)TheengsUtils::value_from_hex_data(buffer, 12, 8, false, false);
     SRFBdata["value"] = (unsigned long)MQTTvalue;
 
     if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of RF -->MQTT
-      Log.trace(F("Adv data SRFBtoMQTT" CR));
+      THEENGS_LOG_TRACE(F("Adv data SRFBtoMQTT" CR));
       SRFBdata["origin"] = subjectSRFBtoMQTT;
-      handleJsonEnqueue(SRFBdata);
-      Log.trace(F("Store val: %lu" CR), MQTTvalue);
+      enqueueJsonObject(SRFBdata);
+      THEENGS_LOG_TRACE(F("Store val: %lu" CR), MQTTvalue);
       storeSignalValue(MQTTvalue);
       if (repeatSRFBwMQTT) {
-        Log.trace(F("Publish SRFB for rpt" CR));
+        THEENGS_LOG_TRACE(F("Publish SRFB for rpt" CR));
         SRFBdata["origin"] = subjectMQTTtoSRFB;
-        handleJsonEnqueue(SRFBdata);
+        enqueueJsonObject(SRFBdata);
       }
     }
     _rfbAck();
@@ -135,7 +151,7 @@ void _rfbDecode() {
 }
 
 void _rfbAck() {
-  Log.trace(F("[RFBRIDGE] Sending ACK\n" CR));
+  THEENGS_LOG_TRACE(F("[RFBRIDGE] Sending ACK\n" CR));
   Serial.println();
   Serial.write(RF_CODE_START);
   Serial.write(RF_CODE_ACK);
@@ -145,7 +161,7 @@ void _rfbAck() {
 }
 
 #  if simpleReceiving
-void MQTTtoSRFB(char* topicOri, char* datacallback) {
+void XtoSRFB(const char* topicOri, const char* datacallback) {
   // RF DATA ANALYSIS
   String topic = topicOri;
   int valueRPT = 0;
@@ -159,31 +175,31 @@ void MQTTtoSRFB(char* topicOri, char* datacallback) {
     if (pos != -1) {
       pos = pos + +strlen(SRFBRptKey);
       valueRPT = (topic.substring(pos, pos + 1)).toInt();
-      Log.notice(F("SRFB Repeat: %d" CR), valueRPT);
+      THEENGS_LOG_NOTICE(F("SRFB Repeat: %d" CR), valueRPT);
     }
 
     int pos2 = topic.lastIndexOf(SRFBminipulselengthKey);
     if (pos2 != -1) {
       pos2 = pos2 + strlen(SRFBminipulselengthKey);
       valueMiniPLSL = (topic.substring(pos2, pos2 + 3)).toInt();
-      Log.notice(F("RF Mini Pulse Lgth: %d" CR), valueMiniPLSL);
+      THEENGS_LOG_NOTICE(F("RF Mini Pulse Lgth: %d" CR), valueMiniPLSL);
     }
 
     int pos3 = topic.lastIndexOf(SRFBmaxipulselengthKey);
     if (pos3 != -1) {
       pos3 = pos3 + strlen(SRFBmaxipulselengthKey);
       valueMaxiPLSL = (topic.substring(pos3, pos3 + 2)).toInt();
-      Log.notice(F("RF Maxi Pulse Lgth: %d" CR), valueMaxiPLSL);
+      THEENGS_LOG_NOTICE(F("RF Maxi Pulse Lgth: %d" CR), valueMaxiPLSL);
     }
 
     int pos4 = topic.lastIndexOf(SRFBsyncKey);
     if (pos4 != -1) {
       pos4 = pos4 + strlen(SRFBsyncKey);
       valueSYNC = (topic.substring(pos4, pos4 + 2)).toInt();
-      Log.notice(F("RF sync: %d" CR), valueSYNC);
+      THEENGS_LOG_NOTICE(F("RF sync: %d" CR), valueSYNC);
     }
 
-    Log.trace(F("MQTTtoSRFB prts" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoSRFB prts" CR));
     if (valueRPT == 0)
       valueRPT = 1;
     if (valueMiniPLSL == 0)
@@ -227,13 +243,13 @@ void MQTTtoSRFB(char* topicOri, char* datacallback) {
     if (pos != -1) {
       pos = pos + +strlen(SRFBRptKey);
       valueRPT = (topic.substring(pos, pos + 1)).toInt();
-      Log.notice(F("SRFB Repeat: %d" CR), valueRPT);
+      THEENGS_LOG_NOTICE(F("SRFB Repeat: %d" CR), valueRPT);
     }
     if (valueRPT == 0)
       valueRPT = 1;
 
     byte message_b[RF_MESSAGE_SIZE];
-    _hexToRaw(datacallback, message_b, RF_MESSAGE_SIZE);
+    TheengsUtils::_hexToRaw(datacallback, message_b, RF_MESSAGE_SIZE);
     _rfbSend(message_b, valueRPT);
     // Acknowledgement to the GTWRF topic
     pub(subjectGTWSRFBtoMQTT, datacallback); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
@@ -241,21 +257,21 @@ void MQTTtoSRFB(char* topicOri, char* datacallback) {
 }
 #  endif
 #  if jsonReceiving
-void MQTTtoSRFB(char* topicOri, JsonObject& SRFBdata) {
+void XtoSRFB(const char* topicOri, JsonObject& SRFBdata) {
   // RF DATA ANALYSIS
   const char* raw = SRFBdata["raw"];
   int valueRPT = SRFBdata["repeat"] | 1;
   if (cmpToMainTopic(topicOri, subjectMQTTtoSRFB)) {
-    Log.trace(F("MQTTtoSRFB json" CR));
+    THEENGS_LOG_TRACE(F("MQTTtoSRFB json" CR));
     if (raw) { // send raw in priority when defined in the json
-      Log.trace(F("MQTTtoSRFB raw ok" CR));
+      THEENGS_LOG_TRACE(F("MQTTtoSRFB raw ok" CR));
       byte message_b[RF_MESSAGE_SIZE];
-      _hexToRaw(raw, message_b, RF_MESSAGE_SIZE);
+      TheengsUtils::_hexToRaw(raw, message_b, RF_MESSAGE_SIZE);
       _rfbSend(message_b, valueRPT);
     } else {
       unsigned long data = SRFBdata["value"];
       if (data != 0) {
-        Log.notice(F("MQTTtoSRFB data ok" CR));
+        THEENGS_LOG_NOTICE(F("MQTTtoSRFB data ok" CR));
         int valueMiniPLSL = SRFBdata["val_Tlow"];
         int valueMaxiPLSL = SRFBdata["val_Thigh"];
         int valueSYNC = SRFBdata["delay"];
@@ -269,10 +285,10 @@ void MQTTtoSRFB(char* topicOri, JsonObject& SRFBdata) {
         if (valueSYNC == 0)
           valueSYNC = 9500;
 
-        Log.notice(F("SRFB Repeat: %d" CR), valueRPT);
-        Log.notice(F("RF Mini Pulse Lgth: %d" CR), valueMiniPLSL);
-        Log.notice(F("RF Maxi Pulse Lgth: %d" CR), valueMaxiPLSL);
-        Log.notice(F("RF sync: %d" CR), valueSYNC);
+        THEENGS_LOG_NOTICE(F("SRFB Repeat: %d" CR), valueRPT);
+        THEENGS_LOG_NOTICE(F("RF Mini Pulse Lgth: %d" CR), valueMiniPLSL);
+        THEENGS_LOG_NOTICE(F("RF Maxi Pulse Lgth: %d" CR), valueMaxiPLSL);
+        THEENGS_LOG_NOTICE(F("RF sync: %d" CR), valueSYNC);
 
         byte hex_valueMiniPLSL[2];
         hex_valueMiniPLSL[0] = (int)((valueMiniPLSL >> 8) & 0xFF);
@@ -298,11 +314,12 @@ void MQTTtoSRFB(char* topicOri, JsonObject& SRFBdata) {
         memcpy(message_b + 4, hex_valueMaxiPLSL, 2);
         memcpy(message_b + 6, hex_data, 3);
 
-        Log.notice(F("MQTTtoSRFB OK" CR));
+        THEENGS_LOG_NOTICE(F("MQTTtoSRFB OK" CR));
         _rfbSend(message_b, valueRPT);
-        pub(subjectGTWSRFBtoMQTT, SRFBdata); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
+        SRFBdata["origin"] = subjectGTWSRFBtoMQTT;
+        enqueueJsonObject(SRFBdata); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
       } else {
-        Log.error(F("MQTTtoSRFB error decoding value" CR));
+        THEENGS_LOG_ERROR(F("MQTTtoSRFB error decoding value" CR));
       }
     }
   }
diff --git a/main/ZgatewayWeatherStation.ino b/main/gatewayWeatherStation.cpp
similarity index 81%
rename from main/ZgatewayWeatherStation.ino
rename to main/gatewayWeatherStation.cpp
index e177aa2..bf139bb 100644
--- a/main/ZgatewayWeatherStation.ino
+++ b/main/gatewayWeatherStation.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
   This gateway enables to:
@@ -27,29 +27,28 @@
 
 #ifdef ZgatewayWeatherStation
 #  include <WeatherStationDataRx.h>
+
+#  include "TheengsCommon.h"
+#  include "config_WeatherStation.h"
+
 WeatherStationDataRx wsdr(RF_WS_RECEIVER_GPIO, true);
 
 void PairedDeviceAdded(byte newID) {
-#  if defined(ESP8266) || defined(ESP32)
-  Serial.printf("ZgatewayWeatherStation: New device paired %d\r\n", newID);
-#  else
-  Serial.print("ZgatewayWeatherStation: New device paired ");
-  Serial.println(newID, DEC);
-#  endif
+  Serial.printf("gatewayWeatherStation: New device paired %d\r\n", newID);
   StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
   JsonObject RFdata = RFdataBuffer.to<JsonObject>();
   RFdata["sensor"] = newID;
   RFdata["action"] = "paired";
   RFdata["origin"] = subjectRFtoMQTT;
-  handleJsonEnqueue(RFdata);
+  enqueueJsonObject(RFdata);
   wsdr.pair(NULL, PairedDeviceAdded);
 }
 
 void setupWeatherStation() {
-  Log.notice(F("RF_WS_RECEIVER_GPIO %d" CR), RF_WS_RECEIVER_GPIO);
+  THEENGS_LOG_NOTICE(F("RF_WS_RECEIVER_GPIO %d" CR), RF_WS_RECEIVER_GPIO);
   wsdr.begin();
   wsdr.pair(NULL, PairedDeviceAdded);
-  Log.trace(F("ZgatewayWeatherStation setup done " CR));
+  THEENGS_LOG_TRACE(F("gatewayWeatherStation setup done " CR));
 }
 
 void sendWindSpeedData(byte id, float wind_speed, byte battery_status) {
@@ -61,8 +60,8 @@ void sendWindSpeedData(byte id, float wind_speed, byte battery_status) {
     RFdata["wind_speed"] = wind_speed;
     RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
     RFdata["origin"] = subjectRFtoMQTT;
-    handleJsonEnqueue(RFdata);
-    Log.trace(F("Store wind speed val: %lu" CR), MQTTvalue);
+    enqueueJsonObject(RFdata);
+    THEENGS_LOG_TRACE(F("Store wind speed val: %lu" CR), MQTTvalue);
     storeSignalValue(MQTTvalue);
   }
 }
@@ -76,8 +75,8 @@ void sendRainData(byte id, float rain_volume, byte battery_status) {
     RFdata["rain_volume"] = rain_volume;
     RFdata["battery"] = bitRead(battery_status, 1) == 0 ? "OK" : "Low";
     RFdata["origin"] = subjectRFtoMQTT;
-    handleJsonEnqueue(RFdata);
-    Log.trace(F("Store rain_volume: %lu" CR), MQTTvalue);
+    enqueueJsonObject(RFdata);
+    THEENGS_LOG_TRACE(F("Store rain_volume: %lu" CR), MQTTvalue);
     storeSignalValue(MQTTvalue);
   }
 }
@@ -92,8 +91,8 @@ void sendWindData(byte id, int wind_direction, float wind_gust, byte battery_sta
     RFdata["wind_gust"] = wind_gust;
     RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
     RFdata["origin"] = subjectRFtoMQTT;
-    handleJsonEnqueue(RFdata);
-    Log.trace(F("Store wind data val: %lu" CR), MQTTvalue);
+    enqueueJsonObject(RFdata);
+    THEENGS_LOG_TRACE(F("Store wind data val: %lu" CR), MQTTvalue);
     storeSignalValue(MQTTvalue);
   }
 }
@@ -109,32 +108,32 @@ void sendTemperatureData(byte id, float temperature, int humidity, byte battery_
     RFdata["humidity"] = humidity;
     RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
     RFdata["origin"] = subjectRFtoMQTT;
-    handleJsonEnqueue(RFdata);
-    Log.trace(F("Store temp val: %lu" CR), MQTTvalue);
+    enqueueJsonObject(RFdata);
+    THEENGS_LOG_TRACE(F("Store temp val: %lu" CR), MQTTvalue);
     storeSignalValue(MQTTvalue);
   }
 }
 
-void ZgatewayWeatherStationtoMQTT() {
+void ZgatewayWeatherStationtoX() {
   char newData = wsdr.readData();
   switch (newData) {
     case 'T':
-      Log.trace(F("Temperature" CR));
+      THEENGS_LOG_TRACE(F("Temperature" CR));
       sendTemperatureData(wsdr.sensorID(), wsdr.readTemperature(), wsdr.readHumidity(), wsdr.batteryStatus());
       break;
 
     case 'S':
-      Log.trace(F("Wind speed" CR));
+      THEENGS_LOG_TRACE(F("Wind speed" CR));
       sendWindSpeedData(wsdr.sensorID(), wsdr.readWindSpeed(), wsdr.batteryStatus());
       break;
 
     case 'G':
-      Log.trace(F("Wind direction" CR));
+      THEENGS_LOG_TRACE(F("Wind direction" CR));
       sendWindData(wsdr.sensorID(), wsdr.readWindDirection(), wsdr.readWindGust(), wsdr.batteryStatus());
       break;
 
     case 'R':
-      Log.trace(F("Rain volume" CR));
+      THEENGS_LOG_TRACE(F("Rain volume" CR));
       sendRainData(wsdr.sensorID(), wsdr.readRainVolume(), wsdr.batteryStatus());
       break;
 
diff --git a/main/main.cpp b/main/main.cpp
new file mode 100644
index 0000000..64a2c22
--- /dev/null
+++ b/main/main.cpp
@@ -0,0 +1,3839 @@
+/*
+  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
+   Send and receiving command by MQTT
+
+  This program enables to:
+ - receive MQTT data from a topic and send signal (RF, IR, BLE, GSM)  corresponding to the received MQTT data
+ - publish MQTT data to a different topic related to received signals (RF, IR, BLE, GSM)
+
+  Copyright: (c)Florian ROBERT
+
+    This file is part of OpenMQTTGateway.
+
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+
+#include <PicoMQTT.h>
+
+#include <memory>
+#include <queue>
+
+#include "LEDManager.h"
+#include "TheengsCommon.h"
+#include "TheengsUtils.h"
+
+#if defined(CONFIG_IDF_TARGET_ESP32) && !defined(ZgatewayBT) && !defined(USE_BLUFI)
+#  include "esp_bt.h" // esp_bt_mem_release() — BT DRAM reclaim in setup()
+#endif
+
+GatewayState gatewayState = GatewayState::WAITING_ONBOARDING;
+static GatewayState previousGatewayState = gatewayState;
+
+// Macros and structure to enable the duplicates removing on the following gateways
+#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) || defined(ZgatewayRTL_433)
+// array to store previous received RFs, IRs codes and their timestamps
+struct ReceivedSignal {
+  uint64_t value;
+  uint32_t time;
+};
+
+ReceivedSignal receivedSignal[] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
+
+#  define struct_size (sizeof(receivedSignal) / sizeof(ReceivedSignal))
+#endif
+
+int queueLength = -1; // We want to give one cycle of the loop before starting modules that are big msgs producers (example BT), to avoid queue overloading
+unsigned long queueLengthSum = 0;
+unsigned long blockedMessages = 0;
+unsigned long receivedMessages = 0;
+int maxQueueLength = 0;
+
+//Time used to wait for an interval before measures
+unsigned long timer_sys_measures = 0;
+
+// Time used to wait before system checkings
+unsigned long timer_sys_checks = 0;
+
+// First Start of offline mode modules
+bool firstStart = true;
+
+/**
+ * Deep-sleep for the ESP8266 & ESP32 we need some form of indicator that we have posted the measurements and am ready to deep sleep.
+ * Set this to true in the sensor code after publishing the measurement.
+ */
+bool ready_to_sleep = false;
+
+LEDManager ledManager;
+
+struct JsonBundle {
+  StaticJsonDocument<JSON_MSG_BUFFER> doc;
+};
+
+std::queue<std::string> jsonQueue;
+
+#ifdef ESP32
+#  include <driver/adc.h>
+// Mutex  to protect the queue
+SemaphoreHandle_t xQueueMutex;
+// Mutex to protect mqtt publish
+SemaphoreHandle_t xMqttMutex;
+#endif
+
+StaticJsonDocument<JSON_MSG_BUFFER> modulesBuffer;
+JsonArray modules = modulesBuffer.to<JsonArray>();
+bool ethConnected = false;
+char mqtt_topic[parameters_size + 1] = Base_Topic;
+char gateway_name[parameters_size + 1] = Gateway_Name;
+unsigned long lastDiscovery = 0;
+
+#if BLEDecryptor
+// BLE_AES defaults to "" (see User_config.h) so encrypted PVVX/BTHome/Victron
+// frames are only decrypted when a per-MAC key is configured (ble_aes_keys) or
+// the user enters a default. Sites shipping a stock default key can still set
+// it at build time via -DBLE_AES='"<32-hex-key>"'.
+char ble_aes[parameters_size] = BLE_AES;
+StaticJsonDocument<JSON_BLE_AES_CUSTOM_KEYS> ble_aes_keys;
+#endif
+
+#if !MQTT_BROKER_MODE
+ss_cnt_parameters cnt_parameters_array[cnt_parameters_array_size] = CNT_PARAMS_ARR;
+#endif
+
+#if defined(ESP32)
+#  include <Preferences.h>
+Preferences preferences;
+#endif
+
+// Modules config inclusion
+#if defined(ZwebUI) && defined(ESP32)
+#  include "config_WebUI.h"
+#endif
+#if defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZgatewayPilight) || defined(ZactuatorSomfy) || defined(ZgatewayRTL_433)
+#  include "config_RF.h"
+#endif
+#ifdef ZgatewayWeatherStation
+#  include "config_WeatherStation.h"
+#endif
+#ifdef ZgatewayGFSunInverter
+#  include "config_GFSunInverter.h"
+#endif
+#ifdef ZgatewayLORA
+#  include "config_LORA.h"
+#endif
+#ifdef ZgatewaySRFB
+#  include "config_SRFB.h"
+#endif
+#ifdef ZgatewayBT
+#  include "config_BT.h"
+#endif
+#ifdef ZgatewayIR
+#  include "config_IR.h"
+#endif
+#ifdef Zgateway2G
+#  include "config_2G.h"
+#endif
+#ifdef ZactuatorONOFF
+#  include "config_ONOFF.h"
+#endif
+#ifdef ZsensorINA226
+#  include "config_INA226.h"
+#endif
+#ifdef ZsensorHCSR501
+#  include "config_HCSR501.h"
+#endif
+#ifdef ZsensorADC
+#  include "config_ADC.h"
+#endif
+#ifdef ZsensorBH1750
+#  include "config_BH1750.h"
+#endif
+#ifdef ZsensorMQ2
+#  include "config_MQ2.h"
+#endif
+#ifdef ZsensorTEMT6000
+#  include "config_TEMT6000.h"
+#endif
+#ifdef ZsensorTSL2561
+#  include "config_TSL2561.h"
+#endif
+#ifdef ZsensorBME280
+#  include "config_BME280.h"
+#endif
+#ifdef ZsensorHTU21
+#  include "config_HTU21.h"
+#endif
+#ifdef ZsensorLM75
+#  include "config_LM75.h"
+#endif
+#ifdef ZsensorAHTx0
+#  include "config_AHTx0.h"
+#endif
+#ifdef ZsensorRN8209
+#  include "config_RN8209.h"
+#endif
+#ifdef ZsensorHCSR04
+#  include "config_HCSR04.h"
+#endif
+#ifdef ZsensorC37_YL83_HMRD
+#  include "config_C37_YL83_HMRD.h"
+#endif
+#ifdef ZsensorDHT
+#  include "config_DHT.h"
+#endif
+#ifdef ZsensorSHTC3
+#  include "config_SHTC3.h"
+#endif
+#ifdef ZsensorDS1820
+#  include "config_DS1820.h"
+#endif
+#ifdef ZgatewayRFM69
+#  include "config_RFM69.h"
+#endif
+#ifdef ZsensorGPIOInput
+#  include "config_GPIOInput.h"
+#endif
+#ifdef ZsensorGPIOKeyCode
+#  include "config_GPIOKeyCode.h"
+#endif
+#ifdef ZsensorTouch
+#  include "config_Touch.h"
+#endif
+#ifdef ZmqttDiscovery
+#  include "config_mqttDiscovery.h"
+#endif
+#ifdef ZactuatorFASTLED
+#  include "config_FASTLED.h"
+#endif
+#ifdef ZactuatorPWM
+#  include "config_PWM.h"
+#endif
+#ifdef ZactuatorSomfy
+#  include "config_Somfy.h"
+#endif
+#if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
+#  include "config_M5.h"
+#endif
+#if defined(ZdisplaySSD1306)
+#  include "config_SSD1306.h"
+#endif
+#if defined(ZgatewaySERIAL)
+#  include "config_SERIAL.h"
+#endif
+#if defined(USE_BLUFI) && defined(ESP32)
+extern bool isBlufiConnected();
+extern bool isStaConnecting();
+extern bool startBlufi();
+extern bool stopBlufi();
+extern void set_blufi_mfg_data();
+#endif
+/*------------------------------------------------------------------------*/
+
+bool pub(JsonObject& data);
+bool pubMQTT(const char* topic, const char* payload);
+bool pubMQTT(const char* topic, const char* payload, bool retainFlag);
+bool pubMQTT(String topic, const char* payload);
+bool pubMQTT(const char* topic, unsigned long payload);
+bool pubMQTT(const char* topic, unsigned long long payload);
+bool pubMQTT(const char* topic, String payload);
+bool pubMQTT(String topic, String payload);
+bool pubMQTT(String topic, int payload);
+bool pubMQTT(String topic, unsigned long long payload);
+bool pubMQTT(String topic, float payload);
+bool pubMQTT(const char* topic, float payload);
+bool pubMQTT(const char* topic, int payload);
+bool pubMQTT(const char* topic, unsigned int payload);
+bool pubMQTT(const char* topic, long payload);
+bool pubMQTT(const char* topic, double payload);
+bool pubMQTT(String topic, unsigned long payload);
+void checkButton();
+void ESPRestart(byte reason);
+void eraseConfig();
+void readCntParameters(int index);
+void saveConfig();
+void receivingDATA(const char* topicOri, const char* datacallback);
+void updateAndHandleLEDsTask(void* pvParameters);
+void updateAndHandleLEDsTask();
+bool loadConfigFromFlash();
+void setupWiFiManager();
+void setOTA();
+void setupCommonRF();
+void sleep();
+bool checkForUpdates();
+String stateMeasures();
+String stateRFMeasures();
+int getMin();
+void XtoRFset(const char* topicOri, JsonObject& RFdata);
+void MQTTHttpsFWUpdate(const char* topicOri, JsonObject& HttpsFwUpdateData);
+void setup_ethernet_esp32();
+void setupTLS(int index = CNT_DEFAULT_INDEX);
+void XtoSYS(const char* topicOri, JsonObject& SYSdata);
+
+char ota_pass[parameters_size] = gw_password;
+#ifdef USE_MAC_AS_GATEWAY_NAME
+#  undef WifiManager_ssid
+#  undef ota_hostname
+#  define MAC_NAME_MAX_LEN 30
+char WifiManager_ssid[MAC_NAME_MAX_LEN];
+char ota_hostname[MAC_NAME_MAX_LEN];
+#endif
+int failure_number_ntwk = 0; // number of failure connecting to network
+int failure_number_mqtt = 0; // number of failure connecting to MQTT
+
+static unsigned long last_ota_activity_millis = 0;
+// Global struct to store live SYS configuration data
+SYSConfig_s SYSConfig;
+
+bool failSafeMode = false;
+bool ProcessLock = true; // Process lock when we want to use a critical function like OTA for example
+bool mqttSetupPending = true;
+static int cnt_index = CNT_DEFAULT_INDEX;
+
+#ifdef ESP32
+#  include <ArduinoOTA.h>
+#  include <FS.h>
+#  include <SPIFFS.h>
+#  include <esp_task_wdt.h>
+#  include <nvs.h>
+#  include <nvs_flash.h>
+
+bool BTProcessLock = true; // Process lock when we want to use a critical function like OTA for example, at start to true so as to wait for critical functions to be performed before BLE start
+
+#  if !defined(NO_INT_TEMP_READING)
+// ESP32 internal temperature reading
+#    include <stdio.h>
+
+#    include "rom/ets_sys.h"
+#    include "soc/rtc_cntl_reg.h"
+#    include "soc/sens_reg.h"
+#  endif
+#  ifdef ESP32_ETHERNET
+#    include <ETH.h>
+void WiFiEvent(WiFiEvent_t event);
+#  endif
+
+#  include <WiFiClientSecure.h>
+#  include <WiFiMulti.h>
+WiFiMulti wifiMulti;
+#  include <WiFiManager.h>
+#  ifdef MDNS_SD
+#    include <ESPmDNS.h>
+#  endif
+
+#elif defined(ESP8266)
+#  include <ArduinoOTA.h>
+#  include <DNSServer.h>
+#  include <ESP8266WebServer.h>
+#  include <ESP8266WiFi.h>
+#  include <ESP8266WiFiMulti.h>
+#  include <FS.h>
+#  include <WiFiManager.h>
+X509List caCert;
+#  if MQTT_SECURE_SIGNED_CLIENT
+X509List* pClCert = nullptr;
+PrivateKey* pClKey = nullptr;
+#  endif
+ESP8266WiFiMulti wifiMulti;
+#  ifdef MDNS_SD
+#    include <ESP8266mDNS.h>
+#  endif
+
+#else
+#  include <Ethernet.h>
+#endif
+
+void handle_autodiscovery() {
+#ifdef ZmqttDiscovery
+  static bool connectedOnce = false;
+  const unsigned long now = millis();
+
+  // at first connection we publish the discovery payloads
+  // or, when we have just re-connected (only when discovery_republish_on_reconnect is enabled)
+  const bool publishDiscovery = SYSConfig.discovery && (!connectedOnce || discovery_republish_on_reconnect);
+
+  if (publishDiscovery) {
+    pubMqttDiscovery();
+#  ifdef ZgatewayLORA
+    launchLORADiscovery(true);
+#  endif
+#  ifdef ZgatewayBT
+    launchBTDiscovery(true);
+#  endif
+#  ifdef ZgatewayRTL_433
+    launchRTL_433Discovery(true);
+#  endif
+  }
+
+  connectedOnce = true;
+#endif
+}
+
+#if MQTT_BROKER_MODE
+
+class MQTTServer : public PicoMQTT::Server {
+public:
+  size_t get_client_count() const {
+    return clients.size();
+  }
+
+  bool connected() const {
+    return !clients.empty();
+  }
+
+protected:
+  virtual void on_subscribe(const char* client_id, const char* topic) override {
+    // Whenever a client subscribes successfully to some topic, see if this is likely a subscription to a
+    // autodiscovery topic.  If it is, fire handle_autodiscovery().
+    const String pattern(topic);
+    const bool is_autodiscovery_subscription = (pattern == "#") || (pattern.startsWith(String(discovery_prefix) + "/"));
+    if (is_autodiscovery_subscription)
+      handle_autodiscovery();
+  }
+};
+
+std::unique_ptr<MQTTServer> mqtt;
+#else
+std::unique_ptr< ::Client> eClient;
+std::unique_ptr<PicoMQTT::Client> mqtt;
+#endif
+
+/*
+ * Dispatch json messages towards the communication layer
+ *
+*/
+bool jsonDispatch(JsonObject& data) {
+  bool res = false;
+  if (data.containsKey("origin") || data.containsKey("topic")) {
+    GatewayState previousGatewayState = gatewayState;
+    gatewayState = GatewayState::PROCESSING;
+#if message_UTCtimestamp == true
+    data["UTCtime"] = TheengsUtils::UTCtimestamp();
+#endif
+#if message_unixtimestamp == true
+    data["unixtime"] = TheengsUtils::unixtimestamp();
+#endif
+    if (data.containsKey("origin")) {
+      pubWebUI((char*)data["origin"].as<const char*>(), data);
+    }
+    if (SYSConfig.mqtt && !SYSConfig.offline) {
+      res = pub(data);
+    }
+#ifdef ZgatewaySERIAL
+    if (SYSConfig.serial) {
+      char jsonStr[JSON_MSG_BUFFER_MAX];
+      serializeJson(data, jsonStr);
+      receivingDATA("", jsonStr);
+      res = true; // Return the state from receivingDATA
+    }
+#endif
+    gatewayState = previousGatewayState; // restore the previous state
+  } else {
+    THEENGS_LOG_ERROR(F("No origin or topic in JSON filtered" CR));
+    gatewayState = GatewayState::ERROR;
+  }
+  return res;
+}
+
+// Add a document to the queue
+bool enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, int timeout) {
+  receivedMessages++;
+  if (jsonDoc.size() == 0) {
+    THEENGS_LOG_ERROR(F("Empty JSON, skipping" CR));
+    gatewayState = GatewayState::ERROR;
+    return true;
+  }
+  if (queueLength >= QueueSize) {
+    THEENGS_LOG_WARNING(F("%d Doc(s) in queue, doc blocked" CR), queueLength);
+    blockedMessages++;
+    return false;
+  }
+  THEENGS_LOG_TRACE(F("Enqueue JSON" CR));
+  std::string jsonString;
+  serializeJson(jsonDoc, jsonString);
+#ifdef ESP32
+  // Semaphore check before enqueueing a document
+  if (xSemaphoreTake(xQueueMutex, pdMS_TO_TICKS(timeout)) == pdFALSE) {
+    THEENGS_LOG_ERROR(F("xQueueMutex not taken" CR));
+    gatewayState = GatewayState::ERROR;
+    blockedMessages++;
+    return false;
+  }
+#endif
+  jsonQueue.push(jsonString);
+#ifdef ESP32
+  xSemaphoreGive(xQueueMutex);
+#endif
+  THEENGS_LOG_TRACE(F("Queue length: %d" CR), jsonQueue.size());
+  return true;
+}
+
+// Semaphore check before enqueueing a document with default timeout QueueSemaphoreTimeOutLoop
+bool enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc) {
+  return enqueueJsonObject(jsonDoc, QueueSemaphoreTimeOutLoop);
+}
+
+#ifdef ESP32
+#  include "mbedtls/sha256.h"
+
+std::string generateHash(const std::string& input) {
+  unsigned char hash[32];
+  mbedtls_sha256((unsigned char*)input.c_str(), input.length(), hash, 0);
+
+  char hashString[65]; // Room for null terminator
+  for (int i = 0; i < 32; ++i) {
+    sprintf(&hashString[i * 2], "%02x", hash[i]);
+  }
+
+  return std::string(hashString);
+}
+#else
+std::string generateHash(const std::string& input) {
+  return "Not implemented for ESP8266";
+}
+#endif
+
+/*
+ * Add the jsonObject id as a topic to the jsonObject origin
+ *
+*/
+void buildTopicFromId(JsonObject& Jsondata, const char* origin) {
+  if (!Jsondata.containsKey("id")) {
+    THEENGS_LOG_ERROR(F("No id in Jsondata" CR));
+    gatewayState = GatewayState::ERROR;
+    return;
+  }
+
+  std::string topic = Jsondata["id"].as<std::string>();
+
+  // Replace ":" in topic
+  size_t pos = topic.find(":");
+  while (pos != std::string::npos) {
+    topic.erase(pos, 1);
+    pos = topic.find(":", pos);
+  }
+#ifdef ZgatewayBT
+  if (BTConfig.pubBeaconUuidForTopic && !BTConfig.extDecoderEnable && Jsondata.containsKey("model_id") && Jsondata["model_id"].as<std::string>() == "IBEACON") {
+    if (Jsondata.containsKey("uuid")) {
+      topic = Jsondata["uuid"].as<std::string>();
+    } else {
+      THEENGS_LOG_ERROR(F("No uuid in Jsondata" CR));
+      gatewayState = GatewayState::ERROR;
+    }
+  }
+
+  if (BTConfig.extDecoderEnable && !Jsondata.containsKey("model"))
+    topic = BTConfig.extDecoderTopic.c_str();
+#endif
+  std::string subjectStr(origin);
+  topic = subjectStr + "/" + topic;
+
+  Jsondata["origin"] = topic;
+
+  THEENGS_LOG_TRACE(F("Origin: %s" CR), Jsondata["origin"].as<const char*>());
+}
+
+// Empty the documents queue
+void emptyQueue() {
+  queueLength = jsonQueue.size();
+  if (queueLength > maxQueueLength) {
+    maxQueueLength = queueLength;
+  }
+  if (queueLength <= 0) {
+    return;
+  }
+  THEENGS_LOG_TRACE(F("Dequeue JSON" CR));
+  DynamicJsonDocument jsonBuffer(JSON_MSG_BUFFER_MAX);
+  JsonObject obj = jsonBuffer.to<JsonObject>();
+#ifdef ESP32
+  if (xSemaphoreTake(xQueueMutex, pdMS_TO_TICKS(QueueSemaphoreTimeOutTask)) == pdFALSE) {
+    THEENGS_LOG_ERROR(F("xQueueMutex not taken" CR));
+    gatewayState = GatewayState::ERROR;
+    return;
+  }
+#endif
+  auto error = deserializeJson(jsonBuffer, jsonQueue.front());
+  jsonQueue.pop();
+#ifdef ESP32
+  xSemaphoreGive(xQueueMutex);
+#endif
+  if (error) {
+    THEENGS_LOG_ERROR(F("deserialize jsonQueue.front() failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+    gatewayState = GatewayState::ERROR;
+  } else {
+    if (jsonDispatch(obj))
+      queueLengthSum++;
+  }
+}
+
+/**
+ * @brief Publish the payload on default MQTT topic.
+ *
+ * @param topicori suffix to add on default MQTT Topic
+ * @param payload  the message to sends
+ * @param retainFlag true if you what a retain
+ */
+bool pub(const char* topicori, const char* payload, bool retainFlag) {
+  String topic = String(mqtt_topic) + String(gateway_name) + String(topicori);
+  return pubMQTT(topic.c_str(), payload, retainFlag);
+}
+
+/**
+ * @brief Publish the payload on default MQTT topic
+ *
+ * @param topicori suffix to add on default MQTT Topic
+ * @param data The Json Object that represents the message
+ */
+bool pub(JsonObject& data) {
+  bool res = false;
+  bool ret = sensor_Retain;
+  if (data.containsKey("retain") && data["retain"].is<bool>()) {
+    ret = data["retain"];
+    data.remove("retain");
+  }
+  if (data.size() == 0) {
+    THEENGS_LOG_ERROR(F("Empty JSON, not published" CR));
+    gatewayState = GatewayState::ERROR;
+    return res;
+  }
+  String topic;
+  if (data.containsKey("origin") && data["origin"].is<const char*>()) {
+    topic = String(mqtt_topic) + String(gateway_name) + String(data["origin"].as<const char*>());
+    data.remove("origin");
+  } else if (data.containsKey("topic") && data["topic"].is<const char*>()) {
+    topic = data["topic"].as<const char*>();
+    if (data.containsKey("info_topic") && data["info_topic"].is<const char*>()) {
+      // Sometimes it is necessary to provide information about the publishing topic, not just use it.
+      // This is the case, for example, for the RF2MQTT device trigger announcement message where the
+      // temporary variable info_topic provides information about the topic that will be used to publish the message,
+      // and it can be different of current message topic (This is a clever pun, I hope it's clear).
+      data["topic"].set(data["info_topic"]);
+      data.remove("info_topic");
+    } else {
+      data.remove("topic");
+    }
+
+  } else {
+    THEENGS_LOG_ERROR(F("No topic or origin in JSON, not published" CR));
+    gatewayState = GatewayState::ERROR;
+    return res;
+  }
+
+#if valueAsATopic
+#  ifdef ZgatewayPilight
+  String value = data["value"];
+  String protocol = data["protocol"];
+  if (value != "null" && value != 0) {
+    topic = topic + "/" + protocol + "/" + value;
+  }
+#  else
+  uint64_t value = data["value"];
+  if (value != 0) {
+    topic = topic + "/" + TheengsUtils::toString(value);
+  }
+#  endif
+#endif
+
+#if jsonPublishing
+  String dataAsString = "";
+  serializeJson(data, dataAsString);
+  res = pubMQTT(topic.c_str(), dataAsString.c_str(), ret);
+#endif
+
+#if simplePublishing
+  THEENGS_LOG_TRACE(F("simplePub - ON" CR));
+  // Loop through all the key-value pairs in obj
+  for (JsonPair p : data) {
+#  if defined(ESP8266)
+    yield();
+#  endif
+    if (p.value().is<uint64_t>() && strcmp(p.key().c_str(), "rssi") != 0) { //test rssi , bypass solution due to the fact that a int is considered as an uint64_t
+      if (strcmp(p.key().c_str(), "value") == 0) { // if data is a value we don't integrate the name into the topic
+        res = pubMQTT(topic, p.value().as<uint64_t>());
+      } else { // if data is not a value we integrate the name into the topic
+        res = pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<uint64_t>());
+      }
+    } else if (p.value().is<int>()) {
+      res = pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<int>());
+    } else if (p.value().is<float>()) {
+      res = pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<float>());
+    } else if (p.value().is<char*>()) {
+      res = pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<const char*>());
+    }
+  }
+#endif
+  return res;
+}
+
+/**
+ * @brief Publish the payload on default MQTT topic
+ *
+ * @param topicori suffix to add on default MQTT Topic
+ * @param payload the message to sends
+ */
+bool pub(const char* topicori, const char* payload) {
+  String topic = String(mqtt_topic) + String(gateway_name) + String(topicori);
+  return pubMQTT(topic, payload);
+}
+
+/**
+ * @brief Low level MQTT functions without retain
+ *
+ * @param topic  the topic
+ * @param payload  the payload
+ */
+bool pubMQTT(const char* topic, const char* payload) {
+  return pubMQTT(topic, payload, sensor_Retain);
+}
+
+/**
+ * @brief Very Low level MQTT functions with retain Flag
+ *
+ * @param topic the topic
+ * @param payload the payload
+ * @param retainFlag  true if retain the retain Flag
+ */
+bool pubMQTT(const char* topic, const char* payload, bool retainFlag) {
+  bool res = false;
+  if (SYSConfig.mqtt && !SYSConfig.offline) {
+#ifdef ESP32
+    if (xSemaphoreTake(xMqttMutex, pdMS_TO_TICKS(QueueSemaphoreTimeOutTask)) == pdFALSE) {
+      THEENGS_LOG_ERROR(F("xMqttMutex not taken" CR));
+      gatewayState = GatewayState::ERROR;
+      return res;
+    }
+#endif
+    if (mqtt && mqtt->connected()) {
+      THEENGS_LOG_NOTICE(F("[ OMG->MQTT ] topic: %s msg: %s " CR), topic, payload);
+      res = mqtt->publish(topic, payload, 0, retainFlag);
+    } else {
+      THEENGS_LOG_WARNING(F("MQTT not connected, aborting the publication" CR));
+    }
+#ifdef ESP32
+    xSemaphoreGive(xMqttMutex);
+#endif
+  } else {
+    THEENGS_LOG_NOTICE(F("[ OMG->MQTT deactivated or offline] topic: %s msg: %s " CR), topic, payload);
+  }
+  return res;
+}
+
+bool pubMQTT(String topic, const char* payload) {
+  return pubMQTT(topic.c_str(), payload);
+}
+
+bool pubMQTT(const char* topic, unsigned long payload) {
+  char val[11];
+  sprintf(val, "%lu", payload);
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(const char* topic, unsigned long long payload) {
+  char val[21];
+  sprintf(val, "%llu", payload);
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(const char* topic, String payload) {
+  return pubMQTT(topic, payload.c_str());
+}
+
+bool pubMQTT(String topic, String payload) {
+  return pubMQTT(topic.c_str(), payload.c_str());
+}
+
+bool pubMQTT(String topic, int payload) {
+  return pubMQTT(topic.c_str(), payload);
+}
+
+bool pubMQTT(String topic, unsigned long long payload) {
+  return pubMQTT(topic.c_str(), payload);
+}
+
+bool pubMQTT(String topic, float payload) {
+  return pubMQTT(topic.c_str(), payload);
+}
+
+bool pubMQTT(const char* topic, float payload) {
+  char val[16];
+  int n = snprintf(val, sizeof(val), "%.1f", payload);
+  if (n < 0 || static_cast<size_t>(n) >= sizeof(val)) {
+    return false;
+  }
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(const char* topic, int payload) {
+  char val[12];
+  sprintf(val, "%d", payload);
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(const char* topic, unsigned int payload) {
+  char val[12];
+  sprintf(val, "%u", payload);
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(const char* topic, long payload) {
+  char val[12];
+  sprintf(val, "%ld", payload);
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(const char* topic, double payload) {
+  char val[24];
+  int n = snprintf(val, sizeof(val), "%f", payload);
+  if (n < 0 || static_cast<size_t>(n) >= sizeof(val)) {
+    return false;
+  }
+  return pubMQTT(topic, val);
+}
+
+bool pubMQTT(String topic, unsigned long payload) {
+  return pubMQTT(topic.c_str(), payload);
+}
+
+void delayWithOTA(long waitMillis) {
+  long waitStep = 100;
+  for (long waitedMillis = 0; waitedMillis < waitMillis; waitedMillis += waitStep) {
+#ifndef ESPWifiManualSetup
+    checkButton(); // check if a reset of wifi/mqtt settings is asked
+#endif
+    ArduinoOTA.handle();
+#if defined(ZwebUI) && defined(ESP32)
+    WebUILoop();
+#endif
+#ifdef ESP32
+    //esp_task_wdt_reset();
+#endif
+    delay(waitStep);
+  }
+}
+
+void SYSConfig_init() {
+  SYSConfig.mqtt = DEFAULT_MQTT;
+  SYSConfig.serial = DEFAULT_SERIAL;
+  SYSConfig.offline = DEFAULT_OFFLINE;
+#if USE_BLUFI
+  SYSConfig.blufi = DEFAULT_BLUFI;
+#endif
+#ifdef ZmqttDiscovery
+  SYSConfig.discovery = DEFAULT_DISCOVERY;
+#endif
+#ifdef LED_ADDRESSABLE
+  SYSConfig.rgbbrightness = DEFAULT_ADJ_BRIGHTNESS;
+#endif
+  SYSConfig.powerMode = DEFAULT_LOW_POWER_MODE;
+}
+
+void SYSConfig_fromJson(JsonObject& SYSdata) {
+  Config_update(SYSdata, "mqtt", SYSConfig.mqtt);
+  Config_update(SYSdata, "serial", SYSConfig.serial);
+  Config_update(SYSdata, "offline", SYSConfig.offline);
+#if USE_BLUFI
+  Config_update(SYSdata, "blufi", SYSConfig.blufi);
+#endif
+#ifdef ZmqttDiscovery
+  Config_update(SYSdata, "disc", SYSConfig.discovery);
+#endif
+#ifdef LED_ADDRESSABLE
+  Config_update(SYSdata, "rgbb", SYSConfig.rgbbrightness);
+#endif
+  Config_update(SYSdata, "powermode", SYSConfig.powerMode);
+}
+
+#ifdef ESP32
+void SYSConfig_save() {
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  JsonObject SYSdata = jsonBuffer.to<JsonObject>();
+  SYSdata["mqtt"] = SYSConfig.mqtt;
+  SYSdata["serial"] = SYSConfig.serial;
+  SYSdata["offline"] = SYSConfig.offline;
+  SYSdata["powermode"] = SYSConfig.powerMode;
+#  if USE_BLUFI
+  SYSdata["blufi"] = SYSConfig.blufi;
+#  endif
+#  ifdef ZmqttDiscovery
+  SYSdata["disc"] = SYSConfig.discovery;
+#  endif
+#  ifdef LED_ADDRESSABLE
+  SYSdata["rgbb"] = SYSConfig.rgbbrightness;
+#  endif
+  String conf = "";
+  serializeJson(jsonBuffer, conf);
+  preferences.begin(Gateway_Short_Name, false);
+  int result = preferences.putString("SYSConfig", conf);
+  preferences.end();
+  THEENGS_LOG_NOTICE(F("SYS Config_save: %s, result: %d" CR), conf.c_str(), result);
+}
+#else // Function not available for ESP8266
+void SYSConfig_save() {}
+#endif
+
+bool cmpToMainTopic(const char* topicOri, const char* toAdd) {
+  if (strcmp(topicOri, toAdd) == 0)
+    return true;
+  // Is string "<mqtt_topic><gateway_name><toAdd>" equal to "<topicOri>"?
+  // Compare first part with first chunk
+  if (strncmp(topicOri, mqtt_topic, strlen(mqtt_topic)) != 0)
+    return false;
+  // Move pointer of sizeof chunk
+  topicOri += strlen(mqtt_topic);
+  // And so on...
+  if (strncmp(topicOri, gateway_name, strlen(gateway_name)) != 0)
+    return false;
+  topicOri += strlen(gateway_name);
+  if (strncmp(topicOri, toAdd, strlen(toAdd)) != 0)
+    return false;
+  return true;
+}
+
+#if defined(ESP32)
+void SYSConfig_load() {
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  preferences.begin(Gateway_Short_Name, true);
+  if (preferences.isKey("SYSConfig")) {
+    auto error = deserializeJson(jsonBuffer, preferences.getString("SYSConfig", "{}"));
+    preferences.end();
+    if (error) {
+      THEENGS_LOG_ERROR(F("SYS config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      gatewayState = GatewayState::ERROR;
+      return;
+    }
+    if (jsonBuffer.isNull()) {
+      THEENGS_LOG_WARNING(F("SYS config is null" CR));
+      return;
+    }
+    JsonObject jo = jsonBuffer.as<JsonObject>();
+    SYSConfig_fromJson(jo);
+    THEENGS_LOG_NOTICE(F("SYS config loaded" CR));
+  } else {
+    preferences.end();
+    THEENGS_LOG_NOTICE(F("SYS config not found" CR));
+  }
+}
+#else // Function not available for ESP8266
+void SYSConfig_load() {}
+#endif
+
+#if defined(MDNS_SD)
+std::pair<String, uint16_t> discoverMQTTbroker() {
+  THEENGS_LOG_TRACE(F("Browsing for MQTT service" CR));
+  int n = MDNS.queryService("mqtt", "tcp");
+  if (n == 0) {
+    THEENGS_LOG_WARNING(F("no services found" CR));
+  } else {
+    THEENGS_LOG_TRACE(F("%d service(s) found" CR), n);
+    for (int i = 0; i < n; ++i) {
+      THEENGS_LOG_TRACE(F("Service %d %s found" CR), i, MDNS.hostname(i).c_str());
+#  if defined(ESP32)
+      THEENGS_LOG_TRACE(F("IP %s Port %d" CR), MDNS.address(i).toString().c_str(), MDNS.port(i));
+#  else
+      THEENGS_LOG_TRACE(F("IP %s Port %d" CR), MDNS.IP(i).toString().c_str(), MDNS.port(i));
+#  endif
+    }
+    if (n == 1) {
+      THEENGS_LOG_TRACE(F("One MQTT server found setting parameters" CR));
+      return {MDNS.hostname(0).c_str(), uint16_t(MDNS.port(0))};
+    } else {
+      THEENGS_LOG_WARNING(F("Several MQTT servers found, please deactivate mDNS and set your default server" CR));
+    }
+  }
+  return {"", 0};
+}
+#endif
+
+#if MQTT_BROKER_MODE
+void setupMQTT() {
+  THEENGS_LOG_NOTICE(F("Reconfiguring MQTT broker..." CR));
+
+  mqtt.reset(new MQTTServer());
+  mqtt->begin();
+#  ifdef ZgatewayBT
+  BTProcessLock = !BTConfig.enabled; // Release BLE processes at start if enabled
+#  endif
+}
+#else
+
+struct ss_cnt_parameters_backup {
+  ss_cnt_parameters parameters;
+  int cnt_index;
+  bool saveOnSuccess;
+};
+
+static std::unique_ptr<ss_cnt_parameters_backup> cnt_parameters_backup;
+
+void setupMQTT() {
+  THEENGS_LOG_NOTICE(F("Reconfiguring MQTT client..." CR));
+
+  const auto& parameters = cnt_parameters_array[cnt_index];
+
+  // free the old MQTT client and underlying connection
+  mqtt.reset();
+  eClient.reset();
+  failure_number_mqtt = 0;
+
+  // configure socket
+  if (parameters.isConnectionSecure) {
+    eClient.reset(new WiFiClientSecure);
+    if (parameters.isCertValidate) {
+      setupTLS(cnt_index);
+    } else {
+      static_cast<WiFiClientSecure*>(eClient.get())->setInsecure();
+    }
+  } else {
+    eClient.reset(new WiFiClient);
+  }
+
+#  if defined(MDNS_SD)
+  THEENGS_LOG_TRACE(F("Connecting to MQTT by mDNS without MQTT hostname" CR));
+  const auto discovered_broker = discoverMQTTbroker();
+  const auto broker_host = discovered_broker.first.c_str();
+  const auto broker_port = discovered_broker.second;
+#  else
+  const auto broker_host = parameters.mqtt_server;
+  const auto broker_port = String(parameters.mqtt_port).toInt();
+#  endif
+
+  THEENGS_LOG_TRACE(F("Mqtt server: %s" CR), broker_host);
+  THEENGS_LOG_TRACE(F("Port: %u" CR), broker_port);
+
+  mqtt.reset(new PicoMQTT::Client(*eClient, broker_host, broker_port, gateway_name,
+                                  parameters.mqtt_user, parameters.mqtt_pass,
+                                  0, // minimum reconnect attempt interval [ms]
+                                  60 * 1000, // keep alive interval [ms]
+                                  (GeneralTimeOut - 1) * 1000 // socket timeout [ms]
+                                  ));
+
+#  if AWS_IOT
+  // AWS doesn't support will topic for the moment
+  mqtt->will.topic = "";
+  mqtt->will.payload = "";
+  mqtt->will.qos = 0;
+  mqtt->will.retain = false;
+#  else
+  mqtt->will.topic = String(mqtt_topic) + gateway_name + will_Topic;
+  mqtt->will.payload = will_Message;
+  mqtt->will.qos = will_QoS;
+  mqtt->will.retain = will_Retain;
+#  endif
+
+  mqtt->connected_callback = [] {
+#  if AWS_IOT
+    {
+      // Define a threshold for instability detection
+      constexpr unsigned int reconnection_threshold = 5;
+      constexpr unsigned long reconnection_window_millis = 120000; // Consider unstable if more than 5 reconnections in 2 minutes
+
+      static unsigned int reconnection_count = 0;
+      static unsigned long start_reconnection_window_millis = 0;
+
+      const unsigned long current_millis = millis();
+      if (start_reconnection_window_millis == 0 || current_millis - start_reconnection_window_millis > reconnection_window_millis) {
+        // Reset the count and timestamp at the start of a new window
+        reconnection_count = 0;
+        start_reconnection_window_millis = current_millis;
+      }
+      reconnection_count++; // Increment reconnection count
+      THEENGS_LOG_TRACE(F("MQTT connection count: %d" CR), reconnection_count);
+      if (reconnection_count > reconnection_threshold && SYSConfig.mqtt) {
+        // Detected instability in MQTT connection
+        THEENGS_LOG_WARNING(F("MQTT connection instability detected: %d reconnections in the last %d seconds" CR), reconnection_count, reconnection_window_millis / 1000);
+        // Stop xtoMQTT to see if it helps and still enables to receive data
+        SYSConfig.mqtt = false;
+      }
+    }
+#  endif
+#  ifdef ZgatewayBT
+    BTProcessLock = !BTConfig.enabled; // Release BLE processes at start if enabled
+#  endif
+    ProcessLock = false; // Release the loop process
+    displayPrint("MQTT connected");
+    THEENGS_LOG_NOTICE(F("Connected to broker" CR));
+    gatewayState = GatewayState::BROKER_CONNECTED;
+    failure_number_mqtt = 0;
+    // Once connected, publish an announcement...
+    pub(will_Topic, Gateway_AnnouncementMsg, will_Retain);
+
+    if (cnt_parameters_backup) {
+      // this was the first attempt to connect to a new server and it succeeded
+      THEENGS_LOG_NOTICE(F("MQTT connection parameters %d successful" CR), cnt_index);
+      cnt_parameters_array[cnt_index].validConnection = true;
+      readCntParameters(cnt_index);
+
+#  ifndef ESPWifiManualSetup
+      if (cnt_parameters_backup->saveOnSuccess) // Save the new parameters to the flash
+        saveConfig();
+#  endif
+
+      cnt_parameters_backup.reset();
+      ESPRestart(7);
+    }
+    handle_autodiscovery();
+  };
+
+  mqtt->connection_failure_callback = [] {
+    if ((WiFi.status() != WL_CONNECTED && ethConnected == false) || SYSConfig.offline) {
+      // No network connection or offline, ignore this failure
+      return;
+    }
+    failure_number_mqtt++; // we count the failure
+    gatewayState = GatewayState::BROKER_DISCONNECTED;
+    THEENGS_LOG_WARNING(F("failure_number_mqtt: %d" CR), failure_number_mqtt);
+
+    const auto& parameters = cnt_parameters_array[cnt_index];
+
+    if (parameters.isConnectionSecure) {
+      WiFiClientSecure* client = static_cast<WiFiClientSecure*>(eClient.get());
+#  if defined(ESP32)
+      THEENGS_LOG_WARNING(F("failed, ssl error code=%d" CR), client->lastError(nullptr, 0));
+#  elif defined(ESP8266)
+      THEENGS_LOG_WARNING(F("failed, ssl error code=%d" CR), client->getLastSSLError());
+#  endif
+    }
+
+    if (cnt_parameters_backup) {
+      // this was the first attempt to connect to a new server and it failed, revert to old settings
+      THEENGS_LOG_ERROR(F("MQTT connection failed, reverting to previous settings" CR));
+      gatewayState = GatewayState::ERROR;
+      cnt_parameters_array[cnt_index] = cnt_parameters_backup->parameters;
+      cnt_index = cnt_parameters_backup->cnt_index;
+      mqttSetupPending = true;
+      cnt_parameters_backup.reset();
+      ESPRestart(7);
+      return;
+    }
+
+    delayWithOTA(10000);
+
+    if (failure_number_mqtt > maxRetryWatchDog) {
+#  ifndef ESPWifiManualSetup
+      // Look for the next valid connection
+      for (int i = 0; i < cnt_parameters_array_size; i++) {
+        cnt_index++;
+        if (cnt_index >= cnt_parameters_array_size) {
+          cnt_index = 0;
+        }
+        if (cnt_parameters_array[cnt_index].validConnection) {
+          THEENGS_LOG_NOTICE(F("Connection %d valid, switching" CR), cnt_index);
+          saveConfig();
+          break;
+        } else {
+          THEENGS_LOG_NOTICE(F("Connection %d not valid" CR), cnt_index);
+        }
+      }
+#  endif
+      unsigned long millis_since_last_ota;
+      while (
+          // When
+          // ...incomplete OTA in progress
+          (last_ota_activity_millis != 0)
+          // ...AND last OTA activity fairly recently
+          && ((millis_since_last_ota = millis() - last_ota_activity_millis) < ota_timeout_millis)) {
+        // ... We consider that OTA might be still active, and we sleep for a while, and giving
+        // OTA chance to proceed (ArduinoOTA.handle())
+        THEENGS_LOG_WARNING(F("OTA might be still active (activity %d ms ago)" CR), millis_since_last_ota);
+        ArduinoOTA.handle();
+        delay(100);
+      }
+      ESPRestart(1);
+    }
+  };
+
+  mqtt->subscribe(String(mqtt_topic) + gateway_name + subjectMQTTtoX, receivingDATA, mqtt_max_payload_size);
+
+#  ifdef ZgatewayRF
+  // subject on which other OMG will publish, this OMG will store these msg and by the way don't republish them if they have been already published
+  mqtt->subscribe(subjectMultiGTWRF, receivingDATA, mqtt_max_payload_size);
+#  endif
+
+#  ifdef ZgatewayIR
+  // subject on which other OMG will publish, this OMG will store these msg and by the way don't republish them if they have been already published
+  mqtt->subscribe(subjectMultiGTWIR, receivingDATA, mqtt_max_payload_size);
+#  endif
+
+#  if enableMultiGTWSync
+  mqtt->subscribe(String(mqtt_topic) + subjectTrackerSync, receivingDATA, mqtt_max_payload_size);
+#  endif
+
+  mqtt->begin();
+}
+#endif
+
+#if defined(ESP32) && (defined(WifiGMode) || defined(WifiPower))
+void setESPWifiProtocolTxPower() {
+  //Reduce WiFi interference when using ESP32 using custom WiFi mode and tx power
+  //https://github.com/espressif/arduino-esp32/search?q=WIFI_PROTOCOL_11G
+  //https://www.letscontrolit.com/forum/viewtopic.php?t=671&start=20
+#  if WifiGMode == true
+  if (esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G) != ESP_OK) {
+    THEENGS_LOG_ERROR(F("Failed to change WifiMode." CR));
+    gatewayState = GatewayState::ERROR;
+  }
+#  endif
+
+#  if WifiGMode == false
+  if (esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N) != ESP_OK) {
+    THEENGS_LOG_ERROR(F("Failed to change WifiMode." CR));
+    gatewayState = GatewayState::ERROR;
+  }
+#  endif
+
+  uint8_t getprotocol;
+  esp_err_t err;
+  err = esp_wifi_get_protocol(WIFI_IF_STA, &getprotocol);
+
+  if (err != ESP_OK) {
+    THEENGS_LOG_NOTICE(F("Could not get protocol!" CR));
+  }
+  if (getprotocol & WIFI_PROTOCOL_11N) {
+    THEENGS_LOG_NOTICE(F("WiFi_Protocol_11n" CR));
+  }
+  if (getprotocol & WIFI_PROTOCOL_11G) {
+    THEENGS_LOG_NOTICE(F("WiFi_Protocol_11g" CR));
+  }
+  if (getprotocol & WIFI_PROTOCOL_11B) {
+    THEENGS_LOG_NOTICE(F("WiFi_Protocol_11b" CR));
+  }
+
+#  ifdef WifiPower
+  THEENGS_LOG_NOTICE(F("Requested WiFi power level: %i" CR), WifiPower);
+  WiFi.setTxPower(WifiPower);
+#  endif
+  THEENGS_LOG_NOTICE(F("Operating WiFi power level: %i" CR), WiFi.getTxPower());
+}
+#endif
+
+#if defined(ESP8266) && (defined(WifiGMode) || defined(WifiPower))
+void setESPWifiProtocolTxPower() {
+#  if WifiGMode == true
+  if (!wifi_set_phy_mode(PHY_MODE_11G)) {
+    THEENGS_LOG_ERROR(F("Failed to change WifiMode." CR));
+    gatewayState = GatewayState::ERROR;
+  }
+#  endif
+
+#  if WifiGMode == false
+  if (!wifi_set_phy_mode(PHY_MODE_11N)) {
+    THEENGS_LOG_ERROR(F("Failed to change WifiMode." CR));
+    gatewayState = GatewayState::ERROR;
+  }
+#  endif
+
+  phy_mode_t getprotocol = wifi_get_phy_mode();
+  if (getprotocol == PHY_MODE_11N) {
+    THEENGS_LOG_NOTICE(F("WiFi_Protocol_11n" CR));
+  }
+  if (getprotocol == PHY_MODE_11G) {
+    THEENGS_LOG_NOTICE(F("WiFi_Protocol_11g" CR));
+  }
+  if (getprotocol == PHY_MODE_11B) {
+    THEENGS_LOG_NOTICE(F("WiFi_Protocol_11b" CR));
+  }
+
+#  ifdef WifiPower
+  THEENGS_LOG_NOTICE(F("Requested WiFi power level: %i dBm" CR), WifiPower);
+
+  int i_dBm = int(WifiPower * 4.0f);
+
+  // i_dBm 82 == 20.5 dBm
+  if (i_dBm > 82) {
+    i_dBm = 82;
+  } else if (i_dBm < 0) {
+    i_dBm = 0;
+  }
+
+  system_phy_set_max_tpw((uint8_t)i_dBm);
+#  endif
+}
+#endif
+
+#ifdef ESP32
+void updateAndHandleLEDsTask(void* pvParameters) {
+  for (;;) {
+    updateAndHandleLEDsTask();
+    vTaskDelay(pdMS_TO_TICKS(100));
+  }
+}
+#endif
+
+void updateAndHandleLEDsTask() {
+  if (previousGatewayState != gatewayState) {
+#ifdef LED_POWER
+    ledManager.setMode(STRIP_POWER, LED_POWER, LEDManager::STATIC, LED_POWER_COLOR, -1);
+#endif
+    switch (gatewayState) {
+      case PROCESSING:
+#ifdef LED_PROCESSING
+        ledManager.setMode(STRIP_PROCESSING, LED_PROCESSING, LEDManager::BLINK, LED_PROCESSING_COLOR, 3);
+#endif
+        break;
+      case WAITING_ONBOARDING:
+#ifdef LED_BROKER
+        ledManager.setMode(STRIP_BROKER, LED_BROKER, LEDManager::STATIC, LED_WAITING_ONBOARD_COLOR, -1);
+#endif
+        break;
+      case ONBOARDING:
+#ifdef LED_BROKER
+        ledManager.setMode(STRIP_BROKER, LED_BROKER, LEDManager::STATIC, LED_ONBOARD_COLOR, -1);
+#endif
+        break;
+      case NTWK_CONNECTED:
+#ifdef LED_NETWORK
+        ledManager.setMode(STRIP_NETWORK, LED_NETWORK, LEDManager::STATIC, LED_NETWORK_OK_COLOR, -1);
+#endif
+        break;
+      case BROKER_CONNECTED:
+#ifdef LED_BROKER
+        ledManager.setMode(STRIP_BROKER, LED_BROKER, LEDManager::STATIC, LED_BROKER_OK_COLOR, -1);
+#endif
+        break;
+      case NTWK_DISCONNECTED:
+#ifdef LED_NETWORK
+        ledManager.setMode(STRIP_NETWORK, LED_NETWORK, LEDManager::BLINK, LED_NETWORK_ERROR_COLOR, -1);
+#endif
+        break;
+      case BROKER_DISCONNECTED:
+#ifdef LED_BROKER
+        ledManager.setMode(STRIP_BROKER, LED_BROKER, LEDManager::BLINK, LED_BROKER_ERROR_COLOR, -1);
+#endif
+        break;
+      case SLEEPING:
+        ledManager.setMode(-1, -1, LEDManager::OFF, 0, -1);
+        break;
+      case OFFLINE:
+#ifdef LED_NETWORK
+        ledManager.setMode(STRIP_NETWORK, LED_NETWORK, LEDManager::BLINK, LED_OFFLINE_COLOR, -1);
+#endif
+        break;
+      case LOCAL_OTA_IN_PROGRESS:
+#ifdef LED_PROCESSING
+        ledManager.setMode(STRIP_PROCESSING, LED_PROCESSING, LEDManager::BLINK, LED_OTA_LOCAL_COLOR, -1);
+#endif
+        break;
+      case REMOTE_OTA_IN_PROGRESS:
+#ifdef LED_PROCESSING
+        ledManager.setMode(STRIP_PROCESSING, LED_PROCESSING, LEDManager::BLINK, LED_OTA_REMOTE_COLOR, -1);
+#endif
+        break;
+      case ERROR:
+#ifdef LED_ERROR
+        ledManager.setMode(STRIP_ERROR, LED_ERROR, LEDManager::BLINK, LED_ERROR_COLOR, 3);
+#endif
+        break;
+      default:
+        break;
+    }
+    previousGatewayState = gatewayState;
+  }
+  ledManager.update();
+}
+
+void setup() {
+  //Launch serial for debugging purposes
+  Serial.begin(SERIAL_BAUD);
+  Log.begin(LOG_LEVEL, &Serial);
+  THEENGS_LOG_NOTICE(F(CR "************* WELCOME TO OpenMQTTGateway **************" CR));
+#if defined(CONFIG_IDF_TARGET_ESP32) && !defined(ZgatewayBT) && !defined(USE_BLUFI)
+  // Reclaim the Bluetooth controller's reserved DRAM on BT-less ESP32 builds.
+  // arduino-esp32 3.x releases only the BLE slice: esp32-hal-bt.c initialises
+  // _classicMemReleased = true whenever CONFIG_BT_CLASSIC_ENABLED is unset,
+  // which is the case for a BLE-only controller build — so its
+  // btMemRelease(BT_MODE_CLASSIC_BT) call short-circuits and ~33 KB of the
+  // 0xdb5c reservation is never returned to the heap. ESP32 has Classic BT
+  // hardware (CONFIG_SOC_BT_CLASSIC_SUPPORTED) and the DRAM is reserved
+  // regardless of the configured controller mode. arduino-esp32 2.x released
+  // the whole BTDM region unconditionally here.
+  // Safe no-op if the core ever releases it correctly, or if BT is later started.
+  {
+    uint32_t heapBeforeBtRelease = ESP.getFreeHeap();
+    esp_bt_mem_release(ESP_BT_MODE_BTDM);
+    THEENGS_LOG_NOTICE(F("BT DRAM reclaimed: %d -> %d" CR), heapBeforeBtRelease, ESP.getFreeHeap());
+  }
+#endif
+#if defined(TRIGGER_GPIO) && !defined(ESPWifiManualSetup)
+  pinMode(TRIGGER_GPIO, INPUT_PULLUP);
+  checkButton();
+#endif
+
+  delay(100); //give time to start the flash and avoid issue when reading the preferences
+
+  SYSConfig_init();
+  SYSConfig_load();
+
+  if (SYSConfig.offline) {
+    gatewayState = GatewayState::OFFLINE;
+  }
+
+#ifdef LED_ADDRESSABLE
+#  ifdef LED_ADDRESSABLE_PIN1
+  ledManager.addLEDStrip(LED_ADDRESSABLE_PIN1, LED_ADDRESSABLE_NUM);
+#  endif
+#  ifdef LED_ADDRESSABLE_PIN2
+  ledManager.addLEDStrip(LED_ADDRESSABLE_PIN2, LED_ADDRESSABLE_NUM);
+#  endif
+#  ifdef LED_ADDRESSABLE_PIN3
+  ledManager.addLEDStrip(LED_ADDRESSABLE_PIN3, LED_ADDRESSABLE_NUM);
+#  endif
+  ledManager.setBrightness(SYSConfig.rgbbrightness);
+#elif LED_PIN
+  ledManager.addLEDStrip(LED_PIN, 1);
+#endif
+
+#ifdef ESP8266
+#  ifndef ZgatewaySRFB // if we are not in sonoff rf bridge case we apply the ESP8266 GPIO optimization
+  Serial.end();
+  Serial.begin(SERIAL_BAUD, SERIAL_8N1, SERIAL_TX_ONLY); // enable on ESP8266 to free some pin
+#  endif
+#elif defined(ESP32)
+  xTaskCreate(updateAndHandleLEDsTask, "updateAndHandleLEDsTask", 2500, NULL, 1, NULL);
+  xQueueMutex = xSemaphoreCreateMutex();
+  xMqttMutex = xSemaphoreCreateMutex();
+#  if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
+  setupM5();
+#  endif
+#  if defined(ZdisplaySSD1306)
+  setupSSD1306();
+  modules.add(ZdisplaySSD1306);
+#  endif
+#endif
+
+  THEENGS_LOG_NOTICE(F("OpenMQTTGateway Version: " OMG_VERSION CR));
+
+#ifdef ESP32_EXT0_WAKE_PIN
+  THEENGS_LOG_NOTICE(F("Setting EXT0 Wakeup for deep sleep." CR));
+  gpio_num_t wake_pin0 = static_cast<gpio_num_t>(ESP32_EXT0_WAKE_PIN);
+  if (esp_sleep_enable_ext0_wakeup(wake_pin0, ESP32_EXT0_WAKE_PIN_STATE) != ESP_OK) {
+    THEENGS_LOG_ERROR(F("Failed to set deep sleep EXT0 Wakeup." CR));
+    gatewayState = GatewayState::ERROR;
+  }
+#endif
+#ifdef ESP32_EXT1_WAKE_PIN
+  THEENGS_LOG_NOTICE(F("Setting EXT1 Wakeup for deep sleep." CR));
+  uint64_t wake_pin_bitmask = 1ULL << ESP32_EXT1_WAKE_PIN; // Adjust this line if multiple pins are used.
+  esp_sleep_ext1_wakeup_mode_t wake_state1 = static_cast<esp_sleep_ext1_wakeup_mode_t>(ESP32_EXT1_WAKE_PIN_STATE);
+  if (esp_sleep_enable_ext1_wakeup(wake_pin_bitmask, wake_state1) != ESP_OK) {
+    THEENGS_LOG_ERROR(F("Failed to set deep sleep EXT1 Wakeup." CR));
+    gatewayState = GatewayState::ERROR;
+  }
+#endif
+/*
+ Note that the ONOFF module need to start after the RN8209 so that the overCurrent function is launched after the setup of the sensor
+*/
+#ifdef ZsensorRN8209
+  setupRN8209();
+  modules.add(ZsensorRN8209);
+#endif
+#ifdef ZactuatorONOFF
+  setupONOFF();
+  modules.add(ZactuatorONOFF);
+#endif
+#ifdef ZgatewaySERIAL
+  setupSERIAL();
+  modules.add(ZgatewaySERIAL);
+#endif
+
+#if defined(ESP32) && defined(USE_BLUFI)
+  if (SYSConfig.blufi)
+    startBlufi();
+#endif
+
+#if defined(ESPWifiManualSetup)
+  extern void setupWiFiFromBuild();
+  setupWiFiFromBuild();
+#else
+  WiFi.setHostname(gateway_name);
+  WiFi.mode(WIFI_STA);
+  if (loadConfigFromFlash()) { // Config present
+    THEENGS_LOG_NOTICE(F("Config loaded from flash" CR));
+#  ifdef ESP32_ETHERNET
+    setup_ethernet_esp32();
+#  endif
+    // If not in failSafeMode and no connection to the network with Ethernet, launch the wifi manager
+    if (!failSafeMode && !ethConnected) setupWiFiManager();
+  } else { // No config in flash
+#  ifdef ESP32_ETHERNET
+    setup_ethernet_esp32();
+#  endif
+
+#  if SELF_TEST
+    // Check serial input to trigger a Self Test sequence if required
+    extern void checkSerial();
+    checkSerial();
+#  endif
+
+    // In failSafeMode we don't want to setup wifi manager as it has already been done before,
+    // and with Ethernet already connected we don't need it at all: bringing up the WiFi radio
+    // would only add 2.4GHz contention with BLE.
+    if (!failSafeMode && !ethConnected) {
+      THEENGS_LOG_NOTICE(F("No config in flash, launching wifi manager" CR));
+      setupWiFiManager();
+    }
+  }
+
+#endif
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway mac: %s" CR), WiFi.macAddress().c_str());
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway ip: %s" CR), WiFi.localIP().toString().c_str());
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway index %d" CR), cnt_index);
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway mqtt topic: %s" CR), mqtt_topic);
+#ifdef ZmqttDiscovery
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway mqtt discovery prefix: %s" CR), discovery_prefix);
+#endif
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway gateway name: %s" CR), gateway_name);
+#if !MQTT_BROKER_MODE
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway mqtt server: %s" CR), cnt_parameters_array[cnt_index].mqtt_server);
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway mqtt port: %s" CR), cnt_parameters_array[cnt_index].mqtt_port);
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway mqtt user: %s" CR), cnt_parameters_array[cnt_index].mqtt_user);
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway secure connection: %s" CR), cnt_parameters_array[cnt_index].isConnectionSecure ? "true" : "false");
+  THEENGS_LOG_TRACE(F("OpenMQTTGateway validate cert: %s" CR), cnt_parameters_array[cnt_index].isCertValidate ? "true" : "false");
+#endif
+
+  setOTA();
+
+#if defined(ZwebUI) && defined(ESP32)
+  WebUISetup();
+  modules.add(ZwebUI);
+#endif
+
+  delay(1500);
+#if defined(ZgatewayRF) || defined(ZgatewayPilight) || defined(ZgatewayRTL_433) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
+  setupCommonRF();
+#endif
+#ifdef ZsensorBME280
+  setupZsensorBME280();
+  modules.add(ZsensorBME280);
+#endif
+#ifdef ZsensorHTU21
+  setupZsensorHTU21();
+  modules.add(ZsensorHTU21);
+#endif
+#ifdef ZsensorLM75
+  setupZsensorLM75();
+  modules.add(ZsensorLM75);
+#endif
+#ifdef ZsensorAHTx0
+  setupZsensorAHTx0();
+  modules.add(ZsensorAHTx0);
+#endif
+#ifdef ZsensorBH1750
+  setupZsensorBH1750();
+  modules.add(ZsensorBH1750);
+#endif
+#ifdef ZsensorMQ2
+  setupZsensorMQ2();
+  modules.add(ZsensorMQ2);
+#endif
+#ifdef ZsensorTEMT6000
+  setupZsensorTEMT6000();
+  modules.add(ZsensorTEMT6000);
+#endif
+#ifdef ZsensorTSL2561
+  setupZsensorTSL2561();
+  modules.add(ZsensorTSL2561);
+#endif
+#ifdef Zgateway2G
+  setup2G();
+  modules.add(Zgateway2G);
+#endif
+#ifdef ZgatewayIR
+  setupIR();
+  modules.add(ZgatewayIR);
+#endif
+#ifdef ZgatewayLORA
+  setupLORA();
+  modules.add(ZgatewayLORA);
+#endif
+#ifdef ZgatewayRF
+  modules.add(ZgatewayRF);
+#endif
+#ifdef ZgatewayRF2
+  modules.add(ZgatewayRF2);
+#endif
+#ifdef ZgatewayPilight
+  modules.add(ZgatewayPilight);
+#endif
+#ifdef ZgatewayWeatherStation
+  setupWeatherStation();
+  modules.add(ZgatewayWeatherStation);
+#endif
+#ifdef ZgatewayGFSunInverter
+  setupGFSunInverter();
+  modules.add(ZgatewayGFSunInverter);
+#endif
+#ifdef ZgatewaySRFB
+  setupSRFB();
+  modules.add(ZgatewaySRFB);
+#endif
+#ifdef ZgatewayBT
+  setupBT();
+  modules.add(ZgatewayBT);
+#endif
+#ifdef ZgatewayRFM69
+  setupRFM69();
+  modules.add(ZgatewayRFM69);
+#endif
+#ifdef ZsensorINA226
+  setupINA226();
+  modules.add(ZsensorINA226);
+#endif
+#ifdef ZsensorHCSR501
+  setupHCSR501();
+  modules.add(ZsensorHCSR501);
+#endif
+#ifdef ZsensorHCSR04
+  setupHCSR04();
+  modules.add(ZsensorHCSR04);
+#endif
+#ifdef ZsensorGPIOInput
+  setupGPIOInput();
+  modules.add(ZsensorGPIOInput);
+#endif
+#ifdef ZsensorGPIOKeyCode
+  setupGPIOKeyCode();
+  modules.add(ZsensorGPIOKeyCode);
+#endif
+#ifdef ZactuatorFASTLED
+  setupFASTLED();
+  modules.add(ZactuatorFASTLED);
+#endif
+#ifdef ZactuatorPWM
+  setupPWM();
+  modules.add(ZactuatorPWM);
+#endif
+#ifdef ZactuatorSomfy
+  setupSomfy();
+  modules.add(ZactuatorSomfy);
+#endif
+#ifdef ZsensorDS1820
+  setupZsensorDS1820();
+  modules.add(ZsensorDS1820);
+#endif
+#ifdef ZsensorADC
+  setupADC();
+  modules.add(ZsensorADC);
+#endif
+#ifdef ZsensorTouch
+  setupTouch();
+  modules.add(ZsensorTouch);
+#endif
+#ifdef ZsensorC37_YL83_HMRD
+  setupZsensorC37_YL83_HMRD();
+  modules.add(ZsensorC37_YL83_HMRD);
+#endif
+#ifdef ZsensorDHT
+  setupDHT();
+  modules.add(ZsensorDHT);
+#endif
+#ifdef ZsensorSHTC3
+  setupSHTC3();
+#endif
+#ifdef ZgatewayRTL_433
+  setupRTL_433();
+  modules.add(ZgatewayRTL_433);
+#endif
+  THEENGS_LOG_TRACE(F("mqtt_max_payload_size: %d" CR), mqtt_max_payload_size);
+  SYSConfig.offline ? THEENGS_LOG_NOTICE(F("Offline enabled" CR)) : THEENGS_LOG_NOTICE(F("Offline disabled" CR));
+  char jsonChar[100];
+  serializeJson(modules, jsonChar, sizeof(jsonChar));
+  THEENGS_LOG_NOTICE(F("OpenMQTTGateway modules: %s" CR), jsonChar);
+  THEENGS_LOG_NOTICE(F("************** Setup OpenMQTTGateway end **************" CR));
+}
+
+// Bypass for ESP not reconnecting automaticaly the second time https://github.com/espressif/arduino-esp32/issues/2501
+bool wifi_reconnect_bypass() {
+#if defined(ESP32) && defined(USE_BLUFI)
+  extern bool omg_blufi_ble_connected;
+  if (omg_blufi_ble_connected) {
+    THEENGS_LOG_NOTICE(F("BLUFI is connected, bypassing wifi reconnect" CR));
+    gatewayState = GatewayState::ONBOARDING;
+    return true;
+  }
+#endif
+  uint8_t wifi_autoreconnect_cnt = 0;
+#ifdef ESP32
+  while (WiFi.status() != WL_CONNECTED && wifi_autoreconnect_cnt < maxConnectionRetryNetwork) {
+#else
+  while (WiFi.waitForConnectResult() != WL_CONNECTED && wifi_autoreconnect_cnt < maxConnectionRetryNetwork) {
+#endif
+    THEENGS_LOG_NOTICE(F("Attempting Wifi connection with saved AP: %d" CR), wifi_autoreconnect_cnt);
+
+    WiFi.begin();
+#if defined(WifiGMode) || defined(WifiPower)
+    setESPWifiProtocolTxPower();
+#endif
+    delay(1000);
+    wifi_autoreconnect_cnt++;
+  }
+  if (wifi_autoreconnect_cnt < maxConnectionRetryNetwork) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+void setOTA() {
+  // Port defaults to 8266
+  ArduinoOTA.setPort(ota_port);
+
+  // Hostname defaults to esp8266-[ChipID]
+  ArduinoOTA.setHostname(ota_hostname);
+
+  // No authentication by default
+  ArduinoOTA.setPassword(ota_pass);
+
+  ArduinoOTA.onStart([]() {
+    THEENGS_LOG_TRACE(F("Start OTA, lock other functions" CR));
+    last_ota_activity_millis = millis();
+#ifdef ESP32
+    ProcessLock = true;
+#  ifdef ZgatewayBT
+    stopProcessing(true);
+#  endif
+#endif
+    lpDisplayPrint("OTA in progress");
+  });
+  ArduinoOTA.onEnd([]() {
+    THEENGS_LOG_TRACE(F("\nOTA done" CR));
+    last_ota_activity_millis = 0;
+    lpDisplayPrint("OTA done");
+    ESPRestart(6);
+  });
+  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
+    THEENGS_LOG_TRACE(F("Progress: %u%%\r" CR), (progress / (total / 100)));
+    gatewayState = GatewayState::LOCAL_OTA_IN_PROGRESS;
+    last_ota_activity_millis = millis();
+  });
+  ArduinoOTA.onError([](ota_error_t error) {
+    last_ota_activity_millis = millis();
+    Serial.printf("Error[%u]: ", error);
+    gatewayState = GatewayState::ERROR;
+    if (error == OTA_AUTH_ERROR)
+      THEENGS_LOG_ERROR(F("Auth Failed" CR));
+    else if (error == OTA_BEGIN_ERROR)
+      THEENGS_LOG_ERROR(F("Begin Failed" CR));
+    else if (error == OTA_CONNECT_ERROR)
+      THEENGS_LOG_ERROR(F("Connect Failed" CR));
+    else if (error == OTA_RECEIVE_ERROR)
+      THEENGS_LOG_ERROR(F("Receive Failed" CR));
+    else if (error == OTA_END_ERROR)
+      THEENGS_LOG_ERROR(F("End Failed" CR));
+    ESPRestart(6);
+  });
+  ArduinoOTA.begin();
+}
+
+#if !MQTT_BROKER_MODE
+void setupTLS(int index) {
+  configTime(0, 0, NTP_SERVER);
+  WiFiClientSecure* sClient = static_cast<WiFiClientSecure*>(eClient.get());
+  THEENGS_LOG_NOTICE(F("cnt index used: %d" CR), index);
+  if (!cnt_parameters_array[index].isCertValidate) {
+    THEENGS_LOG_NOTICE(F("Disabling cert validation" CR));
+    sClient->setInsecure();
+  } else {
+    THEENGS_LOG_NOTICE(F("Enabling cert validation" CR));
+#  if defined(ESP32)
+    if (cnt_parameters_array[index].server_cert.length() > MIN_CERT_LENGTH) {
+      sClient->setCACert(cnt_parameters_array[index].server_cert.c_str());
+      THEENGS_LOG_NOTICE(F("Server cert found from cert array" CR));
+    } else if (strlen(ss_server_cert) > MIN_CERT_LENGTH) {
+      sClient->setCACert(ss_server_cert);
+      THEENGS_LOG_NOTICE(F("Server cert found from ss_server_cert" CR));
+    } else {
+      THEENGS_LOG_ERROR(F("No server cert found" CR));
+      gatewayState = GatewayState::ERROR;
+    }
+
+#    if AWS_IOT
+    if (strcmp(cnt_parameters_array[index].mqtt_port, "443") == 0) {
+      THEENGS_LOG_NOTICE(F("Using ALPN" CR));
+      static const char* alpnProtocols[] = ALPN_PROTOCOLS;
+      sClient->setAlpnProtocols(alpnProtocols);
+    }
+#    endif
+#    if MQTT_SECURE_SIGNED_CLIENT
+    if (cnt_parameters_array[index].client_cert.length() > MIN_CERT_LENGTH) {
+      sClient->setCertificate(cnt_parameters_array[index].client_cert.c_str());
+      THEENGS_LOG_NOTICE(F("Client cert found from cert array" CR));
+    } else if (strlen(ss_client_cert) > MIN_CERT_LENGTH) {
+      sClient->setCertificate(ss_client_cert);
+      THEENGS_LOG_NOTICE(F("Client cert found from ss_client_cert" CR));
+    } else {
+      THEENGS_LOG_ERROR(F("No client cert found" CR));
+      gatewayState = GatewayState::ERROR;
+    }
+    if (cnt_parameters_array[index].client_key.length() > MIN_CERT_LENGTH) {
+      sClient->setPrivateKey(cnt_parameters_array[index].client_key.c_str());
+      THEENGS_LOG_NOTICE(F("Client key found from cert array" CR));
+    } else if (strlen(ss_client_key) > MIN_CERT_LENGTH) {
+      sClient->setPrivateKey(ss_client_key);
+      THEENGS_LOG_NOTICE(F("Client key found from ss_client_key" CR));
+    } else {
+      THEENGS_LOG_ERROR(F("No client key found" CR));
+      gatewayState = GatewayState::ERROR;
+    }
+#    endif
+#  elif defined(ESP8266)
+    caCert.append(cnt_parameters_array[index].server_cert.c_str());
+    sClient->setTrustAnchors(&caCert);
+    sClient->setBufferSizes(512, 512);
+#    if MQTT_SECURE_SIGNED_CLIENT
+    if (pClCert != nullptr) {
+      delete pClCert;
+    }
+    if (pClKey != nullptr) {
+      delete pClKey;
+    }
+    pClCert = new X509List(cnt_parameters_array[index].client_cert.c_str());
+    pClKey = new PrivateKey(cnt_parameters_array[index].client_key.c_str());
+    sClient->setClientRSACert(pClCert, pClKey);
+#    endif
+#  endif
+  }
+}
+#endif
+
+/*
+  Reboot for Reason Codes
+  0 - Erase and Restart
+  1 - Repeated MQTT Connection Failure
+  2 - Repeated WiFi Connection Failure
+  3 - Failed WiFiManager configuration portal
+  4 - BLE Scan watchdog
+  5 - User requested reboot
+  6 - OTA Update
+  7 - Parameters changed
+  8 - not enough memory to pursue
+  9 - SELFTEST end
+*/
+void ESPRestart(byte reason) {
+#ifdef SecondaryModule
+  // Erase the secondary module config
+  String restartCmdStr = "{\"cmd\":\"" + String(restartCmd) + "\"}";
+  THEENGS_LOG_NOTICE(F("Restarting secondary module : %s" CR), restartCmdStr.c_str());
+  receivingDATA(subjectMQTTtoSYSsetSecondaryModule, restartCmdStr.c_str());
+  delay(2000);
+#endif
+  StaticJsonDocument<128> jsonBuffer;
+  JsonObject jsondata = jsonBuffer.to<JsonObject>();
+  jsondata["reason"] = reason;
+  jsondata["retain"] = true;
+  jsondata["uptime"] = uptime();
+  jsondata["origin"] = subjectLOGtoMQTT;
+  pub(jsondata); // We go to MQTT bypassing the queue to ensure the message is sent
+  // Clean queue
+  while (!jsonQueue.empty()) {
+    jsonQueue.pop();
+  }
+  THEENGS_LOG_WARNING(F("Rebooting for reason code %d" CR), reason);
+#if defined(ESP32)
+  ESP.restart();
+#elif defined(ESP8266)
+  ESP.reset();
+#endif
+}
+
+#if defined(ESPWifiManualSetup)
+void setupWiFiFromBuild() {
+  WiFi.setHostname(gateway_name);
+  WiFi.mode(WIFI_STA);
+  wifiMulti.addAP(wifi_ssid, wifi_password);
+  THEENGS_LOG_TRACE(F("Connecting to %s" CR), wifi_ssid);
+#  ifdef wifi_ssid1
+  wifiMulti.addAP(wifi_ssid1, wifi_password1);
+  THEENGS_LOG_TRACE(F("Connecting to %s" CR), wifi_ssid1);
+#  endif
+  delay(10);
+
+  // We start by connecting to a WiFi network
+
+#  ifdef NetworkAdvancedSetup
+  IPAddress ip_adress;
+  IPAddress gateway_adress;
+  IPAddress subnet_adress;
+  IPAddress dns_adress;
+  ip_adress.fromString(NET_IP);
+  gateway_adress.fromString(NET_GW);
+  subnet_adress.fromString(NET_MASK);
+  dns_adress.fromString(NET_DNS);
+
+  if (!WiFi.config(ip_adress, gateway_adress, subnet_adress, dns_adress)) {
+    THEENGS_LOG_ERROR(F("Wifi STA Failed to configure" CR));
+    gatewayState = GatewayState::ERROR;
+  }
+
+#  endif
+
+  while (wifiMulti.run() != WL_CONNECTED) {
+    delay(500);
+    THEENGS_LOG_TRACE(F("." CR));
+    failure_number_ntwk++;
+#  if defined(ESP32) && defined(ZgatewayBT)
+    if (SYSConfig.powerMode) {
+      if (failure_number_ntwk > maxConnectionRetryNetwork) {
+        sleep();
+      }
+    } else {
+      if (failure_number_ntwk > maxRetryWatchDog) {
+        ESPRestart(2);
+      }
+    }
+#  else
+    if (failure_number_ntwk > maxRetryWatchDog) {
+      ESPRestart(2);
+    }
+#  endif
+  }
+  THEENGS_LOG_NOTICE(F("WiFi ok with manual config credentials" CR));
+  displayPrint("Wifi connected");
+}
+
+#else
+
+WiFiManager wifiManager;
+
+//flag for saving data
+bool shouldSaveConfig = false;
+//do we have been connected once to MQTT
+
+//callback notifying us of the need to save config
+void saveConfigCallback() {
+  THEENGS_LOG_TRACE(F("Should save config" CR));
+  shouldSaveConfig = true;
+}
+
+#  ifdef TRIGGER_GPIO
+/**
+ * Identify a long button press to trigger a reset or a failsafe mode
+* */
+void blockingWaitForReset() {
+  if (digitalRead(TRIGGER_GPIO) == LOW) {
+    delay(50);
+    if (digitalRead(TRIGGER_GPIO) == LOW) {
+      THEENGS_LOG_TRACE(F("Trigger button Pressed" CR));
+      delay(3000); // reset delay hold
+      if (digitalRead(TRIGGER_GPIO) == LOW) {
+        THEENGS_LOG_NOTICE(F("Button Held" CR));
+// Switching off the relay during reset or failsafe operations
+#    ifdef ZactuatorONOFF
+        extern void ActuatorTrigger();
+        uint8_t level = digitalRead(ACTUATOR_ONOFF_GPIO);
+        if (level == ACTUATOR_ON) {
+          ActuatorTrigger();
+        }
+#    endif
+        gatewayState = GatewayState::WAITING_ONBOARDING;
+        // Checking if the flash has already been erased to identify if we erase it or go into failsafe mode
+        // going to failsafe mode is done by doing a long button press from a state where the flash has already been erased
+        if (SPIFFS.begin()) {
+          THEENGS_LOG_TRACE(F("mounted file system" CR));
+          if (SPIFFS.exists("/config.json")) {
+            THEENGS_LOG_NOTICE(F("Erasing ESP Config, restarting" CR));
+            eraseConfig();
+          }
+        }
+        delay(30000);
+        if (digitalRead(TRIGGER_GPIO) == LOW) {
+          THEENGS_LOG_NOTICE(F("Going into failsafe mode without peripherals" CR));
+          // Failsafe mode enable to connect to Wifi or change the firmware without the peripherals setup
+          failSafeMode = true;
+          setupWiFiManager();
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Check if button is pressed so as to reset the credentials and parameters stored into the flash
+* */
+void checkButton() {
+  unsigned long timeFromStart = millis();
+  // Identify if the reset button is pushed at start
+  if (timeFromStart < TimeToResetAtStart) {
+    blockingWaitForReset();
+  } else { // When we are not at start we either check the button as a regular input (ZsensorGPIOInput used) or for a reset
+#    if defined(INPUT_GPIO) && defined(ZsensorGPIOInput) && INPUT_GPIO == TRIGGER_GPIO
+    MeasureGPIOInput();
+#    else
+    blockingWaitForReset();
+#    endif
+  }
+}
+#  else
+void checkButton() {}
+#  endif
+
+void saveConfig() {
+  THEENGS_LOG_TRACE(F("saving configs" CR));
+
+  int totalSize = 512;
+#  if !MQTT_BROKER_MODE
+  for (int i = 0; i < 3; ++i) { // index 0 contains the default values from the build, these values can't be changed at runtime
+    if (cnt_parameters_array[i].validConnection) {
+      totalSize += cnt_parameters_array[i].server_cert.length();
+      totalSize += cnt_parameters_array[i].client_cert.length();
+      totalSize += cnt_parameters_array[i].client_key.length();
+      totalSize += cnt_parameters_array[i].ota_server_cert.length();
+    }
+  }
+#  endif
+
+  THEENGS_LOG_NOTICE(F("Total size: %d" CR), totalSize);
+
+  DynamicJsonDocument json(512 + totalSize);
+
+#  if !MQTT_BROKER_MODE
+  for (int i = 0; i < 3; ++i) {
+    if (cnt_parameters_array[i].validConnection) {
+      char index_suffix[2];
+      if (i == 0) {
+        index_suffix[0] = '\0';
+      } else {
+        index_suffix[0] = '0' + i;
+        index_suffix[1] = '\0';
+      }
+      char key[mqtt_key_max_size];
+      if (cnt_parameters_array[i].server_cert.length() > MIN_CERT_LENGTH) {
+        strcpy(key, "mqtt_broker_cert");
+        strcat(key, index_suffix);
+        json[key] = cnt_parameters_array[i].server_cert;
+      }
+      if (cnt_parameters_array[i].client_cert.length() > MIN_CERT_LENGTH) {
+        strcpy(key, "mqtt_client_cert");
+        strcat(key, index_suffix);
+        json[key] = cnt_parameters_array[i].client_cert;
+      }
+      if (cnt_parameters_array[i].client_key.length() > MIN_CERT_LENGTH) {
+        strcpy(key, "mqtt_client_key");
+        strcat(key, index_suffix);
+        json[key] = cnt_parameters_array[i].client_key;
+      }
+      if (cnt_parameters_array[i].ota_server_cert.length() > MIN_CERT_LENGTH) {
+        strcpy(key, "ota_server_cert");
+        strcat(key, index_suffix);
+        json[key] = cnt_parameters_array[i].ota_server_cert;
+      }
+      strcpy(key, "mqtt_server");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].mqtt_server;
+      strcpy(key, "mqtt_port");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].mqtt_port;
+      strcpy(key, "mqtt_user");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].mqtt_user;
+      strcpy(key, "mqtt_pass");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].mqtt_pass;
+      strcpy(key, "mqtt_broker_secure");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].isConnectionSecure;
+      strcpy(key, "mqtt_iscertvalid");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].isCertValidate;
+      strcpy(key, "valid_cnt");
+      strcat(key, index_suffix);
+      json[key] = cnt_parameters_array[i].validConnection;
+    }
+  }
+
+  if (cnt_parameters_array[cnt_index].validConnection) {
+    json["cnt_index"] = cnt_index;
+  }
+#  endif
+
+  json["mqtt_topic"] = mqtt_topic;
+#  ifdef ZmqttDiscovery
+  json["discovery_prefix"] = discovery_prefix;
+#  endif
+  json["gateway_name"] = gateway_name;
+  json["ota_pass"] = ota_pass;
+#  if BLEDecryptor
+  json["ble_aes"] = ble_aes;
+  json["ble_aes_keys"] = ble_aes_keys;
+#  endif
+
+  File configFile = SPIFFS.open("/config.json", "w");
+  if (!configFile) {
+    THEENGS_LOG_ERROR(F("failed to open config file for writing" CR));
+    gatewayState = GatewayState::ERROR;
+  }
+
+  serializeJson(json, configFile);
+  configFile.close();
+}
+
+// Length-checked copy used when loading config.json values into fixed-size
+// buffers. The SPIFFS file is implicitly trusted once written, but historical
+// MQTT/HTTP paths could land over-length values there before we hardened them;
+// this prevents one stale config from overflowing globals on every boot.
+static void loadStrField(const char* name, char* dst, size_t dstSize, const char* src) {
+  if (!src) return;
+  if (strlen(src) >= dstSize) {
+    THEENGS_LOG_WARNING(F("Config field %s too long (%u), skipping" CR), name, (unsigned)strlen(src));
+    return;
+  }
+  strcpy(dst, src);
+}
+
+bool loadConfigFromFlash() {
+  THEENGS_LOG_TRACE(F("mounting FS..." CR));
+  bool result = false;
+
+  if (SPIFFS.begin()) {
+    THEENGS_LOG_TRACE(F("mounted file system" CR));
+  } else {
+    THEENGS_LOG_WARNING(F("failed to mount FS -> formating" CR));
+    SPIFFS.format();
+    if (SPIFFS.begin())
+      THEENGS_LOG_TRACE(F("mounted file system after formating" CR));
+  }
+  if (SPIFFS.exists("/config.json")) {
+    //file exists, reading and loading
+    THEENGS_LOG_TRACE(F("reading config file" CR));
+    File configFile = SPIFFS.open("/config.json", "r");
+    if (configFile) {
+      THEENGS_LOG_TRACE(F("opened config file" CR));
+      DynamicJsonDocument json(configFile.size() * 2);
+      auto error = deserializeJson(json, configFile);
+      if (error) {
+        THEENGS_LOG_ERROR(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
+        gatewayState = GatewayState::ERROR;
+      }
+      if (!json.isNull()) {
+        THEENGS_LOG_TRACE(F("\nparsed json, size: %u" CR), json.memoryUsage());
+        // Print json to serial port
+        //serializeJsonPretty(json, Serial);
+
+#  if !MQTT_BROKER_MODE
+        for (int i = 0; i < 3; ++i) {
+          char index_suffix[2]; // Large enough for 0, 1, or 2 and the null terminator
+          if (i == 0) {
+            index_suffix[0] = '\0'; // Empty string
+          } else {
+            index_suffix[0] = '0' + i; // Convert int to char
+            index_suffix[1] = '\0'; // Null terminator
+          }
+          char key[mqtt_key_max_size];
+          strcpy(key, "mqtt_broker_cert");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            cnt_parameters_array[i].server_cert = json[key].as<const char*>();
+          }
+          strcpy(key, "mqtt_client_cert");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            cnt_parameters_array[i].client_cert = json[key].as<const char*>();
+          }
+          strcpy(key, "mqtt_client_key");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            cnt_parameters_array[i].client_key = json[key].as<const char*>();
+          }
+          strcpy(key, "ota_server_cert");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+#    ifdef ESP32
+            // Read hash from the file
+            std::string hash = generateHash(json["ota_server_cert"]);
+            // Compare the hash with the expected hash
+            if (hash == GITHUB_OTA_SERVER_CERT_HASH) {
+              // Do nothing
+              THEENGS_LOG_WARNING(F("Old Github OTA server detected, skipping" CR));
+            } else {
+              THEENGS_LOG_NOTICE(F("OTA server cert hash: %s" CR), hash.c_str());
+              cnt_parameters_array[i].ota_server_cert = json["ota_server_cert"].as<const char*>();
+            }
+#    else
+            cnt_parameters_array[i].ota_server_cert = json["ota_server_cert"].as<const char*>();
+#    endif
+          }
+          strcpy(key, "mqtt_server");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            loadStrField(key, cnt_parameters_array[i].mqtt_server, sizeof(cnt_parameters_array[i].mqtt_server), json[key].as<const char*>());
+          }
+          strcpy(key, "mqtt_port");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            loadStrField(key, cnt_parameters_array[i].mqtt_port, sizeof(cnt_parameters_array[i].mqtt_port), json[key].as<const char*>());
+          }
+          strcpy(key, "mqtt_user");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            loadStrField(key, cnt_parameters_array[i].mqtt_user, sizeof(cnt_parameters_array[i].mqtt_user), json[key].as<const char*>());
+          }
+          strcpy(key, "mqtt_pass");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            loadStrField(key, cnt_parameters_array[i].mqtt_pass, sizeof(cnt_parameters_array[i].mqtt_pass), json[key].as<const char*>());
+          }
+          strcpy(key, "mqtt_broker_secure");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            cnt_parameters_array[i].isConnectionSecure = json[key].as<bool>();
+          }
+          strcpy(key, "mqtt_iscertvalid");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            cnt_parameters_array[i].isCertValidate = json[key].as<bool>();
+          }
+          strcpy(key, "valid_cnt");
+          strcat(key, index_suffix);
+          if (json.containsKey(key)) {
+            cnt_parameters_array[i].validConnection = json[key].as<bool>();
+          } else if (i == CNT_DEFAULT_INDEX) {
+            // For backward compatibility, if valid_cnt is not found, we assume the connection is valid for CNT_DEFAULT_INDEX
+            THEENGS_LOG_WARNING(F("valid_cnt not found, assuming connection is valid" CR));
+            cnt_parameters_array[i].validConnection = true;
+          }
+        }
+        if (json.containsKey("cnt_index")) {
+          cnt_index = json["cnt_index"].as<int>();
+        }
+#  endif
+        if (json.containsKey("mqtt_topic"))
+          loadStrField("mqtt_topic", mqtt_topic, sizeof(mqtt_topic), json["mqtt_topic"]);
+#  ifdef ZmqttDiscovery
+        if (json.containsKey("discovery_prefix"))
+          // discovery_prefix is extern char[] in this TU; size is parameters_size + 1.
+          loadStrField("discovery_prefix", discovery_prefix, parameters_size + 1, json["discovery_prefix"]);
+#  endif
+        if (json.containsKey("gateway_name"))
+          loadStrField("gateway_name", gateway_name, sizeof(gateway_name), json["gateway_name"]);
+        if (json.containsKey("ota_pass")) {
+          loadStrField("ota_pass", ota_pass, sizeof(ota_pass), json["ota_pass"]);
+#  ifdef WM_PWD_FROM_MAC // From ESP Mac Address, last 8 digits as the password
+          // Compare the existing ota_pass if ota_pass = OTAPASSWORD then replace with the last 8 digits of the mac address
+          // This enable user migrating from previous version to have the same WiFi portal password as previously unless they changed it
+          if (strcmp(ota_pass, "OTAPASSWORD") == 0) {
+            String s = WiFi.macAddress();
+            sprintf(ota_pass, "%.2s%.2s%.2s%.2s",
+                    s.c_str() + 6, s.c_str() + 9, s.c_str() + 12, s.c_str() + 15);
+          }
+#  endif
+        }
+#  if BLEDecryptor
+        if (json.containsKey("ble_aes")) {
+          loadStrField("ble_aes", ble_aes, sizeof(ble_aes), json["ble_aes"]);
+          THEENGS_LOG_TRACE(F("loaded default BLE AES key %s" CR), ble_aes);
+        }
+        if (json.containsKey("ble_aes_keys")) {
+          ble_aes_keys = json["ble_aes_keys"];
+          THEENGS_LOG_TRACE(F("loaded %d custom BLE AES keys" CR), ble_aes_keys.size());
+        }
+#  endif
+        result = true;
+      } else {
+        THEENGS_LOG_WARNING(F("failed to load json config" CR));
+      }
+      configFile.close();
+    }
+  } else {
+    THEENGS_LOG_NOTICE(F("No config file found defining default values" CR));
+#  ifdef USE_MAC_AS_GATEWAY_NAME
+    String s = WiFi.macAddress();
+    sprintf(gateway_name, "%.2s%.2s%.2s%.2s%.2s%.2s",
+            s.c_str(), s.c_str() + 3, s.c_str() + 6, s.c_str() + 9, s.c_str() + 12, s.c_str() + 15);
+#  endif
+#  ifdef WM_PWD_FROM_MAC // From ESP Mac Address, last 8 digits as the password
+    sprintf(ota_pass, "%.2s%.2s%.2s%.2s",
+            s.c_str() + 6, s.c_str() + 9, s.c_str() + 12, s.c_str() + 15);
+#  endif
+  }
+
+  return result;
+}
+
+void setupWiFiManager() {
+  delay(10);
+
+#  ifdef USE_MAC_AS_GATEWAY_NAME
+  String s = WiFi.macAddress();
+  snprintf(WifiManager_ssid, MAC_NAME_MAX_LEN, "%s_%.2s%.2s", Gateway_Short_Name, s.c_str(), s.c_str() + 3);
+  strcpy(ota_hostname, WifiManager_ssid);
+  THEENGS_LOG_NOTICE(F("OTA Hostname: %s.local" CR), ota_hostname);
+#  endif
+
+  wifiManager.setDebugOutput(WM_DEBUG);
+
+  // The extra parameters to be configured (can be either global or just in the setup)
+  // After connecting, parameter.getValue() will get you the configured value
+  // id/name placeholder/prompt default
+#  ifndef WIFIMNG_HIDE_MQTT_CONFIG
+#    if !MQTT_BROKER_MODE
+  WiFiManagerParameter custom_mqtt_server("server", "mqtt server", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_server, parameters_size, " minlength='1' maxlength='64' required");
+  WiFiManagerParameter custom_mqtt_port("port", "mqtt port", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_port, 6, " minlength='1' maxlength='5' required");
+  WiFiManagerParameter custom_mqtt_user("user", "mqtt user", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_user, parameters_size, " maxlength='64'");
+  WiFiManagerParameter custom_mqtt_pass("pass", "mqtt pass", MQTT_PASS, parameters_size, " input type='password' maxlength='64'");
+  WiFiManagerParameter custom_mqtt_secure("secure", "<br/>mqtt secure", "1", 2, cnt_parameters_array[CNT_DEFAULT_INDEX].isConnectionSecure ? "type=\"checkbox\" checked" : "type=\"checkbox\"");
+  WiFiManagerParameter custom_validate_cert("validate", "<br/>validate cert", "1", 2, cnt_parameters_array[CNT_DEFAULT_INDEX].isCertValidate ? "type=\"checkbox\" checked" : "type=\"checkbox\"");
+  WiFiManagerParameter custom_mqtt_cert("cert", "<br/>mqtt server cert", "", 4096);
+  WiFiManagerParameter custom_ota_server_cert("ota_cert", "<br/>ota server cert", "", 4096);
+#      if MQTT_SECURE_SIGNED_CLIENT
+  WiFiManagerParameter custom_client_cert("client_cert", "<br/>mqtt client cert", "", 4096);
+  WiFiManagerParameter custom_client_key("client_key", "<br/>mqtt client key", "", 4096);
+#      endif
+#    endif
+  WiFiManagerParameter custom_mqtt_topic("topic", "mqtt base topic", mqtt_topic, mqtt_topic_max_size, " minlength='1' maxlength='64' required");
+  WiFiManagerParameter custom_gateway_name("name", "gateway name", gateway_name, parameters_size, " minlength='1' maxlength='64' required");
+  WiFiManagerParameter custom_ota_pass("ota", "gateway password", ota_pass, parameters_size, " input type='password' minlength='8' maxlength='64' required");
+#  endif
+  //WiFiManager
+  //Local intialization. Once its business is done, there is no need to keep it around
+
+  wifiManager.setConnectTimeout(WiFi_TimeOut);
+  //Set timeout before going to portal
+  wifiManager.setConfigPortalTimeout(WifiManager_ConfigPortalTimeOut);
+
+  //set config save notify callback
+  wifiManager.setSaveConfigCallback(saveConfigCallback);
+
+//set static IP
+#  ifdef NetworkAdvancedSetup
+  THEENGS_LOG_TRACE(F("Adv wifi cfg" CR));
+  IPAddress ip_adress;
+  IPAddress gateway_adress;
+  IPAddress subnet_adress;
+  IPAddress dns_adress;
+  ip_adress.fromString(NET_IP);
+  gateway_adress.fromString(NET_GW);
+  subnet_adress.fromString(NET_MASK);
+  dns_adress.fromString(NET_DNS);
+  wifiManager.setSTAStaticIPConfig(ip_adress, gateway_adress, subnet_adress, dns_adress);
+#  endif
+
+#  ifndef WIFIMNG_HIDE_MQTT_CONFIG
+  //add all your parameters here
+#    if !MQTT_BROKER_MODE
+  wifiManager.addParameter(&custom_mqtt_server);
+  wifiManager.addParameter(&custom_mqtt_port);
+  wifiManager.addParameter(&custom_mqtt_user);
+  wifiManager.addParameter(&custom_mqtt_pass);
+  wifiManager.addParameter(&custom_mqtt_secure);
+  wifiManager.addParameter(&custom_mqtt_cert);
+  wifiManager.addParameter(&custom_validate_cert);
+  wifiManager.addParameter(&custom_ota_server_cert);
+#      if MQTT_SECURE_SIGNED_CLIENT
+  wifiManager.addParameter(&custom_client_cert);
+  wifiManager.addParameter(&custom_client_key);
+#      endif
+#    endif
+  wifiManager.addParameter(&custom_gateway_name);
+  wifiManager.addParameter(&custom_mqtt_topic);
+  wifiManager.addParameter(&custom_ota_pass);
+#  endif
+  //set minimum quality of signal so it ignores AP's under that quality
+  wifiManager.setMinimumSignalQuality(MinimumWifiSignalQuality);
+
+  if (SPIFFS.begin()) {
+    THEENGS_LOG_TRACE(F("mounted file system" CR));
+    // Check if the config file exists and prevent the portal from showing if yes
+    // Showing the portal if the config file exist would enable access to the configuration data and to the ESP update page
+    // This is a security risk if an attacker has access to the gateway password
+    // Only suppress the portal when we still have saved WiFi credentials. If the
+    // credentials were lost (e.g. NVS erased) while config.json remains, keeping
+    // the portal disabled makes the gateway impossible to re-onboard and it
+    // reboot-loops (autoConnect fails immediately -> ESPRestart, forever).
+    if (SPIFFS.exists("/config.json") && WiFi.SSID().length() > 0) {
+      wifiManager.setEnableConfigPortal(false);
+    }
+  }
+
+#  ifdef ESP32_ETHERNET
+  wifiManager.setBreakAfterConfig(true); // If ethernet is used, we don't want to block the connection by keeping the portal up
+#  endif
+
+  if (!SYSConfig.offline && !wifi_reconnect_bypass()) // if we didn't connect with saved credential we start Wifimanager web portal
+  {
+    THEENGS_LOG_NOTICE(F("Connect your phone to WIFI AP: %s with PWD: %s" CR), WifiManager_ssid, ota_pass);
+    gatewayState = GatewayState::ONBOARDING;
+    //fetches ssid and pass and tries to connect
+    //if it does not connect it starts an access point with the specified name
+    //and goes into a blocking loop awaiting configuration
+    if (!wifiManager.autoConnect(WifiManager_ssid, ota_pass)) {
+      THEENGS_LOG_WARNING(F("failed to connect and hit timeout" CR));
+      delay(3000);
+
+#  ifdef ESP32
+      /* Workaround for bug in arduino core that causes the AP to become unsecure on reboot */
+      esp_wifi_set_mode(WIFI_MODE_AP);
+      esp_wifi_start();
+      wifi_config_t conf;
+      esp_wifi_get_config(WIFI_IF_AP, &conf);
+      conf.ap.ssid_hidden = 1;
+      esp_wifi_set_config(WIFI_IF_AP, &conf);
+#  endif
+
+      bool shouldRestart = (gatewayState != GatewayState::BROKER_CONNECTED && !ethConnected && gatewayState != GatewayState::NTWK_CONNECTED);
+
+#  ifdef USE_BLUFI
+      shouldRestart = shouldRestart && !isStaConnecting();
+#  endif
+      // Restart/sleep only if not connected and not serial communication mode
+      if (shouldRestart && !SYSConfig.serial) {
+#  ifdef DEEP_SLEEP_IN_US
+        sleep();
+#  endif
+        ESPRestart(3);
+      }
+    }
+  }
+
+  displayPrint("Network connected");
+  gatewayState = GatewayState::NTWK_CONNECTED;
+
+  if (shouldSaveConfig) {
+    //read updated parameters
+    cnt_index = CNT_DEFAULT_INDEX;
+#  ifndef WIFIMNG_HIDE_MQTT_CONFIG
+#    if !MQTT_BROKER_MODE
+    // Only persist non-empty values so a partial form submit (for example a
+    // programmatic POST of only s/p) cannot wipe compile-time defaults.
+    // mqtt_pass keeps its existing sentinel-based guard below.
+    if (strlen(custom_mqtt_server.getValue()) > 0) {
+      strcpy(cnt_parameters_array[cnt_index].mqtt_server, custom_mqtt_server.getValue());
+    }
+    if (strlen(custom_mqtt_port.getValue()) > 0) {
+      strcpy(cnt_parameters_array[cnt_index].mqtt_port, custom_mqtt_port.getValue());
+    }
+    if (strlen(custom_mqtt_user.getValue()) > 0) {
+      strcpy(cnt_parameters_array[cnt_index].mqtt_user, custom_mqtt_user.getValue());
+    }
+    // Persist the MQTT password only when the form supplied a non-empty value
+    // that also differs from the compile-time MQTT_PASS sentinel. An empty
+    // value (partial / programmatic POST) must not wipe the stored password.
+    if (strlen(custom_mqtt_pass.getValue()) > 0 &&
+        strcmp(custom_mqtt_pass.getValue(), MQTT_PASS) != 0) {
+      strcpy(cnt_parameters_array[cnt_index].mqtt_pass, custom_mqtt_pass.getValue());
+    }
+    if (strlen(custom_mqtt_topic.getValue()) > 0) {
+      // The WiFiManagerParameter buffer is mqtt_topic_max_size (150) but the
+      // destination is sizeof(mqtt_topic). HTML maxlength is client-side only;
+      // a raw POST can deliver any length, so length-check before copying.
+      const char* src = custom_mqtt_topic.getValue();
+      if (strlen(src) >= sizeof(mqtt_topic)) {
+        THEENGS_LOG_WARNING(F("mqtt_topic from portal too long, ignoring" CR));
+      } else {
+        strcpy(mqtt_topic, src);
+        if (mqtt_topic[strlen(mqtt_topic) - 1] != '/' && strlen(mqtt_topic) < parameters_size) {
+          strcat(mqtt_topic, "/");
+        }
+      }
+    }
+
+    cnt_parameters_array[cnt_index].isConnectionSecure = *custom_mqtt_secure.getValue();
+    cnt_parameters_array[cnt_index].isCertValidate = *custom_validate_cert.getValue();
+    if (strlen(custom_mqtt_cert.getValue()) > MIN_CERT_LENGTH) {
+      cnt_parameters_array[cnt_index].server_cert = TheengsUtils::processCert(custom_mqtt_cert.getValue());
+    }
+    if (strlen(custom_ota_server_cert.getValue()) > MIN_CERT_LENGTH) {
+      cnt_parameters_array[cnt_index].ota_server_cert = TheengsUtils::processCert(custom_ota_server_cert.getValue());
+    }
+#      if MQTT_SECURE_SIGNED_CLIENT
+    if (strlen(custom_client_cert.getValue()) > MIN_CERT_LENGTH) {
+      cnt_parameters_array[cnt_index].client_cert = TheengsUtils::processCert(custom_client_cert.getValue());
+    }
+    if (strlen(custom_client_key.getValue()) > MIN_CERT_LENGTH) {
+      cnt_parameters_array[cnt_index].client_key = TheengsUtils::processCert(custom_client_key.getValue());
+    }
+#      endif
+#    endif
+    if (strlen(custom_gateway_name.getValue()) > 0) {
+      strcpy(gateway_name, custom_gateway_name.getValue());
+    }
+    if (strlen(custom_ota_pass.getValue()) > 0) {
+      strcpy(ota_pass, custom_ota_pass.getValue());
+    }
+#  endif
+
+#  if !MQTT_BROKER_MODE
+    // We suppose the connection is valid (could be tested before)
+    cnt_parameters_array[cnt_index].validConnection = true;
+#  endif
+
+    //save the custom parameters to FS
+    saveConfig();
+  }
+}
+#  ifdef ESP32_ETHERNET
+void setup_ethernet_esp32() {
+  bool ethBeginSuccess = false;
+  WiFi.onEvent(WiFiEvent);
+#    if defined(ETH_PHY_COLD_CYCLE) && defined(ETH_PHY_POWER) && (ETH_PHY_POWER >= 0)
+  // Give the PHY a true cold start before begin(): a warm PHY left in a stale
+  // state (seen after an NVS erase with PSRAM enabled on Theengs Bridge v1.1)
+  // can flap the link until a manual power cycle, and the in-driver reset
+  // begin() performs (short assert, short delay) does not clear it. Power the
+  // PHY down, then back up, and let its oscillator settle before begin()
+  // starts talking to it.
+  pinMode(ETH_PHY_POWER, OUTPUT);
+  digitalWrite(ETH_PHY_POWER, LOW);
+  delay(200); // hold the PHY powered down
+  digitalWrite(ETH_PHY_POWER, HIGH);
+  delay(200); // let the PHY oscillator settle
+#    endif
+#    ifdef NetworkAdvancedSetup
+  THEENGS_LOG_TRACE(F("Adv eth cfg" CR));
+  // ETH.config() has to be called after ETH.begin(): the underlying netif is
+  // created by begin(), before that the call returns false and is a no-op.
+  ethBeginSuccess = ETH.begin();
+  if (ethBeginSuccess) {
+    IPAddress ip_adress;
+    IPAddress gateway_adress;
+    IPAddress subnet_adress;
+    IPAddress dns_adress;
+    ip_adress.fromString(NET_IP);
+    gateway_adress.fromString(NET_GW);
+    subnet_adress.fromString(NET_MASK);
+    dns_adress.fromString(NET_DNS);
+    if (!ETH.config(ip_adress, gateway_adress, subnet_adress, dns_adress)) {
+      THEENGS_LOG_ERROR(F("Adv eth cfg failed" CR));
+    }
+  }
+#    else
+  THEENGS_LOG_NOTICE(F("Spl eth cfg" CR));
+  ethBeginSuccess = ETH.begin();
+#    endif
+  if (ethBeginSuccess) {
+    THEENGS_LOG_NOTICE(F("Ethernet started" CR));
+    while (!ethConnected && failure_number_ntwk <= maxConnectionRetryNetwork) {
+      delay(500);
+      THEENGS_LOG_NOTICE(F("." CR));
+      failure_number_ntwk++;
+    }
+  } else {
+    THEENGS_LOG_ERROR(F("Ethernet not started" CR));
+    gatewayState = GatewayState::ERROR;
+  }
+}
+
+void WiFiEvent(WiFiEvent_t event) {
+  switch (event) {
+    case ARDUINO_EVENT_ETH_START:
+      THEENGS_LOG_TRACE(F("Ethernet Started" CR));
+      ETH.setHostname(gateway_name);
+      break;
+    case ARDUINO_EVENT_ETH_CONNECTED:
+      THEENGS_LOG_NOTICE(F("Ethernet Connected" CR));
+      break;
+    case ARDUINO_EVENT_ETH_GOT_IP:
+      THEENGS_LOG_NOTICE(F("OpenMQTTGateway Ethernet MAC: %s" CR), ETH.macAddress().c_str());
+      THEENGS_LOG_NOTICE(F("OpenMQTTGateway Ethernet IP: %s" CR), ETH.localIP().toString().c_str());
+      THEENGS_LOG_NOTICE(F("OpenMQTTGateway Ethernet link speed: %d Mbps" CR), ETH.linkSpeed());
+      gatewayState = GatewayState::NTWK_CONNECTED;
+      ethConnected = true;
+      break;
+    case ARDUINO_EVENT_ETH_DISCONNECTED:
+      THEENGS_LOG_WARNING(F("Ethernet Disconnected" CR));
+      ethConnected = false;
+      break;
+    case ARDUINO_EVENT_ETH_STOP:
+      THEENGS_LOG_WARNING(F("Ethernet Stopped" CR));
+      ethConnected = false;
+      break;
+    default:
+      break;
+  }
+}
+#  endif
+#endif
+
+#if DEFAULT_LOW_POWER_MODE != DEACTIVATED && defined(ESP32)
+/**
+ * Deep-sleep for the ESP32 - e.g. DEEP_SLEEP_IN_US 30000000 for 30 seconds / wake by ESP32_EXT0_WAKE_PIN/ESP32_EXT1_WAKE_PIN.
+ * Everything is off and (almost) all execution state is lost.
+ */
+void sleep() {
+  if (SYSConfig.powerMode < PowerMode::INTERVAL)
+    return;
+  THEENGS_LOG_NOTICE(F("Entering deep sleep" CR));
+  gatewayState = GatewayState::SLEEPING;
+  delay(250); // To allow the LEDs to switch off and MQTT message to be sent
+#  if defined(ZboardM5STACK) || defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
+  sleepScreen();
+  esp_sleep_enable_ext0_wakeup((gpio_num_t)SLEEP_BUTTON, LOW);
+#  endif
+  THEENGS_LOG_TRACE(F("Deactivating ESP32 components" CR));
+#  ifdef ZgatewayBT
+  stopProcessing(true);
+  ProcessLock = true;
+#  endif
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  adc_power_off();
+#  pragma GCC diagnostic pop
+  esp_wifi_stop();
+#  ifdef ESP32_EXT0_WAKE_PIN
+  THEENGS_LOG_NOTICE(F("Entering deep sleep, EXT0 Wakeup by pin : %l." CR), ESP32_EXT0_WAKE_PIN);
+#  endif
+#  ifdef ESP32_EXT1_WAKE_PIN
+  THEENGS_LOG_NOTICE(F("Entering deep sleep, EXT1 Wakeup by pin : %l." CR), ESP32_EXT1_WAKE_PIN);
+#  endif
+  if (SYSConfig.powerMode == PowerMode::ACTION) {
+    esp_deep_sleep_start();
+  } else if (SYSConfig.powerMode == PowerMode::INTERVAL) {
+    THEENGS_LOG_NOTICE(F("Entering deep sleep for %l us." CR), DEEP_SLEEP_IN_US);
+    esp_deep_sleep(DEEP_SLEEP_IN_US);
+  }
+}
+#else
+void sleep() {}
+#endif
+
+void loop() {
+#ifndef ESPWifiManualSetup
+  checkButton(); // check if a reset of wifi/mqtt settings is asked
+#endif
+
+#ifdef ESP8266
+  updateAndHandleLEDsTask(); // With ESP8266 we need to update the LEDs in the loop
+#endif
+  if (!SYSConfig.offline) { // Online mode
+    if (mqttSetupPending) {
+      setupMQTT();
+      mqttSetupPending = false;
+    }
+    // When online the MQTT connection callback release the processes
+  }
+  if (firstStart) {
+#ifdef ZgatewaySERIAL
+    extern bool isSerialReady();
+    if (SYSConfig.serial && isSerialReady()) {
+#  ifdef ZgatewayBT
+      BTProcessLock = !BTConfig.enabled;
+#  endif
+      ProcessLock = false;
+      firstStart = false;
+    }
+#else
+    ProcessLock = false;
+    firstStart = false;
+#endif
+  }
+  unsigned long now = millis();
+
+#ifdef ZgatewaySERIAL // Serial is a module and a communication layer so it's always processed
+  SERIALtoX();
+#endif
+
+  if (ethConnected || WiFi.status() == WL_CONNECTED) {
+    if (ethConnected && WiFi.status() == WL_CONNECTED) {
+      WiFi.disconnect(); // we disconnect the wifi as we are connected to ethernet
+    }
+    ArduinoOTA.handle();
+    failure_number_ntwk = 0;
+    if (now > (timer_sys_checks + (TimeBetweenCheckingSYS * 1000)) || !timer_sys_checks) {
+#if message_UTCtimestamp || message_unixtimestamp
+      TheengsUtils::syncNTP();
+#endif
+      if (!timer_sys_checks) { // Update check at start up only
+#if defined(ESP32) && defined(MQTT_HTTPS_FW_UPDATE)
+        checkForUpdates();
+#endif
+      }
+      timer_sys_checks = millis();
+    }
+#if defined(ZwebUI) && defined(ESP32)
+    WebUILoop();
+#endif
+    mqtt->loop();
+    if (mqtt->connected()) { // MQTT client is still connected
+      failure_number_ntwk = 0;
+
+#ifdef ZmqttDiscovery
+      // Deactivate autodiscovery after DiscoveryAutoOffTimer.
+      // Exception: when discovery_republish_on_reconnect is enabled, we never never automatically disable discovery
+      if (!discovery_republish_on_reconnect && SYSConfig.discovery && (now > lastDiscovery + DiscoveryAutoOffTimer))
+        SYSConfig.discovery = false;
+#endif
+    }
+  } else if (!SYSConfig.offline && !SYSConfig.serial) { // disconnected from network
+    THEENGS_LOG_WARNING(F("Network disconnected" CR));
+    gatewayState = GatewayState::NTWK_DISCONNECTED;
+    if (!wifi_reconnect_bypass()) {
+      failure_number_ntwk++;
+      THEENGS_LOG_WARNING(F("failure_number_ntwk: %d" CR), failure_number_ntwk);
+      // Self-heal from a wedged WiFi stack: if reconnection keeps failing, restart the ESP.
+      // Disabled on environments where an unexpected reboot is undesirable (e.g. a smart plug).
+      if (WifiReconnectWatchDog && failure_number_ntwk > maxRetryWatchDog) {
+        ESPRestart(2);
+      }
+      sleep();
+    } else {
+      gatewayState = GatewayState::NTWK_CONNECTED;
+    }
+  }
+
+#if defined(ESP32) && defined(USE_BLUFI)
+  if (SYSConfig.blufi) {
+    if (gatewayState != previousGatewayState) {
+      THEENGS_LOG_NOTICE(F("Gateway state changed to: %d" CR), gatewayState);
+      previousGatewayState = gatewayState;
+      set_blufi_mfg_data();
+    }
+  }
+#endif
+
+  if (!ProcessLock) {
+    if (now > (timer_sys_measures + (TimeBetweenReadingSYS * 1000)) || !timer_sys_measures) {
+      timer_sys_measures = millis();
+      stateMeasures();
+#ifdef ZgatewayBT
+      stateBTMeasures(false);
+#endif
+#ifdef ZactuatorONOFF
+      stateONOFFMeasures();
+#endif
+#ifdef ZdisplaySSD1306
+      stateSSD1306Display();
+#endif
+#ifdef ZgatewayLORA
+      extern String stateLORAMeasures();
+      stateLORAMeasures();
+#endif
+#if defined(ZgatewayRTL_433) || defined(ZgatewayPilight) || defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
+      stateRFMeasures();
+#endif
+#if defined(ZwebUI) && defined(ESP32)
+      stateWebUIStatus();
+#endif
+    }
+// Function that doesn't need an active connection
+#if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
+    loopM5();
+#endif
+#if defined(ZdisplaySSD1306)
+    loopSSD1306();
+#endif
+#ifdef ZsensorBME280
+    MeasureTempHumAndPressure(); //Addon to measure Temperature, Humidity, Pressure and Altitude with a Bosch BME280/BMP280
+#endif
+#ifdef ZsensorHTU21
+    MeasureTempHum(); //Addon to measure Temperature, Humidity, of a HTU21 sensor
+#endif
+#ifdef ZsensorLM75
+    MeasureTemp(); //Addon to measure Temperature of an LM75 sensor
+#endif
+#ifdef ZsensorAHTx0
+    MeasureAHTTempHum(); //Addon to measure Temperature, Humidity, of an 'AHTx0' sensor
+#endif
+#ifdef ZsensorHCSR04
+    MeasureDistance(); //Addon to measure distance with a HC-SR04
+#endif
+#ifdef ZsensorBH1750
+    MeasureLightIntensity(); //Addon to measure Light Intensity with a BH1750
+#endif
+#ifdef ZsensorMQ2
+    extern void MeasureGasMQ2();
+    MeasureGasMQ2();
+#endif
+#ifdef ZsensorTEMT6000
+    MeasureLightIntensityTEMT6000();
+#endif
+#ifdef ZsensorTSL2561
+    MeasureLightIntensityTSL2561();
+#endif
+#ifdef ZsensorC37_YL83_HMRD
+    MeasureC37_YL83_HMRDWater(); //Addon for leak detection with a C-37 YL-83 H-MRD
+#endif
+#ifdef ZsensorDHT
+    MeasureTempAndHum(); //Addon to measure the temperature with a DHT
+#endif
+#ifdef ZsensorSHTC3
+    MeasureTempAndHum(); //Addon to measure the temperature with a DHT
+#endif
+#ifdef ZsensorDS1820
+    MeasureDS1820Temp(); //Addon to measure the temperature with DS1820 sensor(s)
+#endif
+#ifdef ZsensorINA226
+    MeasureINA226();
+#endif
+#ifdef ZsensorHCSR501
+    MeasureHCSR501();
+#endif
+#ifdef ZsensorGPIOInput
+    MeasureGPIOInput();
+#endif
+#ifdef ZsensorGPIOKeyCode
+    MeasureGPIOKeyCode();
+#endif
+#ifdef ZsensorADC
+    MeasureADC(); //Addon to measure the analog value of analog pin
+#endif
+#ifdef ZsensorTouch
+    MeasureTouch();
+#endif
+#ifdef ZgatewayLORA
+    LORAtoX();
+#  ifdef ZmqttDiscovery
+    if (SYSConfig.discovery)
+      launchLORADiscovery(false);
+#  endif
+#endif
+#ifdef ZgatewayRF
+    RFtoX();
+#endif
+#ifdef ZgatewayRF2
+    RF2toX();
+#endif
+#ifdef ZgatewayWeatherStation
+    ZgatewayWeatherStationtoX();
+#endif
+#ifdef ZgatewayGFSunInverter
+    ZgatewayGFSunInverterMQTT();
+#endif
+#ifdef ZgatewayPilight
+    PilighttoX();
+#endif
+#ifdef ZgatewayBT
+#  ifdef ZmqttDiscovery
+    if (SYSConfig.discovery)
+      launchBTDiscovery(false);
+#  endif
+#endif
+#ifdef ZgatewaySRFB
+    SRFBtoX();
+#endif
+#ifdef ZgatewayIR
+    IRtoX();
+#endif
+#ifdef Zgateway2G
+    if (_2GtoX())
+      THEENGS_LOG_TRACE(F("2GtoMQTT OK" CR));
+#endif
+#ifdef ZgatewayRFM69
+    if (RFM69toX())
+      THEENGS_LOG_TRACE(F("RFM69toMQTT OK" CR));
+#endif
+#ifdef ZactuatorFASTLED
+    FASTLEDLoop();
+#endif
+#ifdef ZactuatorPWM
+    PWMLoop();
+#endif
+#ifdef ZgatewayRTL_433
+    RTL_433Loop();
+#  ifdef ZmqttDiscovery
+    if (SYSConfig.discovery)
+      launchRTL_433Discovery(false);
+#  endif
+#endif
+  }
+  // Empty the queue
+  emptyQueue();
+  // Sleep if ready
+  if (ready_to_sleep) {
+    sleep();
+  }
+  delay(1);
+}
+
+/**
+ * Calculate uptime and take into account the millis() rollover
+ */
+unsigned long uptime() {
+  static unsigned long lastUptime = 0;
+  static unsigned long uptimeAdd = 0;
+  unsigned long uptime = millis() / 1000 + uptimeAdd;
+  if (uptime < lastUptime) {
+    uptime += 4294967;
+    uptimeAdd += 4294967;
+  }
+  lastUptime = uptime;
+  return uptime;
+}
+
+/**
+ * Calculate internal ESP32 temperature
+ */
+#if defined(ESP32) && !defined(NO_INT_TEMP_READING)
+float intTemperatureRead() {
+  SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_SAR, 3, SENS_FORCE_XPD_SAR_S);
+  SET_PERI_REG_BITS(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_CLK_DIV, 10, SENS_TSENS_CLK_DIV_S);
+  CLEAR_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP);
+  CLEAR_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_DUMP_OUT);
+  SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP_FORCE);
+  SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP);
+  ets_delay_us(100);
+  SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_DUMP_OUT);
+  ets_delay_us(5);
+  float temp_f = (float)GET_PERI_REG_BITS2(SENS_SAR_SLAVE_ADDR3_REG, SENS_TSENS_OUT, SENS_TSENS_OUT_S);
+  float temp_c = (temp_f - 32) / 1.8;
+  return temp_c;
+}
+#endif
+
+/*
+ Erase config and restart the ESP
+*/
+void eraseConfig() {
+#ifdef SecondaryModule
+  // Erase the secondary module config
+  String eraseCmdStr = "{\"cmd\":\"" + String(eraseCmd) + "\"}";
+  THEENGS_LOG_NOTICE(F("Erasing secondary module config: %s" CR), eraseCmdStr.c_str());
+  receivingDATA(subjectMQTTtoSYSsetSecondaryModule, eraseCmdStr.c_str());
+  delay(2000);
+#endif
+  // SPIFFS.format() has to be called outside of the log macro, THEENGS_LOG_TRACE
+  // expands to ((void)0) below LOG_LEVEL_TRACE and discards its arguments with it
+  bool formatted = SPIFFS.format();
+  THEENGS_LOG_TRACE(F("Formatting requested, result: %d" CR), formatted);
+  if (!formatted) {
+    THEENGS_LOG_ERROR(F("SPIFFS format failed, config may be retained" CR));
+  }
+
+#if defined(ESP8266)
+  WiFi.disconnect(true);
+  ESP.eraseConfig();
+#else
+  nvs_flash_erase();
+#endif
+  ESPRestart(0);
+}
+
+String stateMeasures() {
+  StaticJsonDocument<JSON_MSG_BUFFER> SYSdata;
+
+  SYSdata["uptime"] = uptime();
+
+  SYSdata["version"] = OMG_VERSION;
+#ifdef LED_ADDRESSABLE
+  SYSdata["rgbb"] = SYSConfig.rgbbrightness;
+#endif
+#if USE_BLUFI
+  SYSdata["blufi"] = SYSConfig.blufi;
+#endif
+  SYSdata["mqtt"] = SYSConfig.mqtt;
+  SYSdata["serial"] = SYSConfig.serial;
+#ifdef ZmqttDiscovery
+  SYSdata["disc"] = SYSConfig.discovery;
+#endif
+  SYSdata["env"] = ENV_NAME;
+  uint32_t freeMem;
+  uint32_t minFreeMem;
+  freeMem = ESP.getFreeHeap();
+#ifdef ZgatewayRTL_433
+  // Some RTL_433 decoders have memory leak, this is a temporary workaround
+  if (freeMem < MinimumMemory) {
+    THEENGS_LOG_ERROR(F("Not enough memory %d, restarting" CR), freeMem);
+    gatewayState = GatewayState::ERROR;
+    ESPRestart(8);
+  }
+#endif
+  SYSdata["freemem"] = freeMem;
+#if !MQTT_BROKER_MODE
+  SYSdata["mqttp"] = cnt_parameters_array[cnt_index].mqtt_port;
+  SYSdata["mqtts"] = cnt_parameters_array[cnt_index].isConnectionSecure;
+  SYSdata["mqttv"] = cnt_parameters_array[cnt_index].isCertValidate;
+#endif
+  SYSdata["msgprc"] = queueLengthSum;
+  SYSdata["msgblck"] = blockedMessages;
+  SYSdata["msgrcv"] = receivedMessages;
+  SYSdata["maxq"] = maxQueueLength;
+  SYSdata["cnt_index"] = cnt_index;
+#ifdef ESP32
+  minFreeMem = ESP.getMinFreeHeap();
+  SYSdata["minmem"] = minFreeMem;
+#  ifndef NO_INT_TEMP_READING
+  SYSdata["tempc"] = TheengsUtils::round2(intTemperatureRead());
+#  endif
+  SYSdata["freestck"] = uxTaskGetStackHighWaterMark(NULL);
+  SYSdata["powermode"] = SYSConfig.powerMode;
+  if (psramFound()) {
+    SYSdata["psram"] = true;
+    SYSdata["psramfree"] = ESP.getFreePsram();
+  }
+#endif
+
+  SYSdata["eth"] = ethConnected;
+  if (ethConnected) {
+#ifdef ESP32_ETHERNET
+    SYSdata["mac"] = (char*)ETH.macAddress().c_str();
+    SYSdata["ip"] = TheengsUtils::ip2CharArray(ETH.localIP());
+    ETH.fullDuplex() ? SYSdata["fd"] = (bool)"true" : SYSdata["fd"] = (bool)"false";
+    SYSdata["linkspeed"] = (int)ETH.linkSpeed();
+#endif
+  } else {
+    SYSdata["rssi"] = (long)WiFi.RSSI();
+    SYSdata["SSID"] = (char*)WiFi.SSID().c_str();
+    SYSdata["BSSID"] = (char*)WiFi.BSSIDstr().c_str();
+    SYSdata["ip"] = TheengsUtils::ip2CharArray(WiFi.localIP());
+    SYSdata["mac"] = (char*)WiFi.macAddress().c_str();
+  }
+#ifdef ZboardM5STACK
+  // Power is initialised by M5.begin() in setupM5(); no explicit begin() needed.
+  SYSdata["m5battlevel"] = (int8_t)M5.Power.getBatteryLevel();
+  SYSdata["m5ischarging"] = (bool)(M5.Power.isCharging() == m5::Power_Class::is_charging);
+  SYSdata["m5ischargefull"] = (bool)(M5.Power.getBatteryLevel() >= 100);
+#endif
+#if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
+  // M5Unified exposes a portable battery API across the AXP192/AXP2101 PMICs.
+  // getBatteryVoltage() is in mV; convert to volts to preserve the previous
+  // field semantics. The AXP192-only Vin/VBus/internal-temperature/power
+  // readings have no portable M5Unified equivalent, so those fields are dropped.
+  SYSdata["m5batvoltage"] = (float)M5.Power.getBatteryVoltage() / 1000.0f;
+  SYSdata["m5batcurrent"] = (float)M5.Power.getBatteryCurrent();
+  SYSdata["m5battlevel"] = (int8_t)M5.Power.getBatteryLevel();
+  SYSdata["m5ischarging"] = (bool)(M5.Power.isCharging() == m5::Power_Class::is_charging);
+#endif
+  SYSdata["modules"] = modules;
+
+  SYSdata["origin"] = subjectSYStoMQTT;
+  enqueueJsonObject(SYSdata);
+
+  char jsonChar[100];
+  serializeJson(modules, jsonChar, 99);
+
+  String _modules = jsonChar;
+
+  _modules.replace(",", ", ");
+  _modules.replace("[", "");
+  _modules.replace("]", "");
+  _modules.replace("\"", "'");
+
+  SYSdata["modules"] = _modules.c_str();
+
+  String output;
+  serializeJson(SYSdata, output);
+  THEENGS_LOG_NOTICE(F("SYS json: %s" CR), output.c_str());
+  return output;
+}
+
+#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) || defined(ZgatewayRTL_433)
+/**
+ * Store signal values from RF, IR, SRFB or Weather stations so as to avoid duplicates
+ */
+void storeSignalValue(uint64_t MQTTvalue) {
+  unsigned long now = millis();
+  // find oldest value of the buffer
+  int o = getMin();
+  THEENGS_LOG_TRACE(F("Min ind: %d" CR), o);
+  // replace it by the new one
+  receivedSignal[o].value = MQTTvalue;
+  receivedSignal[o].time = now;
+
+  // Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
+  THEENGS_LOG_TRACE(F("store code : %u / %u" CR), (unsigned long)receivedSignal[o].value, receivedSignal[o].time);
+  THEENGS_LOG_TRACE(F("Col: val/timestamp" CR));
+  for (int i = 0; i < struct_size; i++) {
+    THEENGS_LOG_TRACE(F("mem code : %u / %u" CR), (unsigned long)receivedSignal[i].value, receivedSignal[i].time);
+  }
+}
+
+/**
+ * get oldest time index from the values array from RF, IR, SRFB or Weather stations so as to avoid duplicates
+ */
+int getMin() {
+  unsigned int minimum = receivedSignal[0].time;
+  int minindex = 0;
+  for (int i = 1; i < struct_size; i++) {
+    if (receivedSignal[i].time < minimum) {
+      minimum = receivedSignal[i].time;
+      minindex = i;
+    }
+  }
+  return minindex;
+}
+
+/**
+ * Check if signal values from RF, IR, SRFB or Weather stations are duplicates
+ */
+bool isAduplicateSignal(uint64_t value) {
+  THEENGS_LOG_TRACE(F("isAdupl?" CR));
+  for (int i = 0; i < struct_size; i++) {
+    if (receivedSignal[i].value == value) {
+      unsigned long now = millis();
+      if (now - receivedSignal[i].time < time_avoid_duplicate) { // change
+        THEENGS_LOG_TRACE(F("no pub. dupl" CR));
+        return true;
+      }
+    }
+  }
+  return false;
+}
+#endif
+
+void receivingDATA(const char* topicOri, const char* datacallback) {
+  std::string strTopicOri = topicOri;
+  StaticJsonDocument<JSON_MSG_BUFFER_MAX> jsonBuffer;
+  JsonObject jsondata = jsonBuffer.to<JsonObject>();
+  DeserializationError error = deserializeJson(jsonBuffer, datacallback);
+  if (error || jsondata.isNull()) {
+    THEENGS_LOG_ERROR(F("deserialize MQTT data failed: %s" CR), error.c_str());
+    gatewayState = GatewayState::ERROR;
+    return;
+  }
+  if (topicOri == nullptr || strcmp(topicOri, "") == 0) {
+    if (jsondata.containsKey("target") && jsondata["target"].is<const char*>()) {
+      strTopicOri = jsondata["target"].as<const char*>();
+      THEENGS_LOG_TRACE(F("BUS Msg target: %s" CR), strTopicOri.c_str());
+    } else if (jsondata.containsKey("origin") && jsondata["origin"].is<const char*>()) {
+      strTopicOri = jsondata["origin"].as<const char*>();
+      THEENGS_LOG_TRACE(F("BUS Msg origin: %s" CR), strTopicOri.c_str());
+    }
+  } else {
+#if defined(SecondaryModule) // Redirect certain commands to Serial
+    String topicSerial = String(mqtt_topic) + String(gateway_name) + subjectMQTTtoSERIAL;
+    const char* cSecondaryModule = SecondaryModule;
+    if (strcmp(cSecondaryModule, "BT") == 0) {
+      if (cmpToMainTopic(topicOri, subjectMQTTtoBTset)) {
+        strTopicOri = topicSerial.c_str();
+        jsondata["target"] = subjectMQTTtoBTset;
+      } else if (cmpToMainTopic(topicOri, subjectMQTTtoBT)) {
+        strTopicOri = topicSerial.c_str();
+        jsondata["target"] = subjectMQTTtoBT;
+      }
+    }
+    if (cmpToMainTopic(topicOri, subjectMQTTtoSYSsetSecondaryModule)) {
+      strTopicOri = topicSerial.c_str();
+      jsondata["target"] = subjectMQTTtoSYSsetSecondaryModule;
+    }
+#endif
+    THEENGS_LOG_TRACE(F("MQTT Msg topic: %s" CR), strTopicOri.c_str());
+  }
+
+#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation)
+  if (strstr(strTopicOri.c_str(), subjectMultiGTWKey) != NULL) { // storing received value so as to avoid publishing this value if it has been already sent by this or another OpenMQTTGateway
+    uint64_t data = jsondata.isNull() ? strtoull(datacallback, NULL, 10) : jsondata["value"];
+    if (data != 0 && !isAduplicateSignal(data)) {
+      storeSignalValue(data);
+    }
+  }
+#endif
+
+  if (!jsondata.isNull()) { // json object ok -> json decoding
+    // log the received json
+    String buffer = "";
+    serializeJson(jsondata, buffer);
+    //THEENGS_LOG_NOTICE(F("[ MQTT->OMG ]: %s" CR), buffer.c_str());
+
+#ifdef ZgatewayPilight // ZgatewayPilight is only defined with json publishing due to its numerous parameters
+    extern void XtoPilight(const char* topicOri, JsonObject& RFdata);
+    XtoPilight(strTopicOri.c_str(), jsondata);
+#endif
+#if defined(ZgatewayRTL_433) || defined(ZgatewayPilight) || defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
+    XtoRFset(strTopicOri.c_str(), jsondata);
+#endif
+#if jsonReceiving
+#  ifdef ZgatewayLORA
+    XtoLORA(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewayRF
+    XtoRF(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewayRF2
+    XtoRF2(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef Zgateway2G
+    Xto2G(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewaySRFB
+    XtoSRFB(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewayIR
+    XtoIR(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewayRFM69
+    XtoRFM69(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewayBT
+    XtoBT(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZactuatorFASTLED
+    XtoFASTLED(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZactuatorPWM
+    XtoPWM(strTopicOri.c_str(), jsondata);
+#  endif
+#  if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
+    void XtoM5(const char* topicOri, JsonObject& M5data);
+    XtoM5(strTopicOri.c_str(), jsondata);
+#  endif
+#  if defined(ZdisplaySSD1306)
+    XtoSSD1306(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZactuatorONOFF
+    XtoONOFF(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZactuatorSomfy
+    XtoSomfy(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef ZgatewaySERIAL
+    XtoSERIAL(strTopicOri.c_str(), jsondata);
+#  endif
+#  ifdef MQTT_HTTPS_FW_UPDATE
+    MQTTHttpsFWUpdate(strTopicOri.c_str(), jsondata);
+#  endif
+#  if defined(ZwebUI) && defined(ESP32)
+    XtoWebUI(strTopicOri.c_str(), jsondata);
+#  endif
+#endif
+
+    XtoSYS(strTopicOri.c_str(), jsondata);
+  } else { // not a json object --> simple decoding
+#if simpleReceiving
+#  ifdef ZgatewayLORA
+    XtoLORA(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef ZgatewayRF
+    XtoRF(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef ZgatewayRF315
+    XtoRF315(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef ZgatewayRF2
+    XtoRF2(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef Zgateway2G
+    Xto2G(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef ZgatewaySRFB
+    XtoSRFB(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef ZgatewayRFM69
+    XtoRFM69(strTopicOri.c_str(), datacallback);
+#  endif
+#  ifdef ZactuatorFASTLED
+    XtoFASTLED(strTopicOri.c_str(), datacallback);
+#  endif
+#endif
+#ifdef ZactuatorONOFF
+    XtoONOFF(strTopicOri.c_str(), datacallback);
+#endif
+  }
+}
+
+#ifdef MQTT_HTTPS_FW_UPDATE
+String latestVersion;
+#  ifdef ESP32
+#    include <HTTPClient.h>
+#    include <HTTPUpdate.h>
+
+#    if CHECK_OTA_UPDATE
+/**
+ * Check on a server the latest version information to build a releaseLink
+ * The release link will be used when the user trigger an OTA update command
+ * Only available for ESP32
+ */
+bool checkForUpdates() {
+  THEENGS_LOG_NOTICE(F("Update check, free heap: %d"), ESP.getFreeHeap());
+  HTTPClient http;
+  http.setTimeout((GeneralTimeOut - 1) * 1000); // -1 to avoid WDT
+  http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+
+  std::string ota_cert;
+#      if !MQTT_BROKER_MODE
+  if (cnt_parameters_array[cnt_index].ota_server_cert.length() > MIN_CERT_LENGTH) {
+    THEENGS_LOG_NOTICE(F("Using memory cert" CR));
+    ota_cert = cnt_parameters_array[cnt_index].ota_server_cert;
+  } else
+#      endif
+  {
+    THEENGS_LOG_NOTICE(F("Using config cert" CR));
+    ota_cert = OTAserver_cert;
+  }
+
+  http.begin(OTA_JSON_URL, ota_cert.c_str());
+  int httpCode = http.GET();
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  JsonObject jsondata = jsonBuffer.to<JsonObject>();
+
+  if (httpCode > 0) { //Check for the returning code
+    String payload = http.getString();
+    auto error = deserializeJson(jsonBuffer, payload);
+    if (error) {
+      THEENGS_LOG_ERROR(F("Deserialize MQTT data failed: %s" CR), error.c_str());
+      gatewayState = GatewayState::ERROR;
+    }
+    THEENGS_LOG_TRACE(F("HttpCode %d" CR), httpCode);
+    THEENGS_LOG_TRACE(F("Payload %s" CR), payload.c_str());
+  } else {
+    THEENGS_LOG_ERROR(F("Error on HTTP request"));
+    gatewayState = GatewayState::ERROR;
+  }
+  http.end(); //Free the resources
+  THEENGS_LOG_NOTICE(F("Update check done, free heap: %d"), ESP.getFreeHeap());
+  if (jsondata.containsKey("latest_version")) {
+    jsondata["installed_version"] = OMG_VERSION;
+    jsondata["entity_picture"] = ENTITY_PICTURE;
+    if (!jsondata.containsKey("release_summary"))
+      jsondata["release_summary"] = "";
+    // Per-environment version pinning: if the manifest carries an "envs" map with
+    // an entry for this build's ENV_NAME, that entry caps the version offered to
+    // this board; boards without an entry fall back to the global latest_version.
+    // This lets the OTA server hold e.g. theengs-plug at an older release while the
+    // rest of the fleet advances, with no board-specific firmware build flags.
+    // The "envs" map is expected to list only pinned exceptions so the manifest
+    // stays within JSON_MSG_BUFFER (1024 B on ESP32).
+    JsonVariant envVersion = jsondata["envs"][ENV_NAME];
+    if (!envVersion.isNull()) {
+      latestVersion = envVersion.as<String>();
+    } else {
+      latestVersion = jsondata["latest_version"].as<String>();
+    }
+    // Publish the resolved value as latest_version so the Home Assistant update
+    // entity compares against the (possibly pinned) version, and drop the map so
+    // it is not carried in the retained state topic.
+    jsondata["latest_version"] = latestVersion;
+    jsondata.remove("envs");
+    jsondata["origin"] = subjectRLStoMQTT;
+    jsondata["retain"] = true;
+    enqueueJsonObject(jsondata);
+
+    THEENGS_LOG_TRACE(F("Update file found on server, offering version %s" CR), latestVersion.c_str());
+    return true;
+  } else {
+    THEENGS_LOG_TRACE(F("No update file found on server" CR));
+    return false;
+  }
+}
+
+#    else
+bool checkForUpdates() {
+  return false;
+}
+#    endif
+#  elif ESP8266
+#    include <ESP8266httpUpdate.h>
+#  endif
+
+void MQTTHttpsFWUpdate(const char* topicOri, JsonObject& HttpsFwUpdateData) {
+  if (strstr(topicOri, subjectMQTTtoSYSupdate) != NULL) {
+    const char* version = HttpsFwUpdateData["version"] | "latest";
+    if (version && ((strlen(version) != strlen(OMG_VERSION)) || strcmp(version, OMG_VERSION) != 0)) {
+      const char* url = HttpsFwUpdateData["url"];
+      String systemUrl;
+      if (url) {
+        if (!strstr((url + (strlen(url) - 5)), ".bin")) {
+          THEENGS_LOG_ERROR(F("Invalid firmware extension" CR));
+          gatewayState = GatewayState::ERROR;
+          return;
+        }
+#  if MQTT_HTTPS_FW_UPDATE_USE_PASSWORD > 0
+        const char* pwd = HttpsFwUpdateData["password"];
+        if (pwd) {
+          if (strcmp(pwd, ota_pass) != 0) {
+            THEENGS_LOG_ERROR(F("Invalid OTA password" CR));
+            gatewayState = GatewayState::ERROR;
+            return;
+          }
+        } else {
+          THEENGS_LOG_ERROR(F("No password sent" CR));
+          gatewayState = GatewayState::ERROR;
+          return;
+        }
+#  endif
+#  ifdef ESP32
+      } else if (strcmp(version, "latest") == 0) {
+        systemUrl = RELEASE_LINK + latestVersion + "/" + ENV_NAME + "-firmware.bin";
+        url = systemUrl.c_str();
+        THEENGS_LOG_NOTICE(F("Using system OTA url with latest version %s" CR), url);
+      } else if (strcmp(version, "dev") == 0) {
+        systemUrl = String(RELEASE_LINK_DEV) + ENV_NAME + "-firmware.bin";
+        url = systemUrl.c_str();
+        THEENGS_LOG_NOTICE(F("Using system OTA url with dev version %s" CR), url);
+      } else if (version[0] == 'v') {
+        systemUrl = String(RELEASE_LINK) + version + "/" + ENV_NAME + "-firmware.bin";
+        url = systemUrl.c_str();
+        THEENGS_LOG_NOTICE(F("Using system OTA url with defined version %s" CR), url);
+#  endif
+      } else {
+        THEENGS_LOG_ERROR(F("Invalid URL" CR));
+        gatewayState = GatewayState::ERROR;
+        return;
+      }
+#  ifdef ESP32
+      ProcessLock = true;
+#    ifdef ZgatewayBT
+      stopProcessing(true);
+#    endif
+#  endif
+      THEENGS_LOG_WARNING(F("Starting firmware update with %d freeHeap" CR), ESP.getFreeHeap());
+      gatewayState = GatewayState::REMOTE_OTA_IN_PROGRESS;
+
+      StaticJsonDocument<JSON_MSG_BUFFER> jsondata;
+      jsondata["release_summary"] = "Update in progress ...";
+      jsondata["origin"] = subjectRLStoMQTT;
+      enqueueJsonObject(jsondata);
+
+      std::string ota_cert = TheengsUtils::processCert(HttpsFwUpdateData["ota_server_cert"] | "");
+      THEENGS_LOG_NOTICE(F("OTA cert: %s" CR), ota_cert.c_str());
+      if (ota_cert.length() < MIN_CERT_LENGTH && !strstr(url, "http:")) {
+#  if !MQTT_BROKER_MODE
+        if (cnt_parameters_array[cnt_index].ota_server_cert.length() > MIN_CERT_LENGTH) {
+          THEENGS_LOG_NOTICE(F("Using memory cert" CR));
+          ota_cert = cnt_parameters_array[cnt_index].ota_server_cert.c_str();
+        } else
+#  endif
+        {
+          THEENGS_LOG_NOTICE(F("Using config cert" CR));
+          ota_cert = OTAserver_cert;
+        }
+      }
+
+      t_httpUpdate_return result = HTTP_UPDATE_FAILED;
+      if (strstr(url, "http:")) {
+        THEENGS_LOG_NOTICE(F("Http update" CR));
+        WiFiClient update_client;
+#  ifdef ESP32
+        httpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+        result = httpUpdate.update(update_client, url);
+#  elif ESP8266
+        ESPhttpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+        result = ESPhttpUpdate.update(update_client, url);
+#  endif
+
+      } else {
+        WiFiClientSecure update_client;
+#  if !MQTT_BROKER_MODE
+        if (cnt_parameters_array[cnt_index].isConnectionSecure) {
+          mqtt.reset();
+          mqttSetupPending = true;
+          update_client = *static_cast<WiFiClientSecure*>(eClient.get());
+        }
+#  endif
+        TheengsUtils::syncNTP();
+
+#  ifdef ESP32
+        update_client.setCACert(ota_cert.c_str());
+        update_client.setTimeout(12);
+        httpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+        httpUpdate.rebootOnUpdate(false);
+        result = httpUpdate.update(update_client, url);
+#  elif ESP8266
+        caCert.append(ota_cert.c_str());
+        update_client.setTrustAnchors(&caCert);
+        update_client.setTimeout(12000);
+        ESPhttpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+        ESPhttpUpdate.rebootOnUpdate(false);
+        result = ESPhttpUpdate.update(update_client, url);
+#  endif
+      }
+
+      switch (result) {
+        case HTTP_UPDATE_FAILED:
+#  ifdef ESP32
+          THEENGS_LOG_ERROR(F("HTTP_UPDATE_FAILED Error (%d): %s\n" CR), httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
+#  elif ESP8266
+          THEENGS_LOG_ERROR(F("HTTP_UPDATE_FAILED Error (%d): %s\n" CR), ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
+#  endif
+          gatewayState = GatewayState::ERROR;
+          break;
+
+        case HTTP_UPDATE_NO_UPDATES:
+          THEENGS_LOG_NOTICE(F("HTTP_UPDATE_NO_UPDATES" CR));
+          break;
+
+        case HTTP_UPDATE_OK:
+          THEENGS_LOG_NOTICE(F("HTTP_UPDATE_OK" CR));
+          jsondata["release_summary"] = "Update success !";
+          // Report what was installed, not the latest release: latestVersion only
+          // describes a "latest" request, while "dev" and "vX.Y.Z" install what the
+          // caller asked for. systemUrl is filled in only when we built the URL from
+          // version; for a caller supplied URL the version is just a label with no
+          // guarantee (the WebUI sends "test"), so the field is omitted rather than
+          // published wrong; the value is republished from OMG_VERSION after reboot.
+          // The version is stored as a String so its content is copied into the
+          // document instead of being referenced from the caller's document.
+          if (systemUrl.length()) {
+            jsondata["installed_version"] = strcmp(version, "latest") == 0 ? latestVersion : String(version);
+          }
+          jsondata["origin"] = subjectRLStoMQTT;
+          enqueueJsonObject(jsondata);
+#  if !MQTT_BROKER_MODE
+          if (cnt_index != 0) // We don't enable the change of cert provided at build time
+            cnt_parameters_array[cnt_index].ota_server_cert = ota_cert;
+#  endif
+#  ifndef ESPWifiManualSetup
+          saveConfig();
+#  endif
+          ESPRestart(6);
+          break;
+      }
+
+      ESPRestart(6);
+    }
+  }
+}
+#endif
+
+#if !MQTT_BROKER_MODE
+/**
+ * Read the certificates from the memory and publish a hash of the cert to the broker for identification purposes
+*/
+void readCntParameters(int index) {
+  if (index < 0 || index > 2) {
+    THEENGS_LOG_WARNING(F("Invalid cnt index" CR));
+    return;
+  }
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  JsonObject jsondata = jsonBuffer.to<JsonObject>();
+  jsondata["cnt_index"] = index;
+  jsondata["valid_cnt"] = cnt_parameters_array[index].validConnection;
+  if (cnt_parameters_array[index].server_cert.length() > MIN_CERT_LENGTH) {
+    jsondata["mqtt_server_cert_hash"] = generateHash(cnt_parameters_array[index].server_cert);
+  }
+  if (cnt_parameters_array[index].client_cert.length() > MIN_CERT_LENGTH) {
+    jsondata["mqtt_client_cert_hash"] = generateHash(cnt_parameters_array[index].client_cert);
+  }
+  if (cnt_parameters_array[index].client_key.length() > MIN_CERT_LENGTH) {
+    jsondata["mqtt_client_key_hash"] = generateHash(cnt_parameters_array[index].client_key);
+  }
+  if (cnt_parameters_array[index].ota_server_cert.length() > MIN_CERT_LENGTH) {
+    jsondata["ota_server_cert_hash"] = generateHash(cnt_parameters_array[index].ota_server_cert);
+  }
+  jsondata["mqtt_server"] = cnt_parameters_array[index].mqtt_server;
+  jsondata["mqtt_port"] = cnt_parameters_array[index].mqtt_port;
+  jsondata["mqtt_user"] = cnt_parameters_array[index].mqtt_user;
+  jsondata["mqtt_pass"] = generateHash(cnt_parameters_array[index].mqtt_pass);
+  jsondata["mqtt_secure"] = cnt_parameters_array[index].isConnectionSecure;
+  jsondata["mqtt_validate"] = cnt_parameters_array[index].isCertValidate;
+  jsondata["origin"] = subjectSYStoMQTT;
+  enqueueJsonObject(jsondata);
+}
+#endif
+
+void XtoSYS(const char* topicOri, JsonObject& SYSdata) { // json object decoding
+  if (cmpToMainTopic(topicOri, subjectMQTTtoSYSset)) {
+    bool restartESP = false;
+    bool publishState = false;
+    THEENGS_LOG_TRACE(F("MQTTtoSYS json" CR));
+    if (SYSdata.containsKey("cmd")) {
+      const char* cmd = SYSdata["cmd"];
+      THEENGS_LOG_NOTICE(F("Command: %s" CR), cmd);
+      if (strstr(cmd, restartCmd) != NULL) { //restart
+        ESPRestart(5);
+      } else if (strstr(cmd, eraseCmd) != NULL) { //erase and restart
+        eraseConfig();
+      } else if (strstr(cmd, statusCmd) != NULL) {
+        publishState = true;
+      }
+    }
+#ifdef LED_ADDRESSABLE
+    if (SYSdata.containsKey("rgbb") && SYSdata["rgbb"].is<float>()) {
+      if (SYSdata["rgbb"] >= 0 && SYSdata["rgbb"] <= 255) {
+        SYSConfig.rgbbrightness = TheengsUtils::round2(SYSdata["rgbb"]);
+        ledManager.setBrightness(SYSConfig.rgbbrightness);
+#  ifdef ZactuatorONOFF
+        extern void updatePowerIndicator();
+        updatePowerIndicator();
+#  endif
+        THEENGS_LOG_NOTICE(F("RGB brightness: %d" CR), SYSConfig.rgbbrightness);
+        publishState = true;
+      } else {
+        THEENGS_LOG_WARNING(F("RGB brightness value invalid - ignoring command" CR));
+      }
+    }
+#endif
+    if (SYSdata.containsKey("wifi_ssid") && SYSdata["wifi_ssid"].is<const char*>() && SYSdata.containsKey("wifi_pass") && SYSdata["wifi_pass"].is<const char*>()) {
+#ifdef ESP32
+      ProcessLock = true;
+#  ifdef ZgatewayBT
+      stopProcessing(true);
+#  endif
+#endif
+      String prev_ssid = WiFi.SSID();
+      String prev_pass = WiFi.psk();
+      // NOTE: There's no need to disconnect MQTT manually
+      WiFi.disconnect(true);
+
+      THEENGS_LOG_WARNING(F("Attempting connection to new AP %s" CR), (const char*)SYSdata["wifi_ssid"]);
+      WiFi.begin((const char*)SYSdata["wifi_ssid"], (const char*)SYSdata["wifi_pass"]);
+#if defined(WifiGMode) || defined(WifiPower)
+      setESPWifiProtocolTxPower();
+#endif
+      WiFi.waitForConnectResult(WiFi_TimeOut * 1000);
+
+      if (WiFi.status() != WL_CONNECTED) {
+        THEENGS_LOG_WARNING(F("Failed to connect to new AP; falling back" CR));
+        WiFi.disconnect(true);
+        WiFi.begin(prev_ssid.c_str(), prev_pass.c_str());
+#if defined(WifiGMode) || defined(WifiPower)
+        setESPWifiProtocolTxPower();
+#endif
+      }
+      restartESP = true;
+    }
+
+    if ((SYSdata.containsKey("mqtt_topic") && SYSdata["mqtt_topic"].is<const char*>()) ||
+#ifdef ZmqttDiscovery
+        (SYSdata.containsKey("discovery_prefix") && SYSdata["discovery_prefix"].is<const char*>()) ||
+#endif
+        (SYSdata.containsKey("gateway_name") && SYSdata["gateway_name"].is<const char*>()) ||
+        (SYSdata.containsKey("gw_pass") && SYSdata["gw_pass"].is<const char*>())) {
+      // Each of the destination buffers is sized at compile time; reject
+      // over-length MQTT-supplied values up front so a crafted publish cannot
+      // leave the destination non-NUL-terminated (which would corrupt the
+      // SPIFFS config on the next saveConfig()).
+      if (SYSdata.containsKey("mqtt_topic")) {
+        const char* src = SYSdata["mqtt_topic"];
+        if (strlen(src) >= sizeof(mqtt_topic)) {
+          THEENGS_LOG_WARNING(F("mqtt_topic too long, ignoring" CR));
+        } else {
+          strcpy(mqtt_topic, src);
+        }
+      }
+#ifdef ZmqttDiscovery
+      if (SYSdata.containsKey("discovery_prefix")) {
+        const char* src = SYSdata["discovery_prefix"];
+        // discovery_prefix is defined in mqttDiscovery.cpp as char[parameters_size + 1].
+        if (strlen(src) > parameters_size) {
+          THEENGS_LOG_WARNING(F("discovery_prefix too long, ignoring" CR));
+        } else {
+          strcpy(discovery_prefix, src);
+        }
+      }
+#endif
+      if (SYSdata.containsKey("gateway_name")) {
+        const char* src = SYSdata["gateway_name"];
+        if (strlen(src) >= sizeof(gateway_name)) {
+          THEENGS_LOG_WARNING(F("gateway_name too long, ignoring" CR));
+        } else {
+          strcpy(gateway_name, src);
+        }
+      }
+      if (SYSdata.containsKey("gw_pass")) {
+        const char* src = SYSdata["gw_pass"];
+        if (strlen(src) >= sizeof(ota_pass)) {
+          THEENGS_LOG_WARNING(F("gw_pass too long, ignoring" CR));
+        } else {
+          strcpy(ota_pass, src);
+          restartESP = true;
+        }
+      }
+#ifndef ESPWifiManualSetup
+      saveConfig();
+#endif
+      mqttSetupPending = true; // trigger reconnect in loop using the new topic/name
+    }
+
+#if BLEDecryptor
+    if (SYSdata.containsKey("ble_aes") || SYSdata.containsKey("ble_aes_keys")) {
+      if (SYSdata.containsKey("ble_aes")) {
+        const char* src = SYSdata["ble_aes"];
+        if (strlen(src) >= sizeof(ble_aes)) {
+          THEENGS_LOG_WARNING(F("ble_aes too long, ignoring" CR));
+        } else {
+          strcpy(ble_aes, src);
+        }
+      }
+      if (SYSdata.containsKey("ble_aes_keys")) {
+        THEENGS_LOG_WARNING(F("Contains ble_aes_keys" CR));
+        ble_aes_keys = SYSdata["ble_aes_keys"];
+      } else {
+        // If no keys are passed clear the object.
+        StaticJsonDocument<JSON_BLE_AES_CUSTOM_KEYS> jsonBLEBuffer;
+        ble_aes_keys = jsonBLEBuffer.to<JsonObject>();
+      }
+#  ifndef ESPWifiManualSetup
+      saveConfig();
+#  endif
+    }
+#endif
+
+#if !MQTT_BROKER_MODE
+#  ifdef MQTTsetMQTT
+
+    bool save_cnt = false;
+    bool read_cnt = false;
+    bool test_cnt = false;
+
+    if (SYSdata.containsKey("save_cnt") && SYSdata["save_cnt"].is<bool>()) {
+      save_cnt = SYSdata["save_cnt"].as<bool>();
+    }
+    if (SYSdata.containsKey("read_cnt") && SYSdata["read_cnt"].is<bool>()) {
+      read_cnt = SYSdata["read_cnt"].as<bool>();
+    }
+    if (SYSdata.containsKey("test_cnt") && SYSdata["test_cnt"].is<bool>()) {
+      test_cnt = SYSdata["test_cnt"].as<bool>();
+    }
+
+    if (SYSdata.containsKey("cnt_index") && SYSdata["cnt_index"].is<int>()) {
+      if (SYSdata["cnt_index"].as<int>() < 0 || SYSdata["cnt_index"].as<int>() > 2) {
+        THEENGS_LOG_WARNING(F("Invalid cnt index provided - ignoring command" CR));
+        return;
+      }
+
+      // we're overwrittng parameters, create a backup to be able to revert
+      cnt_parameters_backup.reset(new ss_cnt_parameters_backup());
+      cnt_parameters_backup->cnt_index = cnt_index;
+      cnt_parameters_backup->saveOnSuccess = save_cnt;
+
+      cnt_index = SYSdata["cnt_index"].as<int>();
+      cnt_parameters_backup->parameters = cnt_parameters_array[cnt_index];
+
+      THEENGS_LOG_NOTICE(F("MQTT cnt index %d" CR), cnt_index);
+
+      // Length-check every MQTT-supplied string before copying into a fixed buffer
+      // to prevent heap overflows.
+      if (SYSdata.containsKey("mqtt_user") && SYSdata["mqtt_user"].is<const char*>() && SYSdata.containsKey("mqtt_pass") && SYSdata["mqtt_pass"].is<const char*>()) {
+        const char* user = SYSdata["mqtt_user"];
+        const char* pass = SYSdata["mqtt_pass"];
+        if (strlen(user) >= sizeof(cnt_parameters_array[cnt_index].mqtt_user) ||
+            strlen(pass) >= sizeof(cnt_parameters_array[cnt_index].mqtt_pass)) {
+          THEENGS_LOG_WARNING(F("mqtt_user/mqtt_pass too long, ignoring" CR));
+        } else {
+          strcpy(cnt_parameters_array[cnt_index].mqtt_user, user);
+          strcpy(cnt_parameters_array[cnt_index].mqtt_pass, pass);
+          cnt_parameters_array[cnt_index].validConnection = false;
+        }
+      }
+
+      if (SYSdata.containsKey("mqtt_server") && SYSdata["mqtt_server"].is<const char*>()) {
+        const char* server = SYSdata["mqtt_server"];
+        if (strlen(server) >= sizeof(cnt_parameters_array[cnt_index].mqtt_server)) {
+          THEENGS_LOG_WARNING(F("mqtt_server too long, ignoring" CR));
+        } else {
+          strcpy(cnt_parameters_array[cnt_index].mqtt_server, server);
+          cnt_parameters_array[cnt_index].validConnection = false;
+        }
+      }
+
+      if (SYSdata.containsKey("mqtt_port") && SYSdata["mqtt_port"].is<const char*>()) {
+        const char* port = SYSdata["mqtt_port"];
+        if (strlen(port) >= sizeof(cnt_parameters_array[cnt_index].mqtt_port)) {
+          THEENGS_LOG_WARNING(F("mqtt_port too long, ignoring" CR));
+        } else {
+          strcpy(cnt_parameters_array[cnt_index].mqtt_port, port);
+          cnt_parameters_array[cnt_index].validConnection = false;
+        }
+      }
+
+      if (SYSdata.containsKey("mqtt_secure") && SYSdata["mqtt_secure"].is<bool>()) {
+        cnt_parameters_array[cnt_index].isConnectionSecure = SYSdata["mqtt_secure"].as<bool>();
+        cnt_parameters_array[cnt_index].validConnection = false;
+      }
+
+      if (SYSdata.containsKey("mqtt_validate") && SYSdata["mqtt_validate"].is<bool>()) {
+        cnt_parameters_array[cnt_index].isCertValidate = SYSdata["mqtt_validate"].as<bool>();
+        cnt_parameters_array[cnt_index].validConnection = false;
+      }
+
+      // Copy the certs to the memory
+      if (SYSdata.containsKey("mqtt_server_cert") && SYSdata["mqtt_server_cert"].is<const char*>()) {
+        cnt_parameters_array[cnt_index].server_cert = TheengsUtils::processCert(SYSdata["mqtt_server_cert"].as<const char*>());
+        THEENGS_LOG_TRACE(F("Assigning server cert %s" CR), generateHash(cnt_parameters_array[cnt_index].server_cert).c_str());
+        cnt_parameters_array[cnt_index].validConnection = false;
+      }
+      if (SYSdata.containsKey("mqtt_client_cert") && SYSdata["mqtt_client_cert"].is<const char*>()) {
+        cnt_parameters_array[cnt_index].client_cert = TheengsUtils::processCert(SYSdata["mqtt_client_cert"].as<const char*>());
+        THEENGS_LOG_TRACE(F("Assigning client cert %s" CR), generateHash(cnt_parameters_array[cnt_index].client_cert).c_str());
+        cnt_parameters_array[cnt_index].validConnection = false;
+      }
+      if (SYSdata.containsKey("mqtt_client_key") && SYSdata["mqtt_client_key"].is<const char*>()) {
+        cnt_parameters_array[cnt_index].client_key = TheengsUtils::processCert(SYSdata["mqtt_client_key"].as<const char*>());
+        THEENGS_LOG_TRACE(F("Assigning client key %s" CR), generateHash(cnt_parameters_array[cnt_index].client_key).c_str());
+        cnt_parameters_array[cnt_index].validConnection = false;
+      }
+      if (SYSdata.containsKey("ota_server_cert") && SYSdata["ota_server_cert"].is<const char*>()) {
+        cnt_parameters_array[cnt_index].ota_server_cert = TheengsUtils::processCert(SYSdata["ota_server_cert"].as<const char*>());
+        THEENGS_LOG_TRACE(F("Assigning OTA server cert %s" CR), generateHash(cnt_parameters_array[cnt_index].ota_server_cert).c_str());
+      }
+
+      // Read the memory certs hash to MQTT
+      if (read_cnt)
+        readCntParameters(cnt_index);
+    }
+
+    // Change of mqtt secure connection or certs
+    void* prev_client = nullptr;
+
+    if (save_cnt || test_cnt) {
+      // Stop the processing/disconnect
+#    ifdef ESP32
+      ProcessLock = true;
+#      ifdef ZgatewayBT
+      stopProcessing(true);
+#      endif
+#    endif
+
+      mqttSetupPending = true;
+    } else {
+      // no request to test or save the parameters, forget the old settings
+      cnt_parameters_backup.reset();
+    }
+#  endif
+#endif
+
+    if (SYSdata.containsKey("mqtt") && SYSdata["mqtt"].is<bool>()) {
+      SYSConfig.mqtt = SYSdata["mqtt"];
+      THEENGS_LOG_NOTICE(F("xtomqtt: %T" CR), SYSConfig.mqtt);
+    }
+    if (SYSdata.containsKey("serial") && SYSdata["serial"].is<bool>()) {
+      SYSConfig.serial = SYSdata["serial"];
+      THEENGS_LOG_NOTICE(F("SERIAL: %T" CR), SYSConfig.serial);
+    }
+    if (SYSdata.containsKey("offline") && SYSdata["offline"].is<bool>()) {
+      SYSConfig.offline = SYSdata["offline"];
+      THEENGS_LOG_NOTICE(F("offline: %T" CR), SYSConfig.offline);
+      if (SYSConfig.offline) {
+        gatewayState = GatewayState::OFFLINE;
+// Disconnect MQTT
+#if !MQTT_BROKER_MODE
+        mqtt->disconnect();
+#else
+        mqtt->stop();
+#endif
+        // Disconnect network
+        if (WiFi.status() == WL_CONNECTED)
+          WiFi.disconnect(true);
+      }
+    }
+    if (SYSdata.containsKey("powermode") && SYSdata["powermode"].is<int>()) {
+      SYSConfig.powerMode = SYSdata["powermode"];
+      THEENGS_LOG_NOTICE(F("Power mode: %d" CR), SYSConfig.powerMode);
+    }
+#if USE_BLUFI
+    if (SYSdata.containsKey("blufi") && SYSdata["blufi"].is<bool>()) {
+      bool res = false;
+      if (SYSdata["blufi"] && !SYSConfig.blufi) { // Start Blufi
+        res = startBlufi();
+      } else if (!SYSdata["blufi"] && SYSConfig.blufi) { // Stop Blufi
+        res = stopBlufi();
+      }
+      if (res)
+        SYSConfig.blufi = SYSdata["blufi"];
+      publishState = true;
+      THEENGS_LOG_NOTICE(F("Blufi: %T" CR), SYSConfig.blufi);
+    }
+#endif
+    if (SYSdata.containsKey("disc")) {
+      if (SYSdata["disc"].is<bool>()) {
+        if (SYSdata["disc"] == true && SYSConfig.discovery == false)
+          lastDiscovery = millis();
+        SYSConfig.discovery = SYSdata["disc"];
+        publishState = true;
+        if (SYSConfig.discovery) {
+          extern void pubMqttDiscovery();
+          pubMqttDiscovery();
+        }
+      } else {
+        THEENGS_LOG_WARNING(F("Discovery command not a boolean" CR));
+      }
+      THEENGS_LOG_NOTICE(F("Discovery state: %T" CR), SYSConfig.discovery);
+    }
+    if (SYSdata.containsKey("save") && SYSdata["save"].as<bool>()) {
+      SYSConfig_save();
+    }
+    if (publishState) {
+      stateMeasures();
+    }
+    if (restartESP) {
+      ESPRestart(7);
+    }
+  }
+}
diff --git a/main/main.ino b/main/main.ino
deleted file mode 100644
index 57c5cd0..0000000
--- a/main/main.ino
+++ /dev/null
@@ -1,3148 +0,0 @@
-/*
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
-
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
-   Send and receiving command by MQTT
-
-  This program enables to:
- - receive MQTT data from a topic and send signal (RF, IR, BLE, GSM)  corresponding to the received MQTT data
- - publish MQTT data to a different topic related to received signals (RF, IR, BLE, GSM)
-
-  Copyright: (c)Florian ROBERT
-
-    This file is part of OpenMQTTGateway.
-
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#include "User_config.h"
-
-// States of the gateway
-// Wm setup
-// Connected to MQTT
-// Disconnected from Wifi
-// Disconnected from MQTT
-// Deep sleep
-// Local OTA in progress
-// Remote OTA in progress
-
-// Macros and structure to enable the duplicates removing on the following gateways
-#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) || defined(ZgatewayRTL_433)
-// array to store previous received RFs, IRs codes and their timestamps
-struct ReceivedSignal {
-  SIGNAL_SIZE_UL_ULL value;
-  uint32_t time;
-};
-#  if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-ReceivedSignal receivedSignal[] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
-#  else // boards with smaller memory
-ReceivedSignal receivedSignal[] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}};
-#  endif
-#  define struct_size (sizeof(receivedSignal) / sizeof(ReceivedSignal))
-#endif
-
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-//Time used to wait for an interval before checking system measures
-unsigned long timer_sys_measures = 0;
-
-// Time used to wait before system checkings
-unsigned long timer_sys_checks = 0;
-
-#  define ARDUINOJSON_USE_LONG_LONG     1
-#  define ARDUINOJSON_ENABLE_STD_STRING 1
-
-#  include <queue>
-int queueLength = 0;
-unsigned long queueLengthSum = 0;
-unsigned long blockedMessages = 0;
-int maxQueueLength = 0;
-#  ifndef QueueSize
-#    define QueueSize 18
-#  endif
-
-#endif
-
-/**
- * Deep-sleep for the ESP8266 & ESP32 we need some form of indicator that we have posted the measurements and am ready to deep sleep.
- * Set this to true in the sensor code after publishing the measurement.
- */
-#if defined(DEEP_SLEEP_IN_US) || defined(ESP32_EXT0_WAKE_PIN)
-bool ready_to_sleep = false;
-#endif
-
-#include <ArduinoJson.h>
-#include <ArduinoLog.h>
-#include <PubSubClient.h>
-
-#include <string>
-
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-struct JsonBundle {
-  StaticJsonDocument<JSON_MSG_BUFFER> doc;
-};
-
-std::queue<JsonBundle> jsonQueue;
-
-#  ifdef ESP32
-// Mutex  to protect the queue
-SemaphoreHandle_t xQueueMutex;
-#  endif
-
-#endif
-
-StaticJsonDocument<JSON_MSG_BUFFER> modulesBuffer;
-JsonArray modules = modulesBuffer.to<JsonArray>();
-bool ethConnected = false;
-
-#ifndef ZgatewayGFSunInverter
-// Arduino IDE compiles, it automatically creates all the header declarations for all the functions you have in your *.ino file.
-// Unfortunately it ignores #if directives.
-// This is a simple workaround for this problem.
-struct GfSun2000Data {};
-#endif
-
-// Modules config inclusion
-#if defined(ZwebUI) && defined(ESP32)
-#  include "config_WebUI.h"
-#endif
-#if defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZgatewayPilight) || defined(ZactuatorSomfy) || defined(ZgatewayRTL_433)
-#  include "config_RF.h"
-#endif
-#ifdef ZgatewayWeatherStation
-#  include "config_WeatherStation.h"
-#endif
-#ifdef ZgatewayGFSunInverter
-#  include "config_GFSunInverter.h"
-#endif
-#ifdef ZgatewayLORA
-#  include "config_LORA.h"
-#endif
-#ifdef ZgatewaySRFB
-#  include "config_SRFB.h"
-#endif
-#ifdef ZgatewayBT
-#  include "config_BT.h"
-#endif
-#ifdef ZgatewayIR
-#  include "config_IR.h"
-#endif
-#ifdef Zgateway2G
-#  include "config_2G.h"
-#endif
-#ifdef ZactuatorONOFF
-#  include "config_ONOFF.h"
-#endif
-#ifdef ZsensorINA226
-#  include "config_INA226.h"
-#endif
-#ifdef ZsensorHCSR501
-#  include "config_HCSR501.h"
-#endif
-#ifdef ZsensorADC
-#  include "config_ADC.h"
-#endif
-#ifdef ZsensorBH1750
-#  include "config_BH1750.h"
-#endif
-#ifdef ZsensorMQ2
-#  include "config_MQ2.h"
-#endif
-#ifdef ZsensorTEMT6000
-#  include "config_TEMT6000.h"
-#endif
-#ifdef ZsensorTSL2561
-#  include "config_TSL2561.h"
-#endif
-#ifdef ZsensorBME280
-#  include "config_BME280.h"
-#endif
-#ifdef ZsensorHTU21
-#  include "config_HTU21.h"
-#endif
-#ifdef ZsensorLM75
-#  include "config_LM75.h"
-#endif
-#ifdef ZsensorAHTx0
-#  include "config_AHTx0.h"
-#endif
-#ifdef ZsensorRN8209
-#  include "config_RN8209.h"
-#endif
-#ifdef ZsensorHCSR04
-#  include "config_HCSR04.h"
-#endif
-#ifdef ZsensorC37_YL83_HMRD
-#  include "config_C37_YL83_HMRD.h"
-#endif
-#ifdef ZsensorDHT
-#  include "config_DHT.h"
-#endif
-#ifdef ZsensorSHTC3
-#  include "config_SHTC3.h"
-#endif
-#ifdef ZsensorDS1820
-#  include "config_DS1820.h"
-#endif
-#ifdef ZgatewayRFM69
-#  include "config_RFM69.h"
-#endif
-#ifdef ZsensorGPIOInput
-#  include "config_GPIOInput.h"
-#endif
-#ifdef ZsensorGPIOKeyCode
-#  include "config_GPIOKeyCode.h"
-#endif
-#ifdef ZsensorTouch
-#  include "config_Touch.h"
-#endif
-#ifdef ZmqttDiscovery
-#  include "config_mqttDiscovery.h"
-#endif
-#ifdef ZactuatorFASTLED
-#  include "config_FASTLED.h"
-#endif
-#ifdef ZactuatorPWM
-#  include "config_PWM.h"
-#endif
-#ifdef ZactuatorSomfy
-#  include "config_Somfy.h"
-#endif
-#if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
-#  include "config_M5.h"
-#endif
-#if defined(ZdisplaySSD1306)
-#  include "config_SSD1306.h"
-#endif
-#if defined(ZgatewayRS232)
-#  include "config_RS232.h"
-#endif
-/*------------------------------------------------------------------------*/
-
-void setupTLS(bool self_signed = false, uint8_t index = 0);
-
-//adding this to bypass the problem of the arduino builder issue 50
-void callback(char* topic, byte* payload, unsigned int length);
-
-char mqtt_user[parameters_size] = MQTT_USER; // not compulsory only if your broker needs authentication
-char mqtt_pass[parameters_size] = MQTT_PASS; // not compulsory only if your broker needs authentication
-char mqtt_server[parameters_size] = MQTT_SERVER;
-char mqtt_port[6] = MQTT_PORT;
-char ota_pass[parameters_size] = gw_password;
-#ifdef USE_MAC_AS_GATEWAY_NAME
-#  undef WifiManager_ssid
-#  undef ota_hostname
-#  define MAC_NAME_MAX_LEN 30
-char WifiManager_ssid[MAC_NAME_MAX_LEN];
-char ota_hostname[MAC_NAME_MAX_LEN];
-#endif
-bool connectedOnce = false; //indicate if we have been connected once to MQTT
-bool connected = false; //indicate whether we are currently connected. Used to detected re-connection
-int failure_number_ntwk = 0; // number of failure connecting to network
-int failure_number_mqtt = 0; // number of failure connecting to MQTT
-
-unsigned long timer_led_measures = 0;
-static void* eClient = nullptr;
-static unsigned long last_ota_activity_millis = 0;
-#if defined(ESP8266) || defined(ESP32)
-// Global struct to store live SYS configuration data
-SYSConfig_s SYSConfig;
-
-bool failSafeMode = false;
-static bool mqtt_secure = MQTT_SECURE_DEFAULT;
-static bool mqtt_cert_validate = MQTT_CERT_VALIDATE_DEFAULT;
-static uint8_t mqtt_ss_index = MQTT_SECURE_SELF_SIGNED_INDEX_DEFAULT;
-static String mqtt_cert = "";
-static String ota_server_cert = "";
-#endif
-
-#ifdef ESP32
-#  include <ArduinoOTA.h>
-#  include <FS.h>
-#  include <SPIFFS.h>
-#  include <esp_task_wdt.h>
-#  include <nvs.h>
-#  include <nvs_flash.h>
-
-bool BTProcessLock = true; // Process lock when we want to use a critical function like OTA for example, at start to true so as to wait for critical functions to be performed before BLE start
-bool ProcessLock = false; // Process lock when we want to use a critical function like OTA for example
-
-#  if !defined(NO_INT_TEMP_READING)
-// ESP32 internal temperature reading
-#    include <stdio.h>
-
-#    include "rom/ets_sys.h"
-#    include "soc/rtc_cntl_reg.h"
-#    include "soc/sens_reg.h"
-#  endif
-#  ifdef ESP32_ETHERNET
-#    include <ETH.h>
-void WiFiEvent(WiFiEvent_t event);
-#  endif
-
-#  include <WiFiClientSecure.h>
-#  include <WiFiMulti.h>
-WiFiMulti wifiMulti;
-#  include <WiFiManager.h>
-#  ifdef MDNS_SD
-#    include <ESPmDNS.h>
-#  endif
-
-#elif defined(ESP8266)
-#  include <ArduinoOTA.h>
-#  include <DNSServer.h>
-#  include <ESP8266WebServer.h>
-#  include <ESP8266WiFi.h>
-#  include <ESP8266WiFiMulti.h>
-#  include <FS.h>
-#  include <WiFiManager.h>
-X509List caCert;
-#  if MQTT_SECURE_SELF_SIGNED_CLIENT
-X509List* pClCert = nullptr;
-PrivateKey* pClKey = nullptr;
-#  endif
-ESP8266WiFiMulti wifiMulti;
-#  ifdef MDNS_SD
-#    include <ESP8266mDNS.h>
-#  endif
-
-#else
-#  include <Ethernet.h>
-#endif
-
-// client link to pubsub MQTT
-PubSubClient client;
-
-template <typename T> // Declared here to avoid pre-compilation issue (missing "template" in auto declaration by pio)
-void Config_update(JsonObject& data, const char* key, T& var);
-template <typename T>
-void Config_update(JsonObject& data, const char* key, T& var) {
-  if (data.containsKey(key)) {
-    if (var != data[key].as<T>()) {
-      var = data[key].as<T>();
-      Log.notice(F("Config %s changed: %T" CR), key, data[key].as<T>());
-    } else {
-      Log.notice(F("Config %s unchanged: %T" CR), key, data[key].as<T>());
-    }
-  }
-}
-
-void revert_hex_data(const char* in, char* out, int l) {
-  //reverting array 2 by 2 to get the data in good order
-  int i = l - 2, j = 0;
-  while (i != -2) {
-    if (i % 2 == 0)
-      out[j] = in[i + 1];
-    else
-      out[j] = in[i - 1];
-    j++;
-    i--;
-  }
-  out[l - 1] = '\0';
-}
-
-/**
- * Retrieve an unsigned long value from a char array extract representing hexadecimal data, reversed or not,
- * This value can represent a negative value if canBeNegative is set to true
- */
-long value_from_hex_data(const char* service_data, int offset, int data_length, bool reverse, bool canBeNegative = true) {
-  char data[data_length + 1];
-  memcpy(data, &service_data[offset], data_length);
-  data[data_length] = '\0';
-  long value;
-  if (reverse) {
-    // reverse data order
-    char rev_data[data_length + 1];
-    revert_hex_data(data, rev_data, data_length + 1);
-    value = strtol(rev_data, NULL, 16);
-  } else {
-    value = strtol(data, NULL, 16);
-  }
-  if (value > 65000 && data_length <= 4 && canBeNegative)
-    value = value - 65535;
-  Log.trace(F("value %D" CR), value);
-  return value;
-}
-
-/*
- rounds a number to 2 decimal places
- example: round(3.14159) -> 3.14
-*/
-double round2(double value) {
-  return (int)(value * 100 + 0.5) / 100.0;
-}
-
-/*
-From an hexa char array ("A220EE...") to a byte array (half the size)
- */
-bool _hexToRaw(const char* in, byte* out, int rawSize) {
-  if (strlen(in) != rawSize * 2)
-    return false;
-  char tmp[3] = {0};
-  for (unsigned char p = 0; p < rawSize; p++) {
-    memcpy(tmp, &in[p * 2], 2);
-    out[p] = strtol(tmp, NULL, 16);
-  }
-  return true;
-}
-
-/*
-From a byte array to an hexa char array ("A220EE...", double the size)
- */
-bool _rawToHex(byte* in, char* out, int rawSize) {
-  for (unsigned char p = 0; p < rawSize; p++) {
-    sprintf_P(&out[p * 2], PSTR("%02X" CR), in[p]);
-  }
-  return true;
-}
-
-char* ip2CharArray(IPAddress ip) { //from Nick Lee https://stackoverflow.com/questions/28119653/arduino-display-ethernet-localip
-  static char a[16];
-  sprintf(a, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
-  return a;
-}
-
-bool to_bool(String const& s) { // thanks Chris Jester-Young from stackoverflow
-  return s != "0";
-}
-
-/*
- * Publish a message depending on its origin
- *
-*/
-void pubMainCore(JsonObject& data) {
-  if (data.containsKey("origin")) {
-    pub((char*)data["origin"].as<const char*>(), data);
-#ifdef ZgatewayBT
-    if (data.containsKey("distance")) {
-      String topic = String(mqtt_topic) + BTConfig.presenceTopic + String(gateway_name);
-      Log.trace(F("Pub HA Presence %s" CR), topic.c_str());
-      pub_custom_topic((char*)topic.c_str(), data, false);
-    }
-#endif
-  } else {
-    Log.error(F("No origin in JSON filtered" CR));
-  }
-}
-
-// Add a document to the queue
-void enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc) {
-  if (jsonDoc.size() == 0) {
-    Log.error(F("Empty JSON, skipping" CR));
-    return;
-  }
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-  if (queueLength >= QueueSize) {
-    Log.warning(F("%d Doc(s) in queue, doc blocked" CR), queueLength);
-    blockedMessages++;
-    return;
-  }
-  Log.trace(F("Enqueue JSON" CR));
-  JsonBundle bundle;
-  bundle.doc = jsonDoc;
-  jsonQueue.push(bundle);
-  Log.trace(F("Queue length: %d" CR), jsonQueue.size());
-#else
-  // Pub to main core
-  JsonObject jsonObj = jsonDoc.to<JsonObject>();
-  pubMainCore(jsonObj); // Arduino UNO or other boards with small memory, we don't store and directly publish
-#endif
-}
-
-#ifdef ESP32
-// Semaphore check before enqueueing a document
-bool handleJsonEnqueue(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, int timeout) {
-  if (xSemaphoreTake(xQueueMutex, pdMS_TO_TICKS(timeout))) {
-    enqueueJsonObject(jsonDoc);
-    xSemaphoreGive(xQueueMutex);
-    return true;
-  } else {
-    Log.error(F("xQueueMutex not taken" CR));
-    blockedMessages++;
-    return false;
-  }
-}
-#else
-bool handleJsonEnqueue(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, int timeout) {
-  enqueueJsonObject(jsonDoc);
-  return true;
-}
-#endif
-
-// Semaphore check before enqueueing a document with default timeout QueueSemaphoreTimeOutLoop
-bool handleJsonEnqueue(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc) {
-  return handleJsonEnqueue(jsonDoc, QueueSemaphoreTimeOutLoop);
-}
-
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-
-/*
- * Add the jsonObject id as a topic to the jsonObject origin
- *
-*/
-void buildTopicFromId(JsonObject& Jsondata, const char* origin) {
-  if (!Jsondata.containsKey("id")) {
-    Log.error(F("No id in Jsondata" CR));
-    return;
-  }
-
-  std::string topic = Jsondata["id"].as<std::string>();
-
-  // Replace ":" in topic
-  size_t pos = topic.find(":");
-  while (pos != std::string::npos) {
-    topic.erase(pos, 1);
-    pos = topic.find(":", pos);
-  }
-#  ifdef ZgatewayBT
-  if (BTConfig.pubBeaconUuidForTopic && !BTConfig.extDecoderEnable && Jsondata.containsKey("model_id") && Jsondata["model_id"].as<std::string>() == "IBEACON") {
-    if (Jsondata.containsKey("uuid")) {
-      topic = Jsondata["uuid"].as<std::string>();
-    } else {
-      Log.error(F("No uuid in Jsondata" CR));
-    }
-  }
-
-  if (BTConfig.extDecoderEnable && !Jsondata.containsKey("model"))
-    topic = BTConfig.extDecoderTopic.c_str();
-#  endif
-  std::string subjectStr(origin);
-  topic = subjectStr + "/" + topic;
-
-  Jsondata["origin"] = topic;
-
-  Log.trace(F("Origin: %s" CR), Jsondata["origin"].as<const char*>());
-}
-
-// Empty the documents queue
-void emptyQueue() {
-  queueLength = jsonQueue.size();
-  if (queueLength > maxQueueLength) {
-    maxQueueLength = queueLength;
-  }
-  if (queueLength == 0) {
-    return;
-  }
-  JsonBundle bundle;
-  Log.trace(F("Dequeue JSON" CR));
-  bundle = jsonQueue.front();
-  jsonQueue.pop();
-  JsonObject obj = bundle.doc.as<JsonObject>();
-  pubMainCore(obj);
-  queueLengthSum++;
-}
-#else
-void emptyQueue() {}
-#endif
-
-/**
- * @brief Publish the payload on default MQTT topic.
- *
- * @param topicori suffix to add on default MQTT Topic
- * @param payload  the message to sends
- * @param retainFlag true if you what a retain
- */
-void pub(const char* topicori, const char* payload, bool retainFlag) {
-  String topic = String(mqtt_topic) + String(gateway_name) + String(topicori);
-  pubMQTT(topic.c_str(), payload, retainFlag);
-}
-
-/**
- * @brief Publish the payload on default MQTT topic
- *
- * @param topicori suffix to add on default MQTT Topic
- * @param data The Json Object that represents the message
- */
-void pub(const char* topicori, JsonObject& data) {
-  String dataAsString = "";
-  bool ret = sensor_Retain;
-
-#if defined(ESP8266) || defined(ESP32)
-#  if message_UTCtimestamp == true
-  data["UTCtime"] = UTCtimestamp();
-#  endif
-#  if message_unixtimestamp == true
-  data["unixtime"] = unixtimestamp();
-#  endif
-#endif
-  if (data.containsKey("retain") && data["retain"].is<bool>()) {
-    ret = data["retain"];
-    data.remove("retain");
-  }
-  if (data.containsKey("origin")) { // temporary, in the future use this instead of topicori
-    data.remove("origin");
-  }
-  if (data.size() == 0) {
-    Log.error(F("Empty JSON, not published" CR));
-    return;
-  }
-  serializeJson(data, dataAsString);
-  Log.notice(F("Send on %s msg %s" CR), topicori, dataAsString.c_str());
-  String topic = String(mqtt_topic) + String(gateway_name) + String(topicori);
-#if valueAsATopic
-#  ifdef ZgatewayPilight
-  String value = data["value"];
-  String protocol = data["protocol"];
-  if (value != "null" && value != 0) {
-    topic = topic + "/" + protocol + "/" + value;
-  }
-#  else
-  SIGNAL_SIZE_UL_ULL value = data["value"];
-  if (value != 0) {
-    topic = topic + "/" + toString(value);
-  }
-#  endif
-#endif
-
-#if jsonPublishing
-  Log.trace(F("jsonPubl - ON" CR));
-  pubMQTT(topic.c_str(), dataAsString.c_str(), ret);
-  pubWebUI(topicori, data);
-#endif
-
-#if simplePublishing
-  Log.trace(F("simplePub - ON" CR));
-  // Loop through all the key-value pairs in obj
-  for (JsonPair p : data) {
-#  if defined(ESP8266)
-    yield();
-#  endif
-    if (p.value().is<SIGNAL_SIZE_UL_ULL>() && strcmp(p.key().c_str(), "rssi") != 0) { //test rssi , bypass solution due to the fact that a int is considered as an SIGNAL_SIZE_UL_ULL
-      if (strcmp(p.key().c_str(), "value") == 0) { // if data is a value we don't integrate the name into the topic
-        pubMQTT(topic, p.value().as<SIGNAL_SIZE_UL_ULL>());
-      } else { // if data is not a value we integrate the name into the topic
-        pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<SIGNAL_SIZE_UL_ULL>());
-      }
-    } else if (p.value().is<int>()) {
-      pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<int>());
-    } else if (p.value().is<float>()) {
-      pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<float>());
-    } else if (p.value().is<char*>()) {
-      pubMQTT(topic + "/" + String(p.key().c_str()), p.value().as<const char*>());
-    }
-  }
-#endif
-}
-
-/**
- * @brief Publish the payload on default MQTT topic
- *
- * @param topicori suffix to add on default MQTT Topic
- * @param payload the message to sends
- */
-void pub(const char* topicori, const char* payload) {
-  String topic = String(mqtt_topic) + String(gateway_name) + String(topicori);
-  pubMQTT(topic, payload);
-}
-
-/**
- * @brief Publish the payload on the topic with a retention
- *
- * @param topic  The topic where to publish
- * @param data   The Json Object that represents the message
- * @param retain true if you what a retain
- */
-void pub_custom_topic(const char* topic, JsonObject& data, boolean retain) {
-  String buffer = "";
-  serializeJson(data, buffer);
-  pubMQTT(topic, buffer.c_str(), retain);
-}
-
-/**
- * @brief Low level MQTT functions without retain
- *
- * @param topic  the topic
- * @param payload  the payload
- */
-void pubMQTT(const char* topic, const char* payload) {
-  pubMQTT(topic, payload, sensor_Retain);
-}
-
-/**
- * @brief Very Low level MQTT functions with retain Flag
- *
- * @param topic the topic
- * @param payload the payload
- * @param retainFlag  true if retain the retain Flag
- */
-void pubMQTT(const char* topic, const char* payload, bool retainFlag) {
-  if (client.connected()) {
-    SendReceiveIndicatorON();
-    Log.trace(F("[ OMG->MQTT ] topic: %s msg: %s " CR), topic, payload);
-    client.publish(topic, payload, retainFlag);
-  } else {
-    Log.warning(F("Client not connected, aborting the publication" CR));
-  }
-}
-
-void pubMQTT(String topic, const char* payload) {
-  pubMQTT(topic.c_str(), payload);
-}
-
-void pubMQTT(const char* topic, unsigned long payload) {
-  char val[11];
-  sprintf(val, "%lu", payload);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(const char* topic, unsigned long long payload) {
-  char val[21];
-  sprintf(val, "%llu", payload);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(const char* topic, String payload) {
-  pubMQTT(topic, payload.c_str());
-}
-
-void pubMQTT(String topic, String payload) {
-  pubMQTT(topic.c_str(), payload.c_str());
-}
-
-void pubMQTT(String topic, int payload) {
-  char val[12];
-  sprintf(val, "%d", payload);
-  pubMQTT(topic.c_str(), val);
-}
-
-void pubMQTT(String topic, unsigned long long payload) {
-  char val[21];
-  sprintf(val, "%llu", payload);
-  pubMQTT(topic.c_str(), val);
-}
-
-void pubMQTT(String topic, float payload) {
-  char val[12];
-  dtostrf(payload, 3, 1, val);
-  pubMQTT(topic.c_str(), val);
-}
-
-void pubMQTT(const char* topic, float payload) {
-  char val[12];
-  dtostrf(payload, 3, 1, val);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(const char* topic, int payload) {
-  char val[12];
-  sprintf(val, "%d", payload);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(const char* topic, unsigned int payload) {
-  char val[12];
-  sprintf(val, "%u", payload);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(const char* topic, long payload) {
-  char val[11];
-  sprintf(val, "%ld", payload);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(const char* topic, double payload) {
-  char val[16];
-  sprintf(val, "%f", payload);
-  pubMQTT(topic, val);
-}
-
-void pubMQTT(String topic, unsigned long payload) {
-  char val[11];
-  sprintf(val, "%lu", payload);
-  pubMQTT(topic.c_str(), val);
-}
-
-bool cmpToMainTopic(const char* topicOri, const char* toAdd) {
-  // Is string "<mqtt_topic><gateway_name><toAdd>" equal to "<topicOri>"?
-  // Compare first part with first chunk
-  if (strncmp(topicOri, mqtt_topic, strlen(mqtt_topic)) != 0)
-    return false;
-  // Move pointer of sizeof chunk
-  topicOri += strlen(mqtt_topic);
-  // And so on...
-  if (strncmp(topicOri, gateway_name, strlen(gateway_name)) != 0)
-    return false;
-  topicOri += strlen(gateway_name);
-  if (strncmp(topicOri, toAdd, strlen(toAdd)) != 0)
-    return false;
-  return true;
-}
-
-void delayWithOTA(long waitMillis) {
-#if defined(ESP8266) || defined(ESP32)
-  long waitStep = 100;
-  for (long waitedMillis = 0; waitedMillis < waitMillis; waitedMillis += waitStep) {
-#  ifndef ESPWifiManualSetup
-#    if defined(ESP8266) || defined(ESP32)
-    checkButton(); // check if a reset of wifi/mqtt settings is asked
-#    endif
-#  endif
-    ArduinoOTA.handle();
-#  if defined(ZwebUI) && defined(ESP32)
-    WebUILoop();
-#  endif
-#  ifdef ESP32
-    //esp_task_wdt_reset();
-#  endif
-    delay(waitStep);
-  }
-#else
-  delay(waitMillis);
-#endif
-}
-
-void SYSConfig_init() {
-#ifdef ZmqttDiscovery
-  SYSConfig.discovery = true;
-  SYSConfig.ohdiscovery = OpenHABDiscovery;
-#endif
-#ifdef RGB_INDICATORS
-  SYSConfig.rgbbrightness = DEFAULT_ADJ_BRIGHTNESS;
-#endif
-}
-
-void SYSConfig_fromJson(JsonObject& SYSdata) {
-#ifdef ZmqttDiscovery
-  Config_update(SYSdata, "disc", SYSConfig.discovery);
-  Config_update(SYSdata, "ohdisc", SYSConfig.ohdiscovery);
-#endif
-#ifdef RGB_INDICATORS
-  Config_update(SYSdata, "rgbb", SYSConfig.rgbbrightness);
-#endif
-}
-
-#if defined(ESP32)
-void SYSConfig_load() {
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  preferences.begin(Gateway_Short_Name, true);
-  if (preferences.isKey("SYSConfig")) {
-    auto error = deserializeJson(jsonBuffer, preferences.getString("SYSConfig", "{}"));
-    preferences.end();
-    if (error) {
-      Log.error(F("SYS config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
-      return;
-    }
-    if (jsonBuffer.isNull()) {
-      Log.warning(F("SYS config is null" CR));
-      return;
-    }
-    JsonObject jo = jsonBuffer.as<JsonObject>();
-    SYSConfig_fromJson(jo);
-    Log.notice(F("SYS config loaded" CR));
-  } else {
-    preferences.end();
-    Log.notice(F("SYS config not found" CR));
-  }
-}
-#else // Function not available for ESP8266
-void SYSConfig_load() {}
-#endif
-
-void connectMQTT() {
-#ifndef ESPWifiManualSetup
-#  if defined(ESP8266) || defined(ESP32)
-  checkButton(); // check if a reset of wifi/mqtt settings is asked
-#  endif
-#endif
-
-  Log.warning(F("MQTT connection..." CR));
-#ifdef ESP32
-  //esp_task_wdt_add(NULL);
-  //esp_task_wdt_reset();
-#endif
-  char topic[mqtt_topic_max_size];
-  strcpy(topic, mqtt_topic);
-  strcat(topic, gateway_name);
-  strcat(topic, will_Topic);
-  client.setBufferSize(mqtt_max_packet_size);
-  client.setSocketTimeout(GeneralTimeOut - 1);
-#if AWS_IOT
-  if (client.connect(gateway_name, mqtt_user, mqtt_pass)) { // AWS doesn't support will topic for the moment
-#else
-  if (client.connect(gateway_name, mqtt_user, mqtt_pass, topic, will_QoS, will_Retain, will_Message)) {
-#endif
-
-    displayPrint("MQTT connected");
-    Log.notice(F("Connected to broker" CR));
-    failure_number_mqtt = 0;
-    // Once connected, publish an announcement...
-    pub(will_Topic, Gateway_AnnouncementMsg, will_Retain);
-    //Subscribing to topic
-    char topic2[mqtt_topic_max_size];
-    strcpy(topic2, mqtt_topic);
-    strcat(topic2, gateway_name);
-    strcat(topic2, subjectMQTTtoX);
-    if (client.subscribe(topic2)) {
-#ifdef ZgatewayRF
-      client.subscribe(subjectMultiGTWRF); // subject on which other OMG will publish, this OMG will store these msg and by the way don't republish them if they have been already published
-#endif
-#ifdef ZgatewayIR
-      client.subscribe(subjectMultiGTWIR); // subject on which other OMG will publish, this OMG will store these msg and by the way don't republish them if they have been already published
-#endif
-      Log.trace(F("Subscription OK to the subjects %s" CR), topic2);
-    }
-  } else {
-    failure_number_mqtt++; // we count the failure
-    Log.warning(F("failure_number_mqtt: %d" CR), failure_number_mqtt);
-    Log.warning(F("failed, rc=%d" CR), client.state());
-#if defined(ESP32)
-    if (mqtt_secure)
-      Log.warning(F("failed, ssl error code=%d" CR), ((WiFiClientSecure*)eClient)->lastError(nullptr, 0));
-#elif defined(ESP8266)
-    if (mqtt_secure)
-      Log.warning(F("failed, ssl error code=%d" CR), ((WiFiClientSecure*)eClient)->getLastSSLError());
-#endif
-    ErrorIndicatorON();
-    delayWithOTA(5000);
-    ErrorIndicatorOFF();
-    delayWithOTA(5000);
-    if (failure_number_mqtt > maxRetryWatchDog) {
-      unsigned long millis_since_last_ota;
-      while (
-          // When
-          // ...incomplete OTA in progress
-          (last_ota_activity_millis != 0)
-          // ...AND last OTA activity fairly recently
-          && ((millis_since_last_ota = millis() - last_ota_activity_millis) < ota_timeout_millis)) {
-        // ... We consider that OTA might be still active, and we sleep for a while, and giving
-        // OTA chance to proceed (ArduinoOTA.handle())
-        Log.warning(F("OTA might be still active (activity %d ms ago)" CR), millis_since_last_ota);
-#if defined(ESP8266) || defined(ESP32)
-        ArduinoOTA.handle();
-#endif
-        delay(100);
-      }
-      ESPRestart(1);
-    }
-  }
-}
-
-// Callback function, when the gateway receive an MQTT value on the topics subscribed this function is called
-void callback(char* topic, byte* payload, unsigned int length) {
-  // In order to republish this payload, a copy must be made
-  // as the original payload buffer will be overwritten whilst
-  // constructing the PUBLISH packet.
-  Log.trace(F("Hey I got a callback %s" CR), topic);
-  // Allocate the correct amount of memory for the payload copy
-  byte* p = (byte*)malloc(length + 1);
-  // Copy the payload to the new buffer
-  memcpy(p, payload, length);
-  // Conversion to a printable string
-  p[length] = '\0';
-  //launch the function to treat received data if this data concern OpenMQTTGateway
-  if ((strstr(topic, subjectMultiGTWKey) != NULL) ||
-      (strstr(topic, subjectGTWSendKey) != NULL) ||
-      (strstr(topic, subjectMQTTtoSYSupdate) != NULL))
-    receivingMQTT(topic, (char*)p);
-
-  // Free the memory
-  free(p);
-}
-
-#if defined(ESP32) && (defined(WifiGMode) || defined(WifiPower))
-void setESPWifiProtocolTxPower() {
-  //Reduce WiFi interference when using ESP32 using custom WiFi mode and tx power
-  //https://github.com/espressif/arduino-esp32/search?q=WIFI_PROTOCOL_11G
-  //https://www.letscontrolit.com/forum/viewtopic.php?t=671&start=20
-#  if WifiGMode == true
-  if (esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G) != ESP_OK) {
-    Log.error(F("Failed to change WifiMode." CR));
-  }
-#  endif
-
-#  if WifiGMode == false
-  if (esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N) != ESP_OK) {
-    Log.error(F("Failed to change WifiMode." CR));
-  }
-#  endif
-
-  uint8_t getprotocol;
-  esp_err_t err;
-  err = esp_wifi_get_protocol(WIFI_IF_STA, &getprotocol);
-
-  if (err != ESP_OK) {
-    Log.notice(F("Could not get protocol!" CR));
-  }
-  if (getprotocol & WIFI_PROTOCOL_11N) {
-    Log.notice(F("WiFi_Protocol_11n" CR));
-  }
-  if (getprotocol & WIFI_PROTOCOL_11G) {
-    Log.notice(F("WiFi_Protocol_11g" CR));
-  }
-  if (getprotocol & WIFI_PROTOCOL_11B) {
-    Log.notice(F("WiFi_Protocol_11b" CR));
-  }
-
-#  ifdef WifiPower
-  Log.notice(F("Requested WiFi power level: %i" CR), WifiPower);
-  WiFi.setTxPower(WifiPower);
-#  endif
-  Log.notice(F("Operating WiFi power level: %i" CR), WiFi.getTxPower());
-}
-#endif
-
-#if defined(ESP8266) && (defined(WifiGMode) || defined(WifiPower))
-void setESPWifiProtocolTxPower() {
-#  if WifiGMode == true
-  if (!wifi_set_phy_mode(PHY_MODE_11G)) {
-    Log.error(F("Failed to change WifiMode." CR));
-  }
-#  endif
-
-#  if WifiGMode == false
-  if (!wifi_set_phy_mode(PHY_MODE_11N)) {
-    Log.error(F("Failed to change WifiMode." CR));
-  }
-#  endif
-
-  phy_mode_t getprotocol = wifi_get_phy_mode();
-  if (getprotocol == PHY_MODE_11N) {
-    Log.notice(F("WiFi_Protocol_11n" CR));
-  }
-  if (getprotocol == PHY_MODE_11G) {
-    Log.notice(F("WiFi_Protocol_11g" CR));
-  }
-  if (getprotocol == PHY_MODE_11B) {
-    Log.notice(F("WiFi_Protocol_11b" CR));
-  }
-
-#  ifdef WifiPower
-  Log.notice(F("Requested WiFi power level: %i dBm" CR), WifiPower);
-
-  int i_dBm = int(WifiPower * 4.0f);
-
-  // i_dBm 82 == 20.5 dBm
-  if (i_dBm > 82) {
-    i_dBm = 82;
-  } else if (i_dBm < 0) {
-    i_dBm = 0;
-  }
-
-  system_phy_set_max_tpw((uint8_t)i_dBm);
-#  endif
-}
-#endif
-
-void setup() {
-  //Launch serial for debugging purposes
-  Serial.begin(SERIAL_BAUD);
-  Log.begin(LOG_LEVEL, &Serial);
-  Log.notice(F(CR "************* WELCOME TO OpenMQTTGateway **************" CR));
-#if defined(TRIGGER_GPIO) && !defined(ESPWifiManualSetup)
-  pinMode(TRIGGER_GPIO, INPUT_PULLUP);
-  checkButton();
-#endif
-
-  delay(100); //give time to start the flash and avoid issue when reading the preferences
-
-  SYSConfig_init();
-  SYSConfig_load();
-
-  //setup LED status
-  SetupIndicatorError();
-  SetupIndicatorSendReceive();
-  SetupIndicatorInfo();
-  SetupIndicators(); // For RGB Leds
-
-#if defined(ESP8266) || defined(ESP32)
-#  ifdef ESP8266
-#    ifndef ZgatewaySRFB // if we are not in sonoff rf bridge case we apply the ESP8266 GPIO optimization
-  Serial.end();
-  Serial.begin(SERIAL_BAUD, SERIAL_8N1, SERIAL_TX_ONLY); // enable on ESP8266 to free some pin
-#    endif
-#  elif ESP32
-  xQueueMutex = xSemaphoreCreateMutex();
-#    if DEFAULT_LOW_POWER_MODE != -1 //  don't check preferences value if low power mode is not activated
-  preferences.begin(Gateway_Short_Name, false);
-  if (preferences.isKey("lowpowermode")) {
-    lowpowermode = preferences.getUInt("lowpowermode", DEFAULT_LOW_POWER_MODE);
-  } else {
-    Log.notice(F("No lowpowermode config to load" CR));
-  }
-  preferences.end();
-#    endif
-#    if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
-  setupM5();
-#    endif
-#    if defined(ZdisplaySSD1306)
-  setupSSD1306();
-  modules.add(ZdisplaySSD1306);
-#    endif
-#  endif
-
-  Log.notice(F("OpenMQTTGateway Version: " OMG_VERSION CR));
-
-/**
- * Deep-sleep for the ESP8266 & ESP32 we need some form of indicator that we have posted the measurements and am ready to deep sleep.
- * When woken set back to false.
- */
-#  if defined(DEEP_SLEEP_IN_US) || defined(ESP32_EXT0_WAKE_PIN)
-  ready_to_sleep = false;
-#  endif
-
-#  ifdef DEEP_SLEEP_IN_US
-#    ifdef ESP8266
-  Log.notice(F("Setting wake pin for deep sleep." CR));
-  pinMode(ESP8266_DEEP_SLEEP_WAKE_PIN, WAKEUP_PULLUP);
-#    endif
-#    ifdef ESP32
-  Log.notice(F("Setting duration for deep sleep." CR));
-  if (esp_sleep_enable_timer_wakeup(DEEP_SLEEP_IN_US) != ESP_OK) {
-    Log.error(F("Failed to set deep sleep duration." CR));
-  }
-#    endif
-#  endif
-
-#  ifdef ESP32_EXT0_WAKE_PIN
-  Log.notice(F("Setting EXT0 Wakeup for deep sleep." CR));
-  if (esp_sleep_enable_ext0_wakeup(ESP32_EXT0_WAKE_PIN, ESP32_EXT0_WAKE_PIN_STATE) != ESP_OK) {
-    Log.error(F("Failed to set deep sleep EXT0 Wakeup." CR));
-  }
-#  endif
-#  ifdef ESP32
-  //esp_task_wdt_init(GeneralTimeOut, true); //enable panic so ESP32 restarts
-#  endif
-/*
- The 2 modules below are not connection dependent so start them before the connectivity functions
- Note that the ONOFF module need to start after the RN8209 so that the overCurrent function is launched after the setup of the sensor
-*/
-#  ifdef ZsensorRN8209
-  setupRN8209();
-  modules.add(ZsensorRN8209);
-#  endif
-#  ifdef ZactuatorONOFF
-  setupONOFF();
-  modules.add(ZactuatorONOFF);
-#  endif
-
-#  if defined(ESPWifiManualSetup)
-  setup_wifi();
-#  else
-  if (loadConfigFromFlash()) {
-    Log.notice(F("Config loaded from flash" CR));
-#    ifdef ESP32_ETHERNET
-    setup_ethernet_esp32();
-#    endif
-    if (!failSafeMode && !ethConnected) setupwifi(false);
-  } else {
-#    ifdef ESP32_ETHERNET
-    setup_ethernet_esp32();
-#    endif
-    Log.notice(F("No config in flash, launching wifi manager" CR));
-    // In failSafeMode we don't want to setup wifi manager as it has already been done before
-    if (!failSafeMode) setupwifi(false);
-  }
-
-#  endif
-  Log.trace(F("OpenMQTTGateway mac: %s" CR), WiFi.macAddress().c_str());
-  Log.trace(F("OpenMQTTGateway ip: %s" CR), WiFi.localIP().toString().c_str());
-
-  setOTA();
-#else // In case of arduino platform
-
-  //Launch serial for debugging purposes
-  Serial.begin(SERIAL_BAUD);
-  //Begining ethernet connection in case of Arduino + W5100
-  setup_ethernet();
-#endif
-
-#if defined(ZwebUI) && defined(ESP32)
-  WebUISetup();
-  modules.add(ZwebUI);
-#endif
-
-#if defined(ESP8266) || defined(ESP32)
-  if (mqtt_secure) {
-    eClient = new WiFiClientSecure;
-    if (mqtt_cert_validate) {
-      setupTLS(MQTT_SECURE_SELF_SIGNED, mqtt_ss_index);
-    } else {
-      WiFiClientSecure* sClient = (WiFiClientSecure*)eClient;
-      sClient->setInsecure();
-    }
-  } else {
-    eClient = new WiFiClient;
-  }
-#else
-  eClient = new EthernetClient;
-#endif
-  client.setClient(*(Client*)eClient);
-
-#if defined(MDNS_SD) && (defined(ESP8266) || defined(ESP32))
-  Log.trace(F("Connecting to MQTT by mDNS without MQTT hostname" CR));
-  connectMQTTmdns();
-#else
-  uint16_t port = strtol(mqtt_port, NULL, 10);
-  Log.trace(F("Port: %l" CR), port);
-  Log.trace(F("Mqtt server: %s" CR), mqtt_server);
-  client.setServer(mqtt_server, port);
-#endif
-
-  client.setCallback(callback);
-
-  delay(1500);
-#if defined(ZgatewayRF) || defined(ZgatewayPilight) || defined(ZgatewayRTL_433) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
-#  ifndef ARDUINO_AVR_UNO
-  setupCommonRF();
-#  endif
-#endif
-#ifdef ZsensorBME280
-  setupZsensorBME280();
-  modules.add(ZsensorBME280);
-#endif
-#ifdef ZsensorHTU21
-  setupZsensorHTU21();
-  modules.add(ZsensorHTU21);
-#endif
-#ifdef ZsensorLM75
-  setupZsensorLM75();
-  modules.add(ZsensorLM75);
-#endif
-#ifdef ZsensorAHTx0
-  setupZsensorAHTx0();
-  modules.add(ZsensorAHTx0);
-#endif
-#ifdef ZsensorBH1750
-  setupZsensorBH1750();
-  modules.add(ZsensorBH1750);
-#endif
-#ifdef ZsensorMQ2
-  setupZsensorMQ2();
-  modules.add(ZsensorMQ2);
-#endif
-#ifdef ZsensorTEMT6000
-  setupZsensorTEMT6000();
-  modules.add(ZsensorTEMT6000);
-#endif
-#ifdef ZsensorTSL2561
-  setupZsensorTSL2561();
-  modules.add(ZsensorTSL2561);
-#endif
-#ifdef Zgateway2G
-  setup2G();
-  modules.add(Zgateway2G);
-#endif
-#ifdef ZgatewayIR
-  setupIR();
-  modules.add(ZgatewayIR);
-#endif
-#ifdef ZgatewayLORA
-  setupLORA();
-  modules.add(ZgatewayLORA);
-#endif
-#ifdef ZgatewayRF
-  modules.add(ZgatewayRF);
-#  define ACTIVE_RECEIVER ACTIVE_RF
-#endif
-#ifdef ZgatewayRF2
-  modules.add(ZgatewayRF2);
-#  ifdef ACTIVE_RECEIVER
-#    undef ACTIVE_RECEIVER
-#  endif
-#  define ACTIVE_RECEIVER ACTIVE_RF2
-#endif
-#ifdef ZgatewayPilight
-  modules.add(ZgatewayPilight);
-#  ifdef ACTIVE_RECEIVER
-#    undef ACTIVE_RECEIVER
-#  endif
-#  define ACTIVE_RECEIVER ACTIVE_PILIGHT
-#endif
-#ifdef ZgatewayWeatherStation
-  setupWeatherStation();
-  modules.add(ZgatewayWeatherStation);
-#endif
-#ifdef ZgatewayGFSunInverter
-  setupGFSunInverter();
-  modules.add(ZgatewayGFSunInverter);
-#endif
-#ifdef ZgatewaySRFB
-  setupSRFB();
-  modules.add(ZgatewaySRFB);
-#endif
-#ifdef ZgatewayBT
-  setupBT();
-  modules.add(ZgatewayBT);
-#endif
-#ifdef ZgatewayRFM69
-  setupRFM69();
-  modules.add(ZgatewayRFM69);
-#endif
-#ifdef ZsensorINA226
-  setupINA226();
-  modules.add(ZsensorINA226);
-#endif
-#ifdef ZsensorHCSR501
-  setupHCSR501();
-  modules.add(ZsensorHCSR501);
-#endif
-#ifdef ZsensorHCSR04
-  setupHCSR04();
-  modules.add(ZsensorHCSR04);
-#endif
-#ifdef ZsensorGPIOInput
-  setupGPIOInput();
-  modules.add(ZsensorGPIOInput);
-#endif
-#ifdef ZsensorGPIOKeyCode
-  setupGPIOKeyCode();
-  modules.add(ZsensorGPIOKeyCode);
-#endif
-#ifdef ZactuatorFASTLED
-  setupFASTLED();
-  modules.add(ZactuatorFASTLED);
-#endif
-#ifdef ZactuatorPWM
-  setupPWM();
-  modules.add(ZactuatorPWM);
-#endif
-#ifdef ZactuatorSomfy
-#  ifdef ACTIVE_RECEIVER
-#    undef ACTIVE_RECEIVER
-#  endif
-#  define ACTIVE_RECEIVER ACTIVE_NONE
-  setupSomfy();
-  modules.add(ZactuatorSomfy);
-#endif
-#ifdef ZsensorDS1820
-  setupZsensorDS1820();
-  modules.add(ZsensorDS1820);
-#endif
-#ifdef ZsensorADC
-  setupADC();
-  modules.add(ZsensorADC);
-#endif
-#ifdef ZsensorTouch
-  setupTouch();
-  modules.add(ZsensorTouch);
-#endif
-#ifdef ZsensorC37_YL83_HMRD
-  setupZsensorC37_YL83_HMRD();
-  modules.add(ZsensorC37_YL83_HMRD);
-#endif
-#ifdef ZsensorDHT
-  setupDHT();
-  modules.add(ZsensorDHT);
-#endif
-#ifdef ZgatewayRS232
-  setupRS232();
-  modules.add(ZgatewayRS232);
-#endif
-#ifdef ZsensorSHTC3
-  setupSHTC3();
-#endif
-#ifdef ZgatewayRTL_433
-#  ifdef ACTIVE_RECEIVER
-#    undef ACTIVE_RECEIVER
-#  endif
-#  define ACTIVE_RECEIVER ACTIVE_RTL
-  setupRTL_433();
-  modules.add(ZgatewayRTL_433);
-#endif
-  Log.trace(F("mqtt_max_packet_size: %d" CR), mqtt_max_packet_size);
-
-#ifndef ARDUINO_AVR_UNO // Space issues with the UNO
-  char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-  Log.notice(F("OpenMQTTGateway modules: %s" CR), jsonChar);
-#endif
-  Log.notice(F("************** Setup OpenMQTTGateway end **************" CR));
-}
-
-#if defined(ESP8266) || defined(ESP32)
-// Bypass for ESP not reconnecting automaticaly the second time https://github.com/espressif/arduino-esp32/issues/2501
-bool wifi_reconnect_bypass() {
-#  if defined(ESP32) && defined(USE_BLUFI)
-  extern bool omg_blufi_ble_connected;
-  if (omg_blufi_ble_connected) {
-    Log.notice(F("BLUFI is connected, bypassing wifi reconnect" CR));
-    return true;
-  }
-#  endif
-  uint8_t wifi_autoreconnect_cnt = 0;
-#  ifdef ESP32
-  while (WiFi.status() != WL_CONNECTED && wifi_autoreconnect_cnt < maxConnectionRetryNetwork) {
-#  else
-  while (WiFi.waitForConnectResult() != WL_CONNECTED && wifi_autoreconnect_cnt < maxConnectionRetryNetwork) {
-#  endif
-    Log.notice(F("Attempting Wifi connection with saved AP: %d" CR), wifi_autoreconnect_cnt);
-
-    WiFi.begin();
-#  if (defined(ESP8266) || defined(ESP32)) && (defined(WifiGMode) || defined(WifiPower))
-    setESPWifiProtocolTxPower();
-#  endif
-    delay(1000);
-    wifi_autoreconnect_cnt++;
-  }
-  if (wifi_autoreconnect_cnt < maxConnectionRetryNetwork) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-void setOTA() {
-  // Port defaults to 8266
-  ArduinoOTA.setPort(ota_port);
-
-  // Hostname defaults to esp8266-[ChipID]
-  ArduinoOTA.setHostname(ota_hostname);
-
-  // No authentication by default
-  ArduinoOTA.setPassword(ota_pass);
-
-  ArduinoOTA.onStart([]() {
-    Log.trace(F("Start OTA, lock other functions" CR));
-    ErrorIndicatorON();
-    SendReceiveIndicatorON();
-    last_ota_activity_millis = millis();
-#  ifdef ESP32
-    ProcessLock = true;
-#    ifdef ZgatewayBT
-    stopProcessing();
-#    endif
-#  endif
-    lpDisplayPrint("OTA in progress");
-  });
-  ArduinoOTA.onEnd([]() {
-    Log.trace(F("\nOTA done" CR));
-    last_ota_activity_millis = 0;
-    ErrorIndicatorOFF();
-    SendReceiveIndicatorOFF();
-    lpDisplayPrint("OTA done");
-    ESPRestart(6);
-  });
-  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
-    Log.trace(F("Progress: %u%%\r" CR), (progress / (total / 100)));
-#  ifdef ESP32
-    //esp_task_wdt_reset();
-#  endif
-    last_ota_activity_millis = millis();
-  });
-  ArduinoOTA.onError([](ota_error_t error) {
-    last_ota_activity_millis = millis();
-    ErrorIndicatorOFF();
-    SendReceiveIndicatorOFF();
-    Serial.printf("Error[%u]: ", error);
-    if (error == OTA_AUTH_ERROR)
-      Log.error(F("Auth Failed" CR));
-    else if (error == OTA_BEGIN_ERROR)
-      Log.error(F("Begin Failed" CR));
-    else if (error == OTA_CONNECT_ERROR)
-      Log.error(F("Connect Failed" CR));
-    else if (error == OTA_RECEIVE_ERROR)
-      Log.error(F("Receive Failed" CR));
-    else if (error == OTA_END_ERROR)
-      Log.error(F("End Failed" CR));
-    ESPRestart(6);
-  });
-  ArduinoOTA.begin();
-}
-
-void setupTLS(bool self_signed, uint8_t index) {
-  configTime(0, 0, NTP_SERVER);
-  WiFiClientSecure* sClient = (WiFiClientSecure*)eClient;
-#  if MQTT_SECURE_SELF_SIGNED
-  if (self_signed) {
-    Log.notice(F("Using self signed cert index %u" CR), index);
-#    if defined(ESP32)
-    sClient->setCACert(certs_array[index].server_cert);
-#      if AWS_IOT
-    if (strcmp(mqtt_port, "443") == 0) {
-      sClient->setAlpnProtocols(alpnProtocols);
-    }
-#      endif
-#      if MQTT_SECURE_SELF_SIGNED_CLIENT
-    sClient->setCertificate(certs_array[index].client_cert);
-    sClient->setPrivateKey(certs_array[index].client_key);
-#      endif
-#    elif defined(ESP8266)
-    caCert.append(certs_array[index].server_cert);
-    sClient->setTrustAnchors(&caCert);
-    sClient->setBufferSizes(512, 512);
-#      if MQTT_SECURE_SELF_SIGNED_CLIENT
-    if (pClCert != nullptr) {
-      delete pClCert;
-    }
-    if (pClKey != nullptr) {
-      delete pClKey;
-    }
-    pClCert = new X509List(certs_array[index].client_cert);
-    pClKey = new PrivateKey(certs_array[index].client_key);
-    sClient->setClientRSACert(pClCert, pClKey);
-#      endif
-#    endif
-  } else
-#  endif
-  {
-    if (mqtt_cert.length() > 0) {
-#  if defined(ESP32)
-      sClient->setCACert(mqtt_cert.c_str());
-    } else {
-      sClient->setCACert(certificate);
-    }
-#  elif defined(ESP8266)
-      caCert.append(mqtt_cert.c_str());
-    } else {
-      caCert.append(certificate);
-    }
-    sClient->setTrustAnchors(&caCert);
-    sClient->setBufferSizes(512, 512);
-#  endif
-  }
-}
-#else
-bool wifi_reconnect_bypass() {
-  return true;
-}
-#endif
-
-/*
-  Reboot for Reason Codes
-  1 - Repeated MQTT Connection Failure
-  2 - Repeated WiFi Connection Failure
-  3 - Failed WiFiManager configuration portal
-  4 - BLE Scan watchdog
-  5 - User requested reboot
-  6 - OTA Update
-  7 - Parameters changed
-  8 - not enough memory to pursue
-*/
-#if defined(ESP8266) || defined(ESP32)
-void ESPRestart(byte reason) {
-  delay(1000);
-  StaticJsonDocument<128> jsonBuffer;
-  JsonObject jsondata = jsonBuffer.to<JsonObject>();
-  jsondata["reason"] = reason;
-  jsondata["retain"] = true;
-  jsondata["uptime"] = uptime();
-  pub(subjectLOGtoMQTT, jsondata);
-  Log.warning(F("Rebooting for reason code %d" CR), reason);
-#  if defined(ESP32)
-  ESP.restart();
-#  elif defined(ESP8266)
-  ESP.reset();
-#  endif
-}
-#else
-void ESPRestart(byte reason) {}
-#endif
-
-#if defined(ESPWifiManualSetup)
-void setup_wifi() {
-  WiFi.mode(WIFI_STA);
-  wifiMulti.addAP(wifi_ssid, wifi_password);
-  Log.trace(F("Connecting to %s" CR), wifi_ssid);
-#  ifdef wifi_ssid1
-  wifiMulti.addAP(wifi_ssid1, wifi_password1);
-  Log.trace(F("Connecting to %s" CR), wifi_ssid1);
-#  endif
-  delay(10);
-
-  // We start by connecting to a WiFi network
-
-#  ifdef NetworkAdvancedSetup
-  IPAddress ip_adress;
-  IPAddress gateway_adress;
-  IPAddress subnet_adress;
-  IPAddress dns_adress;
-  ip_adress.fromString(NET_IP);
-  gateway_adress.fromString(NET_GW);
-  subnet_adress.fromString(NET_MASK);
-  dns_adress.fromString(NET_DNS);
-
-  if (!WiFi.config(ip_adress, gateway_adress, subnet_adress, dns_adress)) {
-    Log.error(F("Wifi STA Failed to configure" CR));
-  }
-
-#  endif
-
-  while (wifiMulti.run() != WL_CONNECTED) {
-    delay(500);
-    Log.trace(F("." CR));
-    failure_number_ntwk++;
-#  if defined(ESP32) && defined(ZgatewayBT)
-    if (lowpowermode) {
-      if (failure_number_ntwk > maxConnectionRetryNetwork) {
-        lowPowerESP32();
-      }
-    } else {
-      if (failure_number_ntwk > maxRetryWatchDog) {
-        ESPRestart(2);
-      }
-    }
-#  else
-    if (failure_number_ntwk > maxRetryWatchDog) {
-      ESPRestart(2);
-    }
-#  endif
-  }
-  Log.notice(F("WiFi ok with manual config credentials" CR));
-  displayPrint("Wifi connected");
-}
-
-#elif defined(ESP8266) || defined(ESP32)
-
-WiFiManager wifiManager;
-
-//flag for saving data
-bool shouldSaveConfig = false;
-//do we have been connected once to MQTT
-
-//callback notifying us of the need to save config
-void saveConfigCallback() {
-  Log.trace(F("Should save config" CR));
-  shouldSaveConfig = true;
-}
-
-#  ifdef TRIGGER_GPIO
-/**
- * Identify a long button press to trigger a reset or a failsafe mode
-* */
-void blockingWaitForReset() {
-  if (digitalRead(TRIGGER_GPIO) == LOW) {
-    delay(50);
-    if (digitalRead(TRIGGER_GPIO) == LOW) {
-      Log.trace(F("Trigger button Pressed" CR));
-      delay(3000); // reset delay hold
-      if (digitalRead(TRIGGER_GPIO) == LOW) {
-        Log.trace(F("Button Held" CR));
-// Switching off the relay during reset or failsafe operations
-#    ifdef ZactuatorONOFF
-        uint8_t level = digitalRead(ACTUATOR_ONOFF_GPIO);
-        if (level == ACTUATOR_ON) {
-          ActuatorTrigger();
-        }
-#    endif
-#    ifdef ESP32
-        //esp_task_wdt_delete(NULL);
-#    endif
-        InfoIndicatorOFF();
-        SendReceiveIndicatorOFF();
-        // Checking if the flash has already been erased to identify if we erase it or go into failsafe mode
-        // going to failsafe mode is done by doing a long button press from a state where the flash has already been erased
-        if (SPIFFS.begin()) {
-          Log.trace(F("mounted file system" CR));
-          if (SPIFFS.exists("/config.json")) {
-            Log.notice(F("Erasing ESP Config, restarting" CR));
-            setupwifi(true);
-          }
-        }
-        delay(30000);
-        if (digitalRead(TRIGGER_GPIO) == LOW) {
-          Log.notice(F("Going into failsafe mode without peripherals" CR));
-          // Failsafe mode enable to connect to Wifi or change the firmware without the peripherals setup
-          failSafeMode = true;
-          setupwifi(false);
-        }
-      }
-    }
-  }
-}
-
-/**
- * Check if button is pressed so as to reset the credentials and parameters stored into the flash
-* */
-void checkButton() {
-  unsigned long timeFromStart = millis();
-  // Identify if the reset button is pushed at start
-  if (timeFromStart < TimeToResetAtStart) {
-    blockingWaitForReset();
-  } else { // When we are not at start we either check the button as a regular input (ZsensorGPIOInput used) or for a reset
-#    if defined(INPUT_GPIO) && defined(ZsensorGPIOInput) && INPUT_GPIO == TRIGGER_GPIO
-    MeasureGPIOInput();
-#    else
-    blockingWaitForReset();
-#    endif
-  }
-}
-#  else
-void checkButton() {}
-#  endif
-
-void saveConfig() {
-  Log.trace(F("saving config" CR));
-  DynamicJsonDocument json(512 + ota_server_cert.length() + mqtt_cert.length());
-  json["mqtt_server"] = mqtt_server;
-  json["mqtt_port"] = mqtt_port;
-  json["mqtt_user"] = mqtt_user;
-  json["mqtt_pass"] = mqtt_pass;
-  json["mqtt_topic"] = mqtt_topic;
-  json["gateway_name"] = gateway_name;
-  json["mqtt_broker_secure"] = mqtt_secure;
-  json["mqtt_broker_cert"] = mqtt_cert;
-  json["mqtt_ss_index"] = mqtt_ss_index;
-  json["ota_server_cert"] = ota_server_cert;
-  json["ota_pass"] = ota_pass;
-
-  File configFile = SPIFFS.open("/config.json", "w");
-  if (!configFile) {
-    Log.error(F("failed to open config file for writing" CR));
-  }
-
-  serializeJson(json, configFile);
-  configFile.close();
-}
-
-bool loadConfigFromFlash() {
-  Log.trace(F("mounting FS..." CR));
-  bool result = false;
-
-  if (SPIFFS.begin()) {
-    Log.trace(F("mounted file system" CR));
-  } else {
-    Log.warning(F("failed to mount FS -> formating" CR));
-    SPIFFS.format();
-    if (SPIFFS.begin())
-      Log.trace(F("mounted file system after formating" CR));
-  }
-  if (SPIFFS.exists("/config.json")) {
-    //file exists, reading and loading
-    Log.trace(F("reading config file" CR));
-    File configFile = SPIFFS.open("/config.json", "r");
-    if (configFile) {
-      Log.trace(F("opened config file" CR));
-      DynamicJsonDocument json(configFile.size() * 2);
-      auto error = deserializeJson(json, configFile);
-      if (error) {
-        Log.error(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
-      }
-      if (!json.isNull()) {
-        Log.trace(F("\nparsed json, size: %u" CR), json.memoryUsage());
-        if (json.containsKey("mqtt_server"))
-          strcpy(mqtt_server, json["mqtt_server"]);
-        if (json.containsKey("mqtt_port"))
-          strcpy(mqtt_port, json["mqtt_port"]);
-        if (json.containsKey("mqtt_user"))
-          strcpy(mqtt_user, json["mqtt_user"]);
-        if (json.containsKey("mqtt_pass"))
-          strcpy(mqtt_pass, json["mqtt_pass"]);
-        if (json.containsKey("mqtt_topic"))
-          strcpy(mqtt_topic, json["mqtt_topic"]);
-        if (json.containsKey("mqtt_broker_secure"))
-          mqtt_secure = json["mqtt_broker_secure"].as<bool>();
-        if (json.containsKey("mqtt_broker_cert"))
-          mqtt_cert = json["mqtt_broker_cert"].as<const char*>();
-        if (json.containsKey("mqtt_ss_index"))
-          mqtt_ss_index = json["mqtt_ss_index"].as<uint8_t>();
-        if (json.containsKey("gateway_name"))
-          strcpy(gateway_name, json["gateway_name"]);
-        if (json.containsKey("ota_pass")) {
-          strcpy(ota_pass, json["ota_pass"]);
-#  ifdef WM_PWD_FROM_MAC // From ESP Mac Address, last 8 digits as the password
-          // Compare the existing ota_pass if ota_pass = OTAPASSWORD then replace with the last 8 digits of the mac address
-          // This enable user migrating from previous version to have the same WiFi portal password as previously unless they changed it
-          if (strcmp(ota_pass, "OTAPASSWORD") == 0) {
-            String s = WiFi.macAddress();
-            sprintf(ota_pass, "%.2s%.2s%.2s%.2s",
-                    s.c_str() + 6, s.c_str() + 9, s.c_str() + 12, s.c_str() + 15);
-          }
-#  endif
-        }
-        if (json.containsKey("ota_server_cert"))
-          ota_server_cert = json["ota_server_cert"].as<const char*>();
-        result = true;
-      } else {
-        Log.warning(F("failed to load json config" CR));
-      }
-      configFile.close();
-    }
-  } else {
-    Log.notice(F("no config file found defining default values" CR));
-#  ifdef USE_MAC_AS_GATEWAY_NAME
-    String s = WiFi.macAddress();
-    sprintf(gateway_name, "%.2s%.2s%.2s%.2s%.2s%.2s",
-            s.c_str(), s.c_str() + 3, s.c_str() + 6, s.c_str() + 9, s.c_str() + 12, s.c_str() + 15);
-#  endif
-#  ifdef WM_PWD_FROM_MAC // From ESP Mac Address, last 8 digits as the password
-    sprintf(ota_pass, "%.2s%.2s%.2s%.2s",
-            s.c_str() + 6, s.c_str() + 9, s.c_str() + 12, s.c_str() + 15);
-#  endif
-  }
-
-  return result;
-}
-
-void setupwifi(bool reset_settings) {
-  delay(10);
-  WiFi.mode(WIFI_STA);
-
-  if (reset_settings)
-    eraseAndRestart();
-
-#  if defined(ESP32) && defined(USE_BLUFI)
-  if (!wifi_reconnect_bypass()) {
-    startBlufi();
-    return;
-  }
-#  endif
-
-#  ifdef USE_MAC_AS_GATEWAY_NAME
-  String s = WiFi.macAddress();
-  snprintf(WifiManager_ssid, MAC_NAME_MAX_LEN, "%s_%.2s%.2s", Gateway_Short_Name, s.c_str(), s.c_str() + 3);
-  strcpy(ota_hostname, WifiManager_ssid);
-  Log.notice(F("OTA Hostname: %s.local" CR), ota_hostname);
-#  endif
-
-  wifiManager.setDebugOutput(WM_DEBUG);
-
-  // The extra parameters to be configured (can be either global or just in the setup)
-  // After connecting, parameter.getValue() will get you the configured value
-  // id/name placeholder/prompt default length
-#  ifndef WIFIMNG_HIDE_MQTT_CONFIG
-  WiFiManagerParameter custom_mqtt_server("server", "mqtt server", mqtt_server, parameters_size, " minlength='1' maxlength='64' required");
-  WiFiManagerParameter custom_mqtt_port("port", "mqtt port", mqtt_port, 6, " minlength='1' maxlength='5' required");
-  WiFiManagerParameter custom_mqtt_user("user", "mqtt user", mqtt_user, parameters_size, " maxlength='64'");
-  WiFiManagerParameter custom_mqtt_pass("pass", "mqtt pass", MQTT_PASS, parameters_size, " input type='password' maxlength='64'");
-  WiFiManagerParameter custom_mqtt_topic("topic", "mqtt base topic", mqtt_topic, mqtt_topic_max_size, " minlength='1' maxlength='64' required");
-  WiFiManagerParameter custom_mqtt_secure("secure", "mqtt secure", "1", 2, mqtt_secure ? "type=\"checkbox\" checked" : "type=\"checkbox\"");
-  WiFiManagerParameter custom_mqtt_cert("cert", "<br/>mqtt broker cert", mqtt_cert.c_str(), 4096);
-  WiFiManagerParameter custom_gateway_name("name", "gateway name", gateway_name, parameters_size, " minlength='1' maxlength='64' required");
-  WiFiManagerParameter custom_ota_pass("ota", "gateway password", ota_pass, parameters_size, " input type='password' minlength='8' maxlength='64' required");
-#  endif
-  //WiFiManager
-  //Local intialization. Once its business is done, there is no need to keep it around
-
-  wifiManager.setConnectTimeout(WiFi_TimeOut);
-  //Set timeout before going to portal
-  wifiManager.setConfigPortalTimeout(WifiManager_ConfigPortalTimeOut);
-
-  //set config save notify callback
-  wifiManager.setSaveConfigCallback(saveConfigCallback);
-
-//set static IP
-#  ifdef NetworkAdvancedSetup
-  Log.trace(F("Adv wifi cfg" CR));
-  IPAddress ip_adress;
-  IPAddress gateway_adress;
-  IPAddress subnet_adress;
-  IPAddress dns_adress;
-  ip_adress.fromString(NET_IP);
-  gateway_adress.fromString(NET_GW);
-  subnet_adress.fromString(NET_MASK);
-  dns_adress.fromString(NET_DNS);
-  wifiManager.setSTAStaticIPConfig(ip_adress, gateway_adress, subnet_adress, dns_adress);
-#  endif
-
-#  ifndef WIFIMNG_HIDE_MQTT_CONFIG
-  //add all your parameters here
-  wifiManager.addParameter(&custom_mqtt_server);
-  wifiManager.addParameter(&custom_mqtt_port);
-  wifiManager.addParameter(&custom_mqtt_user);
-  wifiManager.addParameter(&custom_mqtt_pass);
-  wifiManager.addParameter(&custom_mqtt_secure);
-  wifiManager.addParameter(&custom_mqtt_cert);
-  wifiManager.addParameter(&custom_gateway_name);
-  wifiManager.addParameter(&custom_mqtt_topic);
-  wifiManager.addParameter(&custom_ota_pass);
-#  endif
-  //set minimum quality of signal so it ignores AP's under that quality
-  wifiManager.setMinimumSignalQuality(MinimumWifiSignalQuality);
-
-  if (SPIFFS.begin()) {
-    Log.trace(F("mounted file system" CR));
-    // Check if the config file exists and prevent the portal from showing if yes
-    // Showing the portal if the config file exist would enable access to the configuration data and to the ESP update page
-    // This is a security risk if an attacker has access to the gateway password
-    if (SPIFFS.exists("/config.json")) {
-      wifiManager.setEnableConfigPortal(false);
-    }
-  }
-
-#  ifdef ESP32_ETHERNET
-  wifiManager.setBreakAfterConfig(true); // If ethernet is used, we don't want to block the connection by keeping the portal up
-#  endif
-
-  if (!wifi_reconnect_bypass()) // if we didn't connect with saved credential we start Wifimanager web portal
-  {
-#  ifdef ESP32
-    if (lowpowermode < 2) {
-      displayPrint("Connect your phone to WIFI AP:", WifiManager_ssid, ota_pass);
-    } else { // in case of low power mode we put the ESP to sleep again if we didn't get connected (typical in case the wifi is down)
-#    ifdef ZgatewayBT
-      lowPowerESP32();
-#    endif
-    }
-#  endif
-
-    InfoIndicatorON();
-    ErrorIndicatorON();
-    Log.notice(F("Connect your phone to WIFI AP: %s with PWD: %s" CR), WifiManager_ssid, ota_pass);
-
-    //fetches ssid and pass and tries to connect
-    //if it does not connect it starts an access point with the specified name
-    //and goes into a blocking loop awaiting configuration
-    if (!wifiManager.autoConnect(WifiManager_ssid, ota_pass)) {
-      if (!ethConnected) { // If we are using ethernet, we don't want to restart the ESP
-        Log.warning(F("failed to connect and hit timeout" CR));
-        delay(3000);
-
-#  ifdef ESP32
-        /* Workaround for bug in arduino core that causes the AP to become unsecure on reboot */
-        esp_wifi_set_mode(WIFI_MODE_AP);
-        esp_wifi_start();
-        wifi_config_t conf;
-        esp_wifi_get_config(WIFI_IF_AP, &conf);
-        conf.ap.ssid_hidden = 1;
-        esp_wifi_set_config(WIFI_IF_AP, &conf);
-#  endif
-
-        //restart and try again
-        ESPRestart(3);
-      }
-    }
-    InfoIndicatorOFF();
-    ErrorIndicatorOFF();
-  }
-
-  displayPrint("Wifi connected");
-
-  if (shouldSaveConfig) {
-    //read updated parameters
-#  ifndef WIFIMNG_HIDE_MQTT_CONFIG
-    strcpy(mqtt_server, custom_mqtt_server.getValue());
-    strcpy(mqtt_port, custom_mqtt_port.getValue());
-    strcpy(mqtt_user, custom_mqtt_user.getValue());
-    // Check if the MQTT password field contains the default value
-    if (strcmp(custom_mqtt_pass.getValue(), MQTT_PASS) != 0) {
-      // If it's not the default password, update the MQTT password
-      strcpy(mqtt_pass, custom_mqtt_pass.getValue());
-    }
-    strcpy(mqtt_topic, custom_mqtt_topic.getValue());
-    if (mqtt_topic[strlen(mqtt_topic) - 1] != '/' && strlen(mqtt_topic) < parameters_size) {
-      strcat(mqtt_topic, "/");
-    }
-
-    strcpy(gateway_name, custom_gateway_name.getValue());
-    strcpy(ota_pass, custom_ota_pass.getValue());
-    mqtt_secure = *custom_mqtt_secure.getValue();
-
-    int cert_len = strlen(custom_mqtt_cert.getValue());
-    if (cert_len) {
-      char* cert_in = (char*)custom_mqtt_cert.getValue();
-      while (*cert_in == ' ' || *cert_in == '\t') {
-        cert_in++;
-      }
-
-      char* cert_begin = cert_in;
-      while (*cert_in != NULL) {
-        if (*cert_in == ' ' && (strncmp((cert_in + 1), "CERTIFICATE", 11) != 0)) {
-          *cert_in = '\n';
-        }
-        cert_in++;
-      }
-
-      mqtt_cert = cert_begin;
-    }
-#  endif
-    //save the custom parameters to FS
-    saveConfig();
-  }
-}
-#  ifdef ESP32_ETHERNET
-void setup_ethernet_esp32() {
-  bool ethBeginSuccess = false;
-  WiFi.onEvent(WiFiEvent);
-#    ifdef NetworkAdvancedSetup
-  IPAddress ip_adress;
-  IPAddress gateway_adress;
-  IPAddress subnet_adress;
-  IPAddress dns_adress;
-  ip.fromString(NET_IP);
-  gateway.fromString(NET_GW);
-  subnet.fromString(NET_MASK);
-  Dns.fromString(NET_DNS);
-
-  Log.trace(F("Adv eth cfg" CR));
-  ETH.config(ip, gateway, subnet, Dns);
-  ethBeginSuccess = ETH.begin();
-#    else
-  Log.trace(F("Spl eth cfg" CR));
-  ethBeginSuccess = ETH.begin();
-#    endif
-  Log.trace(F("Connecting to Ethernet" CR));
-  while (!ethConnected && failure_number_ntwk <= maxConnectionRetryNetwork) {
-    delay(500);
-    Log.trace(F("." CR));
-    failure_number_ntwk++;
-  }
-}
-
-void WiFiEvent(WiFiEvent_t event) {
-  switch (event) {
-    case ARDUINO_EVENT_ETH_START:
-      Log.trace(F("Ethernet Started" CR));
-      ETH.setHostname(gateway_name);
-      break;
-    case ARDUINO_EVENT_ETH_CONNECTED:
-      Log.notice(F("Ethernet Connected" CR));
-      break;
-    case ARDUINO_EVENT_ETH_GOT_IP:
-      Log.trace(F("OpenMQTTGateway MAC: %s" CR), ETH.macAddress().c_str());
-      Log.trace(F("OpenMQTTGateway IP: %s" CR), ETH.localIP().toString().c_str());
-      Log.trace(F("OpenMQTTGateway link speed: %d Mbps" CR), ETH.linkSpeed());
-      ethConnected = true;
-      break;
-    case ARDUINO_EVENT_ETH_DISCONNECTED:
-      Log.error(F("Ethernet Disconnected" CR));
-      ethConnected = false;
-      break;
-    case ARDUINO_EVENT_ETH_STOP:
-      Log.error(F("Ethernet Stopped" CR));
-      ethConnected = false;
-      break;
-    default:
-      break;
-  }
-}
-#  endif
-#else // Arduino case
-void setup_ethernet() {
-#  ifdef NetworkAdvancedSetup
-  IPAddress ip_adress;
-  IPAddress gateway_adress;
-  IPAddress subnet_adress;
-  IPAddress dns_adress;
-  ip.fromString(NET_IP);
-  gateway.fromString(NET_GW);
-  subnet.fromString(NET_MASK);
-  Dns.fromString(NET_DNS);
-
-  Log.trace(F("Adv eth cfg" CR));
-  Ethernet.begin(mac, ip, Dns, gateway, subnet);
-#  else
-  Log.trace(F("Spl eth cfg" CR));
-  Ethernet.begin(mac, ip);
-#  endif
-  if (Ethernet.hardwareStatus() == EthernetNoHardware) {
-    Log.error(F("Ethernet shield was not found." CR));
-  } else {
-    Log.trace(F("ip: %s " CR), Ethernet.localIP());
-  }
-}
-#endif
-
-#if defined(MDNS_SD) && (defined(ESP8266) || defined(ESP32))
-void connectMQTTmdns() {
-  Log.trace(F("Browsing for MQTT service" CR));
-  int n = MDNS.queryService("mqtt", "tcp");
-  if (n == 0) {
-    Log.error(F("no services found" CR));
-  } else {
-    Log.trace(F("%d service(s) found" CR), n);
-    for (int i = 0; i < n; ++i) {
-      Log.trace(F("Service %d %s found" CR), i, MDNS.hostname(i).c_str());
-      Log.trace(F("IP %s Port %d" CR), MDNS.IP(i).toString().c_str(), MDNS.port(i));
-    }
-    if (n == 1) {
-      Log.trace(F("One MQTT server found setting parameters" CR));
-      client.setServer(MDNS.IP(0), int(MDNS.port(0)));
-    } else {
-      Log.error(F("Several MQTT servers found, please deactivate mDNS and set your default server" CR));
-    }
-  }
-}
-#endif
-
-void loop() {
-#ifndef ESPWifiManualSetup
-#  if defined(ESP8266) || defined(ESP32)
-  checkButton(); // check if a reset of wifi/mqtt settings is asked
-#  endif
-#endif
-
-#ifdef ESP32
-  //esp_task_wdt_reset();
-#endif
-
-  unsigned long now = millis();
-
-  // Switch off of the LED after TimeLedON
-  if (now > (timer_led_measures + (TimeLedON * 1000))) {
-    timer_led_measures = millis();
-    InfoIndicatorOFF();
-    SendReceiveIndicatorOFF();
-  }
-
-#if defined(ESP8266) || defined(ESP32)
-  if (ethConnected || WiFi.status() == WL_CONNECTED) {
-    if (ethConnected && WiFi.status() == WL_CONNECTED) {
-      WiFi.disconnect(); // we disconnect the wifi as we are connected to ethernet
-    }
-    ArduinoOTA.handle();
-#else
-  if ((Ethernet.hardwareStatus() != EthernetW5100 && Ethernet.linkStatus() == LinkON) || (Ethernet.hardwareStatus() == EthernetW5100)) { //we are able to detect disconnection only on w5200 and w5500
-#endif
-    failure_number_ntwk = 0;
-#if defined(ZwebUI) && defined(ESP32)
-    WebUILoop();
-#endif
-    if (client.loop()) { // MQTT client is still connected
-      InfoIndicatorON();
-      failure_number_ntwk = 0;
-      // We have just re-connected if connected was previously false
-      bool justReconnected = !connected;
-#ifdef ZmqttDiscovery
-      // Deactivate autodiscovery after DiscoveryAutoOffTimer
-      if (SYSConfig.discovery && (now > lastDiscovery + DiscoveryAutoOffTimer))
-        SYSConfig.discovery = false;
-      // at first connection we publish the discovery payloads
-      // or, when we have just re-connected (only when discovery_republish_on_reconnect is enabled)
-      bool publishDiscovery = SYSConfig.discovery && (!connectedOnce || (discovery_republish_on_reconnect && justReconnected));
-      if (publishDiscovery) {
-        pubMqttDiscovery();
-      }
-#endif
-      connectedOnce = true;
-      connected = true;
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-      if (now > (timer_sys_measures + (TimeBetweenReadingSYS * 1000)) || !timer_sys_measures) {
-        timer_sys_measures = millis();
-        stateMeasures();
-#  ifdef ZgatewayBT
-        stateBTMeasures(false);
-#  endif
-#  ifdef ZactuatorONOFF
-        stateONOFFMeasures();
-#  endif
-#  ifdef ZdisplaySSD1306
-        stateSSD1306Display();
-#  endif
-#  ifdef ZgatewayLORA
-        stateLORAMeasures();
-#  endif
-#  if defined(ZgatewayRTL_433) || defined(ZgatewayPilight) || defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
-        stateRFMeasures();
-#  endif
-#  if defined(ZwebUI) && defined(ESP32)
-        stateWebUIStatus();
-#  endif
-      }
-      if (now > (timer_sys_checks + (TimeBetweenCheckingSYS * 1000)) || !timer_sys_checks) {
-#  if defined(ESP8266) || defined(ESP32)
-#    if message_UTCtimestamp || message_unixtimestamp
-        syncNTP();
-#    endif
-#  endif
-        if (!timer_sys_checks) { // Update check at start up only
-#  if defined(ESP32) && defined(MQTT_HTTPS_FW_UPDATE)
-          checkForUpdates();
-#  endif
-#  ifdef ZgatewayBT
-          BTProcessLock = !BTConfig.enabled; // Release BLE processes at start if enabled
-#  endif
-        }
-
-        timer_sys_checks = millis();
-      }
-#endif
-      emptyQueue();
-#ifdef ZsensorBME280
-      MeasureTempHumAndPressure(); //Addon to measure Temperature, Humidity, Pressure and Altitude with a Bosch BME280/BMP280
-#endif
-#ifdef ZsensorHTU21
-      MeasureTempHum(); //Addon to measure Temperature, Humidity, of a HTU21 sensor
-#endif
-#ifdef ZsensorLM75
-      MeasureTemp(); //Addon to measure Temperature of an LM75 sensor
-#endif
-#ifdef ZsensorAHTx0
-      MeasureAHTTempHum(); //Addon to measure Temperature, Humidity, of an 'AHTx0' sensor
-#endif
-#ifdef ZsensorHCSR04
-      MeasureDistance(); //Addon to measure distance with a HC-SR04
-#endif
-#ifdef ZsensorBH1750
-      MeasureLightIntensity(); //Addon to measure Light Intensity with a BH1750
-#endif
-#ifdef ZsensorMQ2
-      MeasureGasMQ2();
-#endif
-#ifdef ZsensorTEMT6000
-      MeasureLightIntensityTEMT6000();
-#endif
-#ifdef ZsensorTSL2561
-      MeasureLightIntensityTSL2561();
-#endif
-#ifdef ZsensorC37_YL83_HMRD
-      MeasureC37_YL83_HMRDWater(); //Addon for leak detection with a C-37 YL-83 H-MRD
-#endif
-#ifdef ZsensorDHT
-      MeasureTempAndHum(); //Addon to measure the temperature with a DHT
-#endif
-#ifdef ZsensorSHTC3
-      MeasureTempAndHum(); //Addon to measure the temperature with a DHT
-#endif
-#ifdef ZsensorDS1820
-      MeasureDS1820Temp(); //Addon to measure the temperature with DS1820 sensor(s)
-#endif
-#ifdef ZsensorINA226
-      MeasureINA226();
-#endif
-#ifdef ZsensorHCSR501
-      MeasureHCSR501();
-#endif
-#ifdef ZsensorGPIOInput
-      MeasureGPIOInput();
-#endif
-#ifdef ZsensorGPIOKeyCode
-      MeasureGPIOKeyCode();
-#endif
-#ifdef ZsensorADC
-      MeasureADC(); //Addon to measure the analog value of analog pin
-#endif
-#ifdef ZsensorTouch
-      MeasureTouch();
-#endif
-#ifdef ZgatewayLORA
-      LORAtoMQTT();
-#  ifdef ZmqttDiscovery
-      if (SYSConfig.discovery)
-        launchLORADiscovery(publishDiscovery);
-#  endif
-#endif
-#ifdef ZgatewayRF
-      RFtoMQTT();
-#endif
-#ifdef ZgatewayRF2
-      RF2toMQTT();
-#endif
-#ifdef ZgatewayWeatherStation
-      ZgatewayWeatherStationtoMQTT();
-#endif
-#ifdef ZgatewayGFSunInverter
-      ZgatewayGFSunInverterMQTT();
-#endif
-#ifdef ZgatewayPilight
-      PilighttoMQTT();
-#endif
-#ifdef ZgatewayBT
-#  ifdef ZmqttDiscovery
-      if (SYSConfig.discovery)
-        launchBTDiscovery(publishDiscovery);
-#  endif
-#endif
-#ifdef ZgatewaySRFB
-      SRFBtoMQTT();
-#endif
-#ifdef ZgatewayIR
-      IRtoMQTT();
-#endif
-#ifdef Zgateway2G
-      if (_2GtoMQTT())
-        Log.trace(F("2GtoMQTT OK" CR));
-#endif
-#ifdef ZgatewayRFM69
-      if (RFM69toMQTT())
-        Log.trace(F("RFM69toMQTT OK" CR));
-#endif
-#ifdef ZgatewayRS232
-      RS232toMQTT();
-#endif
-#ifdef ZactuatorFASTLED
-      FASTLEDLoop();
-#endif
-#ifdef ZactuatorPWM
-      PWMLoop();
-#endif
-#ifdef ZgatewayRTL_433
-      RTL_433Loop();
-#  ifdef ZmqttDiscovery
-      if (SYSConfig.discovery)
-        launchRTL_433Discovery(publishDiscovery);
-#  endif
-#endif
-
-    } else {
-      // MQTT disconnected
-      connected = false;
-      connectMQTT();
-    }
-  } else { // disconnected from network
-#ifdef ESP32
-    //esp_task_wdt_reset();
-#endif
-    connected = false;
-    Log.warning(F("Network disconnected" CR));
-    ErrorIndicatorON();
-    delay(2000); // add a delay to avoid ESP32 crash and reset
-#ifdef ESP32
-    //esp_task_wdt_reset();
-#endif
-    ErrorIndicatorOFF();
-    delay(2000);
-    wifi_reconnect_bypass();
-  }
-// Function that doesn't need an active connection
-#if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
-  loopM5();
-#endif
-#if defined(ZdisplaySSD1306)
-  loopSSD1306();
-#endif
-
-/**
- * Deep-sleep for the ESP8266 & ESP32 - e.g. DEEP_SLEEP_IN_US 30000000 for 30 seconds / wake by ESP32_EXT0_WAKE_PIN.
- * Everything is off and (almost) all execution state is lost.
- */
-#if defined(DEEP_SLEEP_IN_US) || defined(ESP32_EXT0_WAKE_PIN)
-  if (ready_to_sleep) {
-    delay(250); //Give some time for last MQTT messages to be sent
-#  ifdef DEEP_SLEEP_IN_US
-    Log.notice(F("Entering deep sleep for %l us." CR), DEEP_SLEEP_IN_US);
-#  endif
-#  ifdef ESP32_EXT0_WAKE_PIN
-    Log.notice(F("Entering deep sleep, EXT0 Wakeup by pin : %l." CR), ESP32_EXT0_WAKE_PIN);
-#  endif
-#  ifdef ESP8266
-    ESP.deepSleep(DEEP_SLEEP_IN_US);
-#  endif
-#  ifdef ESP32
-    esp_deep_sleep_start();
-#  endif
-  }
-#endif
-}
-
-/**
- * Calculate uptime and take into account the millis() rollover
- */
-unsigned long uptime() {
-  static unsigned long lastUptime = 0;
-  static unsigned long uptimeAdd = 0;
-  unsigned long uptime = millis() / 1000 + uptimeAdd;
-  if (uptime < lastUptime) {
-    uptime += 4294967;
-    uptimeAdd += 4294967;
-  }
-  lastUptime = uptime;
-  return uptime;
-}
-
-/**
- * Calculate internal ESP32 temperature
- */
-#if defined(ESP32) && !defined(NO_INT_TEMP_READING)
-float intTemperatureRead() {
-  SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_SAR, 3, SENS_FORCE_XPD_SAR_S);
-  SET_PERI_REG_BITS(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_CLK_DIV, 10, SENS_TSENS_CLK_DIV_S);
-  CLEAR_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP);
-  CLEAR_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_DUMP_OUT);
-  SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP_FORCE);
-  SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP);
-  ets_delay_us(100);
-  SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_DUMP_OUT);
-  ets_delay_us(5);
-  float temp_f = (float)GET_PERI_REG_BITS2(SENS_SAR_SLAVE_ADDR3_REG, SENS_TSENS_OUT, SENS_TSENS_OUT_S);
-  float temp_c = (temp_f - 32) / 1.8;
-  return temp_c;
-}
-#endif
-
-#if defined(ESP8266) || defined(ESP32)
-void syncNTP() {
-  configTime(0, 0, NTP_SERVER);
-  time_t now = time(nullptr);
-  uint8_t count = 0;
-  Log.trace(F("Waiting for NTP time sync" CR));
-  while ((now < 8 * 3600 * 2) && count++ < 60) {
-    delay(500);
-    now = time(nullptr);
-  }
-
-  if (count >= 60) {
-    Log.error(F("Unable to update - invalid time" CR));
-    return;
-  }
-}
-
-int unixtimestamp() {
-  return time(nullptr);
-}
-
-String UTCtimestamp() {
-  time_t now;
-  time(&now);
-  char buffer[sizeof "yyyy-MM-ddThh:mm:ssZ"];
-  strftime(buffer, sizeof buffer, "%FT%TZ", gmtime(&now));
-  return buffer;
-}
-
-/*
- Erase flash and restart the ESP
-*/
-void eraseAndRestart() {
-  Log.trace(F("Formatting requested, result: %d" CR), SPIFFS.format());
-
-#  if defined(ESP8266)
-  WiFi.disconnect(true);
-#    ifndef ESPWifiManualSetup
-  wifiManager.resetSettings();
-#    endif
-  delay(5000);
-  ESP.reset();
-#  else
-  //esp_task_wdt_delete(NULL);
-  nvs_flash_erase();
-  ESP.restart();
-#  endif
-}
-
-#endif
-
-#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-String stateMeasures() {
-  StaticJsonDocument<JSON_MSG_BUFFER> SYSdata;
-
-  SYSdata["uptime"] = uptime();
-
-  SYSdata["version"] = OMG_VERSION;
-#  ifdef RGB_INDICATORS
-  SYSdata["rgbb"] = SYSConfig.rgbbrightness;
-#  endif
-#  ifdef ZmqttDiscovery
-  SYSdata["disc"] = SYSConfig.discovery;
-  SYSdata["ohdisc"] = SYSConfig.ohdiscovery;
-#  endif
-#  if defined(ESP8266) || defined(ESP32)
-  SYSdata["env"] = ENV_NAME;
-  uint32_t freeMem;
-  uint32_t minFreeMem;
-  freeMem = ESP.getFreeHeap();
-#    ifdef ZgatewayRTL_433
-  // Some RTL_433 decoders have memory leak, this is a temporary workaround
-  if (freeMem < MinimumMemory) {
-    Log.error(F("Not enough memory %d, restarting" CR), freeMem);
-    ESPRestart(8);
-  }
-#    endif
-  SYSdata["freemem"] = freeMem;
-  SYSdata["mqttp"] = mqtt_port;
-  SYSdata["mqtts"] = mqtt_secure;
-  SYSdata["msgprc"] = queueLengthSum;
-  SYSdata["msgblck"] = blockedMessages;
-  SYSdata["maxq"] = maxQueueLength;
-#    ifdef ESP32
-  minFreeMem = ESP.getMinFreeHeap();
-  SYSdata["minmem"] = minFreeMem;
-#      ifndef NO_INT_TEMP_READING
-  SYSdata["tempc"] = round2(intTemperatureRead());
-#      endif
-  SYSdata["freestck"] = uxTaskGetStackHighWaterMark(NULL);
-#    endif
-
-  SYSdata["eth"] = ethConnected;
-  if (ethConnected) {
-#    ifdef ESP32_ETHERNET
-    SYSdata["mac"] = (char*)ETH.macAddress().c_str();
-    SYSdata["ip"] = ip2CharArray(ETH.localIP());
-    ETH.fullDuplex() ? SYSdata["fd"] = (bool)"true" : SYSdata["fd"] = (bool)"false";
-    SYSdata["linkspeed"] = (int)ETH.linkSpeed();
-#    endif
-  } else {
-    SYSdata["rssi"] = (long)WiFi.RSSI();
-    SYSdata["SSID"] = (char*)WiFi.SSID().c_str();
-    SYSdata["BSSID"] = (char*)WiFi.BSSIDstr().c_str();
-    SYSdata["ip"] = ip2CharArray(WiFi.localIP());
-    SYSdata["mac"] = (char*)WiFi.macAddress().c_str();
-  }
-
-#  endif
-#  ifdef ZgatewayBT
-#    ifdef ESP32
-  SYSdata["lowpowermode"] = (int)lowpowermode;
-#    endif
-#  endif
-#  ifdef ZboardM5STACK
-  M5.Power.begin();
-  SYSdata["m5battlevel"] = (int8_t)M5.Power.getBatteryLevel();
-  SYSdata["m5ischarging"] = (bool)M5.Power.isCharging();
-  SYSdata["m5ischargefull"] = (bool)M5.Power.isChargeFull();
-#  endif
-#  if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
-  M5.Axp.EnableCoulombcounter();
-  SYSdata["m5batvoltage"] = (float)M5.Axp.GetBatVoltage();
-  SYSdata["m5batcurrent"] = (float)M5.Axp.GetBatCurrent();
-  SYSdata["m5vinvoltage"] = (float)M5.Axp.GetVinVoltage();
-  SYSdata["m5vincurrent"] = (float)M5.Axp.GetVinCurrent();
-  SYSdata["m5vbusvoltage"] = (float)M5.Axp.GetVBusVoltage();
-  SYSdata["m5vbuscurrent"] = (float)M5.Axp.GetVBusCurrent();
-  SYSdata["m5tempaxp"] = (float)M5.Axp.GetTempInAXP192();
-  SYSdata["m5batpower"] = (float)M5.Axp.GetBatPower();
-  SYSdata["m5batchargecurrent"] = (float)M5.Axp.GetBatChargeCurrent();
-  SYSdata["m5apsvoltage"] = (float)M5.Axp.GetAPSVoltage();
-#  endif
-  SYSdata["modules"] = modules;
-
-  SYSdata["origin"] = subjectSYStoMQTT;
-  handleJsonEnqueue(SYSdata);
-  pubOled(subjectSYStoMQTT, SYSdata);
-
-  char jsonChar[100];
-  serializeJson(modules, jsonChar, 99);
-
-  String _modules = jsonChar;
-
-  _modules.replace(",", ", ");
-  _modules.replace("[", "");
-  _modules.replace("]", "");
-  _modules.replace("\"", "'");
-
-  SYSdata["modules"] = _modules.c_str();
-
-  String output;
-  serializeJson(SYSdata, output);
-  return output;
-}
-#endif
-
-#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) || defined(ZgatewayRTL_433)
-/**
- * Store signal values from RF, IR, SRFB or Weather stations so as to avoid duplicates
- */
-void storeSignalValue(SIGNAL_SIZE_UL_ULL MQTTvalue) {
-  unsigned long now = millis();
-  // find oldest value of the buffer
-  int o = getMin();
-  Log.trace(F("Min ind: %d" CR), o);
-  // replace it by the new one
-  receivedSignal[o].value = MQTTvalue;
-  receivedSignal[o].time = now;
-
-  // Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
-  Log.trace(F("store code : %u / %u" CR), (unsigned long)receivedSignal[o].value, receivedSignal[o].time);
-  Log.trace(F("Col: val/timestamp" CR));
-  for (int i = 0; i < struct_size; i++) {
-    Log.trace(F("mem code : %u / %u" CR), (unsigned long)receivedSignal[i].value, receivedSignal[i].time);
-  }
-}
-
-/**
- * get oldest time index from the values array from RF, IR, SRFB or Weather stations so as to avoid duplicates
- */
-int getMin() {
-  unsigned int minimum = receivedSignal[0].time;
-  int minindex = 0;
-  for (int i = 1; i < struct_size; i++) {
-    if (receivedSignal[i].time < minimum) {
-      minimum = receivedSignal[i].time;
-      minindex = i;
-    }
-  }
-  return minindex;
-}
-
-/**
- * Check if signal values from RF, IR, SRFB or Weather stations are duplicates
- */
-bool isAduplicateSignal(SIGNAL_SIZE_UL_ULL value) {
-  Log.trace(F("isAdupl?" CR));
-  for (int i = 0; i < struct_size; i++) {
-    if (receivedSignal[i].value == value) {
-      unsigned long now = millis();
-      if (now - receivedSignal[i].time < time_avoid_duplicate) { // change
-        Log.trace(F("no pub. dupl" CR));
-        return true;
-      }
-    }
-  }
-  return false;
-}
-#endif
-
-void receivingMQTT(char* topicOri, char* datacallback) {
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  JsonObject jsondata = jsonBuffer.to<JsonObject>();
-  auto error = deserializeJson(jsonBuffer, datacallback);
-  if (error) {
-    Log.error(F("deserialize MQTT data failed: %s" CR), error.c_str());
-    return;
-  }
-
-#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation)
-  if (strstr(topicOri, subjectMultiGTWKey) != NULL) { // storing received value so as to avoid publishing this value if it has been already sent by this or another OpenMQTTGateway
-    SIGNAL_SIZE_UL_ULL data = jsondata.isNull() ? STRTO_UL_ULL(datacallback, NULL, 10) : jsondata["value"];
-    if (data != 0 && !isAduplicateSignal(data)) {
-      storeSignalValue(data);
-    }
-  }
-#endif
-
-  if (!jsondata.isNull()) { // json object ok -> json decoding
-    // log the received json
-    String buffer = "";
-    serializeJson(jsondata, buffer);
-    Log.notice(F("[ MQTT->OMG ]: %s" CR), buffer.c_str());
-
-#ifdef ZgatewayPilight // ZgatewayPilight is only defined with json publishing due to its numerous parameters
-    MQTTtoPilight(topicOri, jsondata);
-#endif
-#if defined(ZgatewayRTL_433) || defined(ZgatewayPilight) || defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
-    MQTTtoRFset(topicOri, jsondata);
-#endif
-#if jsonReceiving
-#  ifdef ZgatewayLORA
-    MQTTtoLORA(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewayRF
-    MQTTtoRF(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewayRF2
-    MQTTtoRF2(topicOri, jsondata);
-#  endif
-#  ifdef Zgateway2G
-    MQTTto2G(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewaySRFB
-    MQTTtoSRFB(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewayIR
-    MQTTtoIR(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewayRFM69
-    MQTTtoRFM69(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewayBT
-    MQTTtoBT(topicOri, jsondata);
-#  endif
-#  ifdef ZactuatorFASTLED
-    MQTTtoFASTLED(topicOri, jsondata);
-#  endif
-#  ifdef ZactuatorPWM
-    MQTTtoPWM(topicOri, jsondata);
-#  endif
-#  if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5STACK) || defined(ZboardM5TOUGH)
-    MQTTtoM5(topicOri, jsondata);
-#  endif
-#  if defined(ZdisplaySSD1306)
-    MQTTtoSSD1306(topicOri, jsondata);
-#  endif
-#  ifdef ZactuatorONOFF
-    MQTTtoONOFF(topicOri, jsondata);
-#  endif
-#  ifdef ZactuatorSomfy
-    MQTTtoSomfy(topicOri, jsondata);
-#  endif
-#  ifdef ZgatewayRS232
-    MQTTtoRS232(topicOri, jsondata);
-#  endif
-#  ifdef MQTT_HTTPS_FW_UPDATE
-    MQTTHttpsFWUpdate(topicOri, jsondata);
-#  endif
-#  if defined(ZwebUI) && defined(ESP32)
-    MQTTtoWebUI(topicOri, jsondata);
-#  endif
-#endif
-    SendReceiveIndicatorON();
-
-    MQTTtoSYS(topicOri, jsondata);
-  } else { // not a json object --> simple decoding
-#if simpleReceiving
-#  ifdef ZgatewayLORA
-    MQTTtoLORA(topicOri, datacallback);
-#  endif
-#  ifdef ZgatewayRF
-    MQTTtoRF(topicOri, datacallback);
-#  endif
-#  ifdef ZgatewayRF315
-    MQTTtoRF315(topicOri, datacallback);
-#  endif
-#  ifdef ZgatewayRF2
-    MQTTtoRF2(topicOri, datacallback);
-#  endif
-#  ifdef Zgateway2G
-    MQTTto2G(topicOri, datacallback);
-#  endif
-#  ifdef ZgatewaySRFB
-    MQTTtoSRFB(topicOri, datacallback);
-#  endif
-#  ifdef ZgatewayRFM69
-    MQTTtoRFM69(topicOri, datacallback);
-#  endif
-#  ifdef ZactuatorFASTLED
-    MQTTtoFASTLED(topicOri, datacallback);
-#  endif
-#endif
-#ifdef ZactuatorONOFF
-    MQTTtoONOFF(topicOri, datacallback);
-#endif
-  }
-}
-
-#ifdef MQTT_HTTPS_FW_UPDATE
-String latestVersion;
-#  ifdef ESP32
-#    include <HTTPClient.h>
-
-#    include "zzHTTPUpdate.h"
-
-#    if CHECK_OTA_UPDATE
-/**
- * Check on a server the latest version information to build a releaseLink
- * The release link will be used when the user trigger an OTA update command
- * Only available for ESP32
- */
-bool checkForUpdates() {
-  Log.notice(F("Update check, free heap: %d"), ESP.getFreeHeap());
-  HTTPClient http;
-  http.setTimeout((GeneralTimeOut - 1) * 1000); // -1 to avoid WDT
-  http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-  http.begin(OTA_JSON_URL, OTAserver_cert);
-  int httpCode = http.GET();
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  JsonObject jsondata = jsonBuffer.to<JsonObject>();
-
-  if (httpCode > 0) { //Check for the returning code
-    String payload = http.getString();
-    auto error = deserializeJson(jsonBuffer, payload);
-    if (error) {
-      Log.error(F("Deserialize MQTT data failed: %s" CR), error.c_str());
-    }
-    Log.trace(F("HttpCode %d" CR), httpCode);
-    Log.trace(F("Payload %s" CR), payload.c_str());
-  } else {
-    Log.error(F("Error on HTTP request"));
-  }
-  http.end(); //Free the resources
-  Log.notice(F("Update check done, free heap: %d"), ESP.getFreeHeap());
-  if (jsondata.containsKey("latest_version")) {
-    jsondata["installed_version"] = OMG_VERSION;
-    jsondata["entity_picture"] = ENTITY_PICTURE;
-    if (!jsondata.containsKey("release_summary"))
-      jsondata["release_summary"] = "";
-    latestVersion = jsondata["latest_version"].as<String>();
-    jsondata["origin"] = subjectRLStoMQTT;
-    jsondata["retain"] = true;
-    handleJsonEnqueue(jsondata);
-
-    Log.trace(F("Update file found on server" CR));
-    return true;
-  } else {
-    Log.trace(F("No update file found on server" CR));
-    return false;
-  }
-}
-
-#    else
-bool checkForUpdates() {
-  return false;
-}
-#    endif
-#  elif ESP8266
-#    include <ESP8266httpUpdate.h>
-#  endif
-
-void MQTTHttpsFWUpdate(char* topicOri, JsonObject& HttpsFwUpdateData) {
-  if (strstr(topicOri, subjectMQTTtoSYSupdate) != NULL) {
-    const char* version = HttpsFwUpdateData["version"] | "latest";
-    if (version && ((strlen(version) != strlen(OMG_VERSION)) || strcmp(version, OMG_VERSION) != 0)) {
-      const char* url = HttpsFwUpdateData["url"];
-      String systemUrl;
-      if (url) {
-        if (!strstr((url + (strlen(url) - 5)), ".bin")) {
-          Log.error(F("Invalid firmware extension" CR));
-          return;
-        }
-#  if MQTT_HTTPS_FW_UPDATE_USE_PASSWORD > 0
-        const char* pwd = HttpsFwUpdateData["password"];
-        if (pwd) {
-          if (strcmp(pwd, ota_pass) != 0) {
-            Log.error(F("Invalid OTA password" CR));
-            return;
-          }
-        } else {
-          Log.error(F("No password sent" CR));
-          return;
-        }
-#  endif
-#  ifdef ESP32
-      } else if (strcmp(version, "latest") == 0) {
-        systemUrl = RELEASE_LINK + latestVersion + "/" + ENV_NAME + "-firmware.bin";
-        url = systemUrl.c_str();
-        Log.notice(F("Using system OTA url with latest version %s" CR), url);
-      } else if (strcmp(version, "dev") == 0) {
-        systemUrl = String(RELEASE_LINK_DEV) + ENV_NAME + "-firmware.bin";
-        url = systemUrl.c_str();
-        Log.notice(F("Using system OTA url with dev version %s" CR), url);
-      } else if (version[0] == 'v') {
-        systemUrl = String(RELEASE_LINK) + version + "/" + ENV_NAME + "-firmware.bin";
-        url = systemUrl.c_str();
-        Log.notice(F("Using system OTA url with defined version %s" CR), url);
-#  endif
-      } else {
-        Log.error(F("Invalid URL" CR));
-        return;
-      }
-#  ifdef ESP32
-      ProcessLock = true;
-      //esp_task_wdt_delete(NULL); // Stop task watchdog during update
-#    ifdef ZgatewayBT
-      stopProcessing();
-#    endif
-#  endif
-      Log.warning(F("Starting firmware update" CR));
-
-      SendReceiveIndicatorON();
-      ErrorIndicatorON();
-      StaticJsonDocument<JSON_MSG_BUFFER> jsondata;
-      jsondata["release_summary"] = "Update in progress ...";
-      jsondata["origin"] = subjectRLStoMQTT;
-      handleJsonEnqueue(jsondata);
-
-      const char* ota_cert = HttpsFwUpdateData["server_cert"];
-      if (!ota_cert && !strstr(url, "http:")) {
-        if (ota_server_cert.length() > 0) {
-          Log.notice(F("Using stored cert" CR));
-          ota_cert = ota_server_cert.c_str();
-        } else {
-          Log.notice(F("Using config cert" CR));
-          ota_cert = OTAserver_cert;
-        }
-      }
-
-      t_httpUpdate_return result = HTTP_UPDATE_FAILED;
-      if (strstr(url, "http:")) {
-        Log.notice(F("Http update" CR));
-        WiFiClient update_client;
-#  ifdef ESP32
-        httpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-        result = httpUpdate.update(update_client, url);
-#  elif ESP8266
-        ESPhttpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-        result = ESPhttpUpdate.update(update_client, url);
-#  endif
-
-      } else {
-        WiFiClientSecure update_client;
-        if (mqtt_secure) {
-          client.disconnect();
-          update_client = *(WiFiClientSecure*)eClient;
-        } else {
-          syncNTP();
-        }
-
-#  ifdef ESP32
-        update_client.setCACert(ota_cert);
-        update_client.setTimeout(12);
-        httpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-        httpUpdate.rebootOnUpdate(false);
-        result = httpUpdate.update(update_client, url);
-#  elif ESP8266
-        caCert.append(ota_cert);
-        update_client.setTrustAnchors(&caCert);
-        update_client.setTimeout(12000);
-        ESPhttpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-        ESPhttpUpdate.rebootOnUpdate(false);
-        result = ESPhttpUpdate.update(update_client, url);
-#  endif
-      }
-
-      switch (result) {
-        case HTTP_UPDATE_FAILED:
-#  ifdef ESP32
-          Log.error(F("HTTP_UPDATE_FAILED Error (%d): %s\n" CR), httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
-#  elif ESP8266
-          Log.error(F("HTTP_UPDATE_FAILED Error (%d): %s\n" CR), ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
-#  endif
-          break;
-
-        case HTTP_UPDATE_NO_UPDATES:
-          Log.notice(F("HTTP_UPDATE_NO_UPDATES" CR));
-          break;
-
-        case HTTP_UPDATE_OK:
-          Log.notice(F("HTTP_UPDATE_OK" CR));
-          jsondata["release_summary"] = "Update success !";
-          jsondata["installed_version"] = latestVersion;
-          jsondata["origin"] = subjectRLStoMQTT;
-          handleJsonEnqueue(jsondata);
-          ota_server_cert = ota_cert;
-#  ifndef ESPWifiManualSetup
-          saveConfig();
-#  endif
-          ESPRestart(6);
-          break;
-      }
-
-      SendReceiveIndicatorOFF();
-      ErrorIndicatorOFF();
-
-      ESPRestart(6);
-    }
-  }
-}
-#endif
-
-void MQTTtoSYS(char* topicOri, JsonObject& SYSdata) { // json object decoding
-  if (cmpToMainTopic(topicOri, subjectMQTTtoSYSset)) {
-    bool restartESP = false;
-    Log.trace(F("MQTTtoSYS json" CR));
-#if defined(ESP8266) || defined(ESP32)
-    if (SYSdata.containsKey("cmd")) {
-      const char* cmd = SYSdata["cmd"];
-      Log.notice(F("Command: %s" CR), cmd);
-      if (strstr(cmd, restartCmd) != NULL) { //restart
-        ESPRestart(5);
-      } else if (strstr(cmd, eraseCmd) != NULL) { //erase and restart
-#  ifndef ESPWifiManualSetup
-        setupwifi(true);
-#  endif
-      } else if (strstr(cmd, statusCmd) != NULL) { //erase and restart
-        stateMeasures();
-      }
-    }
-#  ifdef RGB_INDICATORS
-    if (SYSdata.containsKey("rgbb") && SYSdata["rgbb"].is<float>()) {
-      if (SYSdata["rgbb"] >= 0 && SYSdata["rgbb"] <= 255) {
-        SYSConfig.rgbbrightness = round2(SYSdata["rgbb"]);
-        leds.setBrightness(SYSConfig.rgbbrightness);
-        leds.show();
-#    ifdef ZactuatorONOFF
-        updatePowerIndicator();
-#    endif
-        Log.notice(F("RGB brightness: %d" CR), SYSConfig.rgbbrightness);
-        stateMeasures();
-      } else {
-        Log.error(F("RGB brightness value invalid - ignoring command" CR));
-      }
-    }
-#  endif
-#  ifdef ZmqttDiscovery
-    if (SYSdata.containsKey("ohdisc") && SYSdata["ohdisc"].is<bool>()) {
-      SYSConfig.ohdiscovery = SYSdata["ohdisc"];
-      Log.notice(F("OpenHAB discovery: %T" CR), SYSConfig.ohdiscovery);
-      stateMeasures();
-    }
-#  endif
-    if (SYSdata.containsKey("wifi_ssid") && SYSdata.containsKey("wifi_pass")) {
-#  ifdef ESP32
-      ProcessLock = true;
-#    ifdef ZgatewayBT
-      stopProcessing();
-#    endif
-#  endif
-      String prev_ssid = WiFi.SSID();
-      String prev_pass = WiFi.psk();
-      client.disconnect();
-      WiFi.disconnect(true);
-
-      Log.warning(F("Attempting connection to new AP %s" CR), (const char*)SYSdata["wifi_ssid"]);
-      WiFi.begin((const char*)SYSdata["wifi_ssid"], (const char*)SYSdata["wifi_pass"]);
-#  if (defined(ESP8266) || defined(ESP32)) && (defined(WifiGMode) || defined(WifiPower))
-      setESPWifiProtocolTxPower();
-#  endif
-      WiFi.waitForConnectResult(WiFi_TimeOut * 1000);
-
-      if (WiFi.status() != WL_CONNECTED) {
-        Log.error(F("Failed to connect to new AP; falling back" CR));
-        WiFi.disconnect(true);
-        WiFi.begin(prev_ssid.c_str(), prev_pass.c_str());
-#  if (defined(ESP8266) || defined(ESP32)) && (defined(WifiGMode) || defined(WifiPower))
-        setESPWifiProtocolTxPower();
-#  endif
-      }
-      restartESP = true;
-    }
-
-    bool disconnectClient = false; // Trigger client.disconnet if a user/password change doesn't
-
-    if (SYSdata.containsKey("mqtt_topic") || SYSdata.containsKey("gateway_name") || SYSdata.containsKey("gw_pass")) {
-      if (SYSdata.containsKey("mqtt_topic")) {
-        strncpy(mqtt_topic, SYSdata["mqtt_topic"], parameters_size);
-      }
-      if (SYSdata.containsKey("gateway_name")) {
-        strncpy(gateway_name, SYSdata["gateway_name"], parameters_size);
-      }
-      if (SYSdata.containsKey("gw_pass")) {
-        strncpy(ota_pass, SYSdata["gw_pass"], parameters_size);
-        restartESP = true;
-      }
-#  ifndef ESPWifiManualSetup
-      saveConfig();
-#  endif
-      disconnectClient = true; // trigger reconnect in loop using the new topic/name
-    }
-
-#  ifdef MQTTsetMQTT
-    if (SYSdata.containsKey("mqtt_user") && SYSdata.containsKey("mqtt_pass")) {
-      bool update_server = false;
-      bool secure_connect = SYSdata["mqtt_secure"].as<bool>();
-      void* prev_client = nullptr;
-      bool use_ss_cert = SYSdata.containsKey("mqtt_cert_index");
-      uint8_t cert_index = mqtt_ss_index;
-
-      if (SYSdata.containsKey("mqtt_server") && SYSdata.containsKey("mqtt_port")) {
-        if (!SYSdata.containsKey("mqtt_secure")) {
-          Log.error(F("mqtt_server provided without mqtt_secure defined - ignoring command" CR));
-          return;
-        }
-#    if MQTT_SECURE_SELF_SIGNED
-        if (use_ss_cert) {
-          cert_index = SYSdata["mqtt_cert_index"].as<uint8_t>();
-          if (cert_index >= sizeof(certs_array) / sizeof(ss_certs)) {
-            Log.error(F("mqtt_cert_index invalid - ignoring command" CR));
-            return;
-          }
-        }
-#    endif
-
-#    ifdef ESP32
-        ProcessLock = true;
-#      ifdef ZgatewayBT
-        stopProcessing();
-#      endif
-#    endif
-        disconnectClient = false;
-        client.disconnect();
-        update_server = true;
-        if (secure_connect != mqtt_secure) {
-          prev_client = eClient;
-          if (!mqtt_secure) {
-            eClient = new WiFiClientSecure;
-          } else {
-            Log.warning(F("Switching to unsecure MQTT broker" CR));
-            eClient = new WiFiClient;
-          }
-
-          client.setClient(*(Client*)eClient);
-        }
-
-        if (secure_connect) {
-          setupTLS(use_ss_cert, cert_index);
-        }
-
-        client.setServer(SYSdata["mqtt_server"].as<const char*>(), SYSdata["mqtt_port"].as<unsigned int>());
-      } else {
-#    ifdef ESP32
-        ProcessLock = true;
-#      ifdef ZgatewayBT
-        stopProcessing();
-#      endif
-#    endif
-        disconnectClient = false;
-        client.disconnect();
-      }
-
-      String prev_user = mqtt_user;
-      String prev_pass = mqtt_pass;
-      strcpy(mqtt_user, SYSdata["mqtt_user"]);
-      strcpy(mqtt_pass, SYSdata["mqtt_pass"]);
-
-      connectMQTT();
-
-      if (client.connected()) {
-        if (update_server) {
-          strcpy(mqtt_server, SYSdata["mqtt_server"]);
-          strcpy(mqtt_port, SYSdata["mqtt_port"]);
-          mqtt_ss_index = cert_index;
-          if (prev_client != nullptr) {
-            mqtt_secure = !mqtt_secure;
-            delete prev_client;
-          }
-        }
-#    ifndef ESPWifiManualSetup
-        saveConfig();
-#    endif
-      } else {
-        if (update_server) {
-          if (prev_client != nullptr) {
-            delete eClient;
-            eClient = prev_client;
-            client.setClient(*(Client*)eClient);
-          }
-          uint16_t port = strtol(mqtt_port, NULL, 10);
-          client.setServer(mqtt_server, port);
-        }
-        strcpy(mqtt_user, prev_user.c_str());
-        strcpy(mqtt_pass, prev_pass.c_str());
-        if (mqtt_secure) {
-          setupTLS(MQTT_SECURE_SELF_SIGNED, mqtt_ss_index);
-        }
-        connectMQTT();
-      }
-      restartESP = true;
-    }
-#  endif
-
-    if (disconnectClient) {
-      client.disconnect();
-    }
-#endif
-
-#ifdef ZmqttDiscovery
-    if (SYSdata.containsKey("disc")) {
-      if (SYSdata["disc"].is<bool>()) {
-        if (SYSdata["disc"] == true && SYSConfig.discovery == false)
-          lastDiscovery = millis();
-        SYSConfig.discovery = SYSdata["disc"];
-        stateMeasures();
-        if (SYSConfig.discovery)
-          pubMqttDiscovery();
-      } else {
-        Log.error(F("Discovery command not a boolean" CR));
-      }
-      Log.notice(F("Discovery state: %T" CR), SYSConfig.discovery);
-    }
-#  ifdef ESP32
-    if (SYSdata.containsKey("save") && SYSdata["save"].as<bool>()) {
-      StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-      JsonObject jo = jsonBuffer.to<JsonObject>();
-      jo["disc"] = SYSConfig.discovery;
-      jo["ohdisc"] = SYSConfig.ohdiscovery;
-#    ifdef RGB_INDICATORS
-      jo["rgbb"] = SYSConfig.rgbbrightness;
-#    endif
-      // Save config into NVS (non-volatile storage)
-      String conf = "";
-      serializeJson(jsonBuffer, conf);
-      preferences.begin(Gateway_Short_Name, false);
-      int result = preferences.putString("SYSConfig", conf);
-      preferences.end();
-      Log.notice(F("SYS Config_save: %s, result: %d" CR), conf.c_str(), result);
-    }
-#  endif
-#endif
-    if (restartESP) {
-      ESPRestart(7);
-    }
-  }
-}
-
-#if valueAsATopic && !defined(ZgatewayPilight)
-#  if defined(ESP32) || defined(ESP8266) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
-String toString(uint64_t input) {
-  String result = "";
-  uint8_t base = 10;
-
-  do {
-    char c = input % base;
-    input /= base;
-
-    if (c < 10)
-      c += '0';
-    else
-      c += 'A' - 10;
-    result = c + result;
-  } while (input);
-  return result;
-}
-
-#  else
-
-String toString(uint32_t input) {
-  String result = String(input);
-
-  return result;
-}
-#  endif
-#endif
diff --git a/main/mqttDiscovery.cpp b/main/mqttDiscovery.cpp
new file mode 100644
index 0000000..c2117dd
--- /dev/null
+++ b/main/mqttDiscovery.cpp
@@ -0,0 +1,1167 @@
+/*
+  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
+
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
+   Send and receiving command by MQTT
+
+   This is the Home Assistant MQTT Discovery addon.
+
+    Copyright: (c) Rafal Herok / Florian Robert
+
+    This file is part of OpenMQTTGateway.
+
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+
+#include "User_config.h"
+
+#ifdef ZmqttDiscovery
+#  include "TheengsCommon.h"
+
+#  ifdef ESP8266
+#    include <ESP8266WiFi.h>
+#  elif defined(ESP32)
+#    include <WiFi.h>
+
+#    include "esp_mac.h"
+#  endif
+#  ifdef ESP32_ETHERNET
+#    include <ETH.h>
+#  endif
+#  include "config_mqttDiscovery.h"
+
+extern bool ethConnected;
+extern JsonArray modules;
+
+// Using Home Assistant MQTT abbreviations to shorten names as per https://github.com/home-assistant/core/blob/dev/homeassistant/components/mqtt/abbreviations.py
+
+char discovery_prefix[parameters_size + 1] = discovery_Prefix;
+// From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L225
+// List of classes available in Home Assistant
+static const char* const availableHASSClasses[] = {
+    HASS_CLASS_BATTERY_CHARGING,
+    HASS_CLASS_BATTERY,
+    HASS_CLASS_CARBON_DIOXIDE,
+    HASS_CLASS_CARBON_MONOXIDE,
+    HASS_CLASS_CONNECTIVITY,
+    HASS_CLASS_CURRENT,
+    HASS_CLASS_DATA_SIZE,
+    HASS_CLASS_DISTANCE,
+    HASS_CLASS_DOOR,
+    HASS_CLASS_DURATION,
+    HASS_CLASS_ENERGY,
+    HASS_CLASS_ENUM,
+    HASS_CLASS_FREQUENCY,
+    HASS_CLASS_GAS,
+    HASS_CLASS_HUMIDITY,
+    HASS_CLASS_ILLUMINANCE,
+    HASS_CLASS_IRRADIANCE,
+    HASS_CLASS_LOCK,
+    HASS_CLASS_MOTION,
+    HASS_CLASS_MOVING,
+    HASS_CLASS_OCCUPANCY,
+    HASS_CLASS_PM1,
+    HASS_CLASS_PM10,
+    HASS_CLASS_PM25,
+    HASS_CLASS_POWER_FACTOR,
+    HASS_CLASS_POWER,
+    HASS_CLASS_PRECIPITATION_INTENSITY,
+    HASS_CLASS_PRECIPITATION,
+    HASS_CLASS_PRESSURE,
+    HASS_CLASS_PROBLEM,
+    HASS_CLASS_RESTART,
+    HASS_CLASS_SIGNAL_STRENGTH,
+    HASS_CLASS_SOUND_PRESSURE,
+    HASS_CLASS_TEMPERATURE,
+    HASS_CLASS_TIMESTAMP,
+    HASS_CLASS_VOLTAGE,
+    HASS_CLASS_WATER,
+    HASS_CLASS_WEIGHT,
+    HASS_CLASS_WIND_SPEED,
+    HASS_CLASS_WINDOW};
+
+// From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L379
+// List of units available in Home Assistant
+static const char* const availableHASSUnits[] = {
+    HASS_UNIT_AMP,
+    HASS_UNIT_BYTE,
+    HASS_UNIT_UV_INDEX,
+    HASS_UNIT_VOLT,
+    HASS_UNIT_WATT,
+    HASS_UNIT_BPM,
+    HASS_UNIT_BAR,
+    HASS_UNIT_CM,
+    HASS_UNIT_DB,
+    HASS_UNIT_DBM,
+    HASS_UNIT_FT,
+    HASS_UNIT_HOUR,
+    HASS_UNIT_HPA,
+    HASS_UNIT_HZ,
+    HASS_UNIT_KG,
+    HASS_UNIT_KW,
+    HASS_UNIT_KWH,
+    HASS_UNIT_KMH,
+    HASS_UNIT_LB,
+    HASS_UNIT_LX,
+    HASS_UNIT_MS,
+    HASS_UNIT_MS2,
+    HASS_UNIT_M3,
+    HASS_UNIT_MGM3,
+    HASS_UNIT_MIN,
+    HASS_UNIT_MM,
+    HASS_UNIT_MMH,
+    HASS_UNIT_MILLISECOND,
+    HASS_UNIT_MV,
+    HASS_UNIT_USCM,
+    HASS_UNIT_UGM3,
+    HASS_UNIT_OHM,
+    HASS_UNIT_PERCENT,
+    HASS_UNIT_PPM,
+    HASS_UNIT_DEGREE,
+    HASS_UNIT_CELSIUS,
+    HASS_UNIT_FAHRENHEIT,
+    HASS_UNIT_SECOND,
+    HASS_UNIT_WB2};
+
+String getMacAddress() {
+  uint8_t baseMac[6];
+  char baseMacChr[13] = {0};
+#  if defined(ESP8266)
+  WiFi.macAddress(baseMac);
+  sprintf(baseMacChr, "%02X%02X%02X%02X%02X%02X", baseMac[0], baseMac[1], baseMac[2], baseMac[3], baseMac[4], baseMac[5]);
+#  elif defined(ESP32)
+  esp_read_mac(baseMac, ESP_MAC_WIFI_STA);
+  sprintf(baseMacChr, "%02X%02X%02X%02X%02X%02X", baseMac[0], baseMac[1], baseMac[2], baseMac[3], baseMac[4], baseMac[5]);
+#  else
+  sprintf(baseMacChr, "%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+#  endif
+  return String(baseMacChr);
+}
+
+String getUniqueId(String name, String sufix) {
+  String uniqueId = (String)getMacAddress() + "-" + name + sufix;
+  return String(uniqueId);
+}
+
+/**
+ * Create discover messages from a list of attributes
+ * Full-featured version supporting all discovery parameters
+ *
+ * Array format:
+ * [0] = component type
+ * [1] = name  
+ * [2] = unique id suffix (for gateway) or name (for BLE)
+ * [3] = device class
+ * [4] = value template
+ * [5] = payload on
+ * [6] = payload off
+ * [7] = unit of measurement
+ * [8] = state class
+ * [9] = state_off (for switches)
+ * [10] = state_on (for switches)
+ * [11] = custom state topic (overrides default)
+ * [12] = custom command topic (overrides default)
+ */
+void createDiscoveryFromList(const char* mac,
+                             const char* sensorList[][13],
+                             int sensorCount,
+                             const char* device_name,
+                             const char* device_manufacturer,
+                             const char* device_model,
+                             bool gateway_entity,
+                             const char* state_topic,
+                             const char* availability_topic,
+                             const char* command_topic) {
+  for (int i = 0; i < sensorCount; i++) {
+    String unique_id;
+    if (gateway_entity) {
+      unique_id = getUniqueId(sensorList[i][2] && sensorList[i][2][0] ? sensorList[i][2] : sensorList[i][1], "");
+    } else if (mac) {
+      unique_id = String(mac) + "-" + sensorList[i][1];
+    } else {
+      unique_id = sensorList[i][1];
+    }
+
+    // Use custom state topic if provided, otherwise use default
+    String discovery_topic;
+    if (sensorList[i][11] && sensorList[i][11][0]) {
+      discovery_topic = String(sensorList[i][11]);
+    } else if (mac && !gateway_entity) {
+      discovery_topic = String(state_topic) + "/" + String(mac);
+    } else {
+      discovery_topic = String(state_topic);
+    }
+
+    // Use custom command topic if provided
+    const char* cmd_topic = (sensorList[i][12] && sensorList[i][12][0]) ? sensorList[i][12] : command_topic;
+
+    createDiscovery(sensorList[i][0],
+                    discovery_topic.c_str(), sensorList[i][1], unique_id.c_str(),
+                    availability_topic ? availability_topic : will_Topic,
+                    sensorList[i][3], sensorList[i][4],
+                    sensorList[i][5], sensorList[i][6], sensorList[i][7],
+                    0, Gateway_AnnouncementMsg, will_Message, gateway_entity,
+                    cmd_topic ? cmd_topic : "",
+                    device_name ? device_name : "",
+                    device_manufacturer ? device_manufacturer : "",
+                    device_model ? device_model : "",
+                    mac ? mac : "", false,
+                    sensorList[i][8] ? sensorList[i][8] : stateClassNone,
+                    sensorList[i][9], sensorList[i][10], // state_off, state_on
+                    nullptr, nullptr // enum_options, command_template
+    );
+  }
+}
+
+#  if defined(ZgatewayBT) || defined(SecondaryModule)
+#    include "config_BT.h"
+// Backward compatibility overload for BLE devices using 9-column format
+void createDiscoveryFromList(const char* mac,
+                             const char* sensorList[][9],
+                             int sensorCount,
+                             const char* device_name,
+                             const char* device_manufacturer,
+                             const char* device_model) {
+  // Create temporary extended array
+  const char* extendedList[sensorCount][13];
+  for (int i = 0; i < sensorCount; i++) {
+    for (int j = 0; j < 9; j++) {
+      extendedList[i][j] = sensorList[i][j];
+    }
+    for (int j = 9; j < 13; j++) {
+      extendedList[i][j] = nullptr;
+    }
+  }
+
+  createDiscoveryFromList(mac, extendedList, sensorCount,
+                          device_name, device_manufacturer, device_model,
+                          false, subjectBTtoMQTT, will_Topic, nullptr);
+}
+#  endif
+
+#  ifdef ZgatewayRF
+/**
+ * @brief Announce that the Gateway have the ability to raise Trigger.
+ * This function provide the configuration of the MQTT Device trigger ( @see https://www.home-assistant.io/integrations/device_trigger.mqtt/ ).
+ * All messages published by this function will be interpreted as configuration messages of Gateway Triggers.
+ * Instead, all messages published on the "triggerTopic" will be interpreted as Gateway trigger.
+ *
+ * @param triggerTopic          Mandatory - The MQTT topic subscribed to receive trigger events.
+ * @param type                  The type of the trigger, e.g. button_short_press. Entries supported by the HA Frontend: button_short_press, button_short_release, button_long_press, button_long_release, button_double_press, button_triple_press, button_quadruple_press, button_quintuple_press. If set to an unsupported value, will render as subtype type, e.g. button_1 spammed with type set to spammed and subtype set to button_1
+ * @param subtype               The subtype of the trigger, e.g. button_1. Entries supported by the HA frontend: turn_on, turn_off, button_1, button_2, button_3, button_4, button_5, button_6. If set to an unsupported value, will render as subtype type, e.g. left_button pressed with type set to button_short_press and subtype set to left_button
+ * @param object_id             The object_id of the trigger.
+ * @param value_template        The template to render the value of the trigger. The template can use the variables trigger.id, trigger.type, trigger.subtype, trigger.payload, trigger.payload_json, trigger.topic, trigger.timestamp, trigger.value, trigger.value_json. The template can be a string or a JSON object. If the template is a JSON object, it must be a valid JSON object. If the template is a string, it will be rendered as a string. If the template is a JSON object, it will be rendered as a JSON object.
+ */
+void announceGatewayTrigger(const char* triggerTopic,
+                            const char* type,
+                            const char* subtype,
+                            const char* object_id,
+                            const char* value_template) {
+  //Create The Json
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  JsonObject sensor = jsonBuffer.to<JsonObject>();
+
+  /**
+   * The type of automation, must be 'trigger'.
+   * @see https://www.home-assistant.io/integrations/device_trigger.mqtt/#automation_type
+   */
+  sensor["atype"] = "trigger"; // automation_type
+
+  /**
+   * Must be device_automation. Only allowed and required in MQTT auto discovery device messages.
+   * @see https://www.home-assistant.io/integrations/device_trigger.mqtt/#platform
+   * @see https://www.home-assistant.io/integrations/mqtt/#device-discovery-payload
+   */
+  sensor["p"] = "device_automation"; // platform
+
+  // The MQTT topic subscribed to receive trigger events.
+  if (triggerTopic && triggerTopic[0]) {
+    char state_topic[mqtt_topic_max_size];
+
+    strcpy(state_topic, mqtt_topic);
+    strcat(state_topic, gateway_name);
+    strcat(state_topic, triggerTopic);
+
+    /**
+     * "info_topic" is not a standard field, for the message is required the filed "topic", but this filed is reserved and it is used to know where to publish the topic.
+     * If we want to send on the message the topic information is usefull to use this "info_topic" that will be not delete by the send function but converted to "topic"
+     */
+    sensor["info_topic"] = state_topic;
+  } else {
+    THEENGS_LOG_ERROR(F("[RF] Error: topic is mandatory for device trigger Discovery" CR));
+    return;
+  }
+
+  /**
+   * The type of the trigger, e.g. button_short_press.
+   * Entries supported by the HA frontend: button_short_press, button_short_release, button_long_press, button_long_release, button_double_press, button_triple_press, button_quadruple_press, button_quintuple_press.
+   * If set to an unsupported value, will render as subtype type, e.g. button_1 spammed with type set to spammed and subtype set to button_1
+   */
+  if (type && type[0] != 0) {
+    sensor["type"] = type;
+  } else {
+    sensor["type"] = "button_short_press";
+  }
+
+  /**
+   * The subtype of the trigger, e.g. turn_on.
+   * Entries supported by the frontend: turn_on, turn_off, button_1, button_2, button_3, button_4, button_5, button_6.
+   * If set to an unsupported value, will render as subtype type, e.g. left_button pressed with type set to button_short_press and subtype set to left_button
+   */
+  if (subtype && subtype[0] != 0) {
+    sensor["stype"] = subtype; // subtype
+  } else {
+    sensor["stype"] = "turn_on";
+  }
+
+  // ------------------   START DEVICE DECLARATION  --------------------------------------------------
+  // TODO: This section, like the almost identical one in createDiscovery, should be placed in a
+  //       separate function and managed specifically to avoid errors in representing the device
+  //       in the HASS world.
+  // -------------------------------------------------------------------------------------------------
+
+  // Information about the device: this device trigger is a part of to tie it into the HA device registry.
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonDeviceBuffer;
+  JsonObject device = jsonDeviceBuffer.to<JsonObject>();
+
+  // A link to the webpage that can manage the configuration of this device.
+  if (ethConnected) {
+#    ifdef ESP32_ETHERNET
+    device["cu"] = String("http://") + String(ETH.localIP().toString()) + String("/"); // configuration_url
+#    endif
+  } else {
+    device["cu"] = String("http://") + String(WiFi.localIP().toString()) + String("/"); // configuration_url
+  }
+
+  /*
+  * A list of connections of the device to the outside world as a list of tuples [connection_type, connection_identifier].
+  * For example the MAC address of a network interface: "connections": [["mac", "02:5b:26:a8:dc:12"]].
+  */
+  JsonArray connections = device.createNestedArray("cns"); // connections
+  JsonArray connection_mac = connections.createNestedArray();
+  connection_mac.add("mac");
+  connection_mac.add(getMacAddress());
+
+  // A list of IDs that uniquely identify the device. For example a serial number.
+  String unique_id = String(getMacAddress());
+  JsonArray identifiers = device.createNestedArray("ids"); // identifiers
+  identifiers.add(unique_id);
+
+  // The manufacturer of the device.
+  device["mf"] = GATEWAY_MANUFACTURER;
+
+  // The model of the device.
+#    ifndef GATEWAY_MODEL
+  String model = "";
+  serializeJson(modules, model);
+  device["mdl"] = model;
+#    else
+  device["mdl"] = GATEWAY_MODEL;
+#    endif
+
+  // The name of the device.
+  device["name"] = String(gateway_name);
+  device["sw"] = OMG_VERSION;
+  // ------------------   END DEVICE DECLARATION  ------------------ //
+
+  sensor["dev"] = device; //device representing the board
+
+  if (value_template && value_template[0]) {
+    sensor["val_tpl"] = String(value_template);
+  }
+
+  /* Publish on the topic
+     The discovery topic needs to be: <discovery_prefix>/device_automation/[<node_id>/]<object_id>/config.
+
+     Note that only one trigger may be defined per unique discovery topic.
+     Also note that the combination of type and subtype should be unique for a device.
+
+   */
+
+  String topic_to_publish = String(discovery_prefix) + "/device_automation/" + String(unique_id) + "/" + object_id + "/config";
+  THEENGS_LOG_TRACE(F("Announce Gatewy Trigger  %s" CR), topic_to_publish.c_str());
+  sensor["topic"] = topic_to_publish;
+  sensor["retain"] = true;
+  enqueueJsonObject(sensor);
+}
+#  endif // ZgatewayRF
+
+/*
+  * Remove a substring p from a given string s
+*/
+std::string remove_substring(std::string s, const std::string& p) {
+  std::string::size_type n = p.length();
+
+  for (std::string::size_type i = s.find(p);
+       i != std::string::npos;
+       i = s.find(p))
+    s.erase(i, n);
+
+  return s;
+}
+
+/**
+ * @brief Generate message and publish it on an MQTT discovery explorer. For HA @see https://www.home-assistant.io/docs/mqtt/discovery/
+ *
+ * @param sensor_type the Type
+ * @param st_topic set state topic,
+ * @param s_name set name,
+ * @param unique_id set uniqueId
+ * @param availability_topic set availability_topic,
+ * @param device_class set device_class,
+ * @param value_template set value_template,
+ * @param payload_on set payload_on,
+ * @param payload_off set payload_off,
+ * @param unit_of_meas set unit_of_meas,
+ * @param off_delay set off_delay
+ * @param payload_available set payload_available,
+ * @param payload_not_available set payload_not_available
+ * @param gateway_entity set is a gateway entity,
+ * @param cmd_topic set command topic
+ * @param device_name set device name,
+ * @param device_manufacturer set device manufacturer,
+ * @param device_model set device model,
+ * @param device_id set device(BLE)/entity(RTL_433) identification,
+ * @param retainCmd set retain
+ * @param state_class set state class
+ * @param state_off state off value
+ * @param state_on state on value
+ * @param enum_options options
+ * @param command_template command template
+ * @param diagnostic_entity true if entity_category is diagnostic
+ *
+ * */
+void createDiscovery(const char* sensor_type,
+                     const char* st_topic, const char* s_name, const char* unique_id,
+                     const char* availability_topic, const char* device_class, const char* value_template,
+                     const char* payload_on, const char* payload_off, const char* unit_of_meas,
+                     int off_delay,
+                     const char* payload_available, const char* payload_not_available, bool gateway_entity, const char* cmd_topic,
+                     const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_id, bool retainCmd,
+                     const char* state_class, const char* state_off, const char* state_on, const char* enum_options,
+                     const char* command_template, bool diagnostic_entity) {
+  // Heap-allocate the two JsonDocuments: createDiscovery sits at the bottom of
+  // a deep call chain (loop → launchBTDiscovery → <device>Discovery →
+  // createDiscoveryFromList(9-col, VLA) → createDiscoveryFromList(13-col) →
+  // here). Keeping 2×1024 B on the stack burned loopTask's stack headroom
+  // down to ~100 B free under full perf load. Heap-backed docs drop that
+  // 2 KB off the peak.
+  DynamicJsonDocument jsonBuffer(JSON_MSG_BUFFER);
+  JsonObject sensor = jsonBuffer.to<JsonObject>();
+
+  // If a component cannot render it's state (f.i. KAKU relays) no state topic
+  // should be added. Without a state topic HA will use optimistic mode for the
+  // component by default. The Home Assistant UI for optimistic switches
+  // (separate on and off icons) allows for multiple
+  // subsequent on commands. This is required for dimming on KAKU relays like
+  // the ACM-300.
+  if (st_topic && st_topic[0]) {
+    char state_topic[mqtt_topic_max_size];
+    // If not an entity belonging to the gateway we put wild card for the location and gateway name
+    // allowing to have the entity detected by several gateways and a consistent discovery topic among the gateways
+    if (gateway_entity) {
+      strcpy(state_topic, mqtt_topic);
+      strcat(state_topic, gateway_name);
+    } else {
+      strcpy(state_topic, "+/+");
+    }
+    strcat(state_topic, st_topic);
+    if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "blind") == 0) {
+      sensor["tilt_status_t"] = state_topic; // tilt_status_topic for blind
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "curtain") == 0) {
+      sensor["pos_t"] = state_topic; // position_topic for curtain
+    } else {
+      sensor["stat_t"] = state_topic;
+    }
+  }
+
+  if (availability_topic && availability_topic[0] && gateway_entity) {
+    char avty_topic[mqtt_topic_max_size];
+    strcpy(avty_topic, mqtt_topic);
+    strcat(avty_topic, gateway_name);
+    strcat(avty_topic, availability_topic);
+    sensor["avty_t"] = avty_topic;
+  }
+
+  if (device_class && device_class[0]) {
+    // We check if the class belongs to HAAS classes list
+    int num_classes = sizeof(availableHASSClasses) / sizeof(availableHASSClasses[0]);
+    for (int i = 0; i < num_classes; i++) { // see class list and size into config_mqttDiscovery.h
+      if (strcmp(availableHASSClasses[i], device_class) == 0) {
+        sensor["dev_cla"] = device_class; //device_class
+      }
+    }
+  }
+
+  // HA rejects a discovery payload that carries `options` (enum sensor) together
+  // with `unit_of_measurement` or `state_class` - they are mutually exclusive.
+  // Skip unit_of_measurement (and state_class below) when this is an enum sensor.
+  if (enum_options == nullptr && unit_of_meas && unit_of_meas[0]) {
+    // We check if the class belongs to HAAS units list
+    int num_units = sizeof(availableHASSUnits) / sizeof(availableHASSUnits[0]);
+    for (int i = 0; i < num_units; i++) { // see units list and size into config_mqttDiscovery.h
+      if (strcmp(availableHASSUnits[i], unit_of_meas) == 0) {
+        sensor["unit_of_meas"] = unit_of_meas; //unit_of_measurement*/
+      }
+    }
+  }
+  sensor["name"] = s_name; //name
+  sensor["uniq_id"] = unique_id; //unique_id
+  if (retainCmd)
+    sensor["retain"] = retainCmd; // Retain command
+  if (value_template && value_template[0]) {
+    if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "blind") == 0) {
+      sensor["tilt_status_tpl"] = value_template; // tilt_status_template for blind
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "curtain") == 0) {
+      sensor["pos_tpl"] = value_template; // position_template for curtain
+    } else {
+      sensor["val_tpl"] = value_template; //HA Auto discovery
+    }
+  }
+  if (payload_on && payload_on[0]) {
+    if (strcmp(sensor_type, HASS_TYPE_BUTTON) == 0) {
+      sensor["pl_prs"] = payload_on; // payload_press for a button press
+    } else if (strcmp(sensor_type, HASS_TYPE_NUMBER) == 0) {
+      sensor["cmd_tpl"] = payload_on; // payload_on for a switch
+    } else if (strcmp(sensor_type, HASS_TYPE_UPDATE) == 0) {
+      sensor["pl_inst"] = payload_on; // payload_install for update
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "blind") == 0) {
+      int value = std::stoi(payload_on);
+      sensor["tilt_opnd_val"] = value; // tilt_open_value for blind
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "curtain") == 0) {
+      int value = std::stoi(payload_on);
+      sensor["pos_open"] = value; // open value for curtain
+    } else {
+      if (strcmp(payload_on, "True") == 0 || strcmp(payload_on, "true") == 0) {
+        sensor["pl_on"] = true;
+      } else {
+        sensor["pl_on"] = payload_on; // payload_on for the rest
+      }
+    }
+  }
+  if (payload_off && payload_off[0]) {
+    if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "blind") == 0) {
+      sensor["pl_cls"] = payload_off; // payload_close for cover
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "curtain") == 0) {
+      int value = std::stoi(payload_off);
+      sensor["pos_clsd"] = value; // closed value for curtain
+    } else {
+      if (strcmp(payload_off, "False") == 0 || strcmp(payload_off, "false") == 0) {
+        sensor["pl_off"] = false;
+      } else {
+        sensor["pl_off"] = payload_off; //payload_off for the rest
+      }
+    }
+  }
+  if (command_template && command_template[0]) {
+    if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "blind") == 0) {
+      sensor["tilt_cmd_tpl"] = command_template; //command_template
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "curtain") == 0) {
+      sensor["set_pos_tpl"] = command_template; //command_template
+    } else {
+      sensor["cmd_tpl"] = command_template; //command_template
+    }
+  }
+  if (strcmp(sensor_type, "device_tracker") == 0)
+    sensor["src_type"] = "bluetooth_le"; // source_type - payload_install for update
+  if (off_delay != 0)
+    sensor["off_dly"] = off_delay; // off_delay
+  if (payload_available[0])
+    sensor["pl_avail"] = payload_available; // payload_on
+  if (payload_not_available[0])
+    sensor["pl_not_avail"] = payload_not_available; //payload_off
+  if (enum_options == nullptr && state_class && state_class[0])
+    sensor["stat_cla"] = state_class; //add the state class on the sensors ( https://developers.home-assistant.io/docs/core/entity/sensor/#available-state-classes ) - omitted for enum sensors (mutually exclusive with `options`)
+  if (state_on != nullptr)
+    if (strcmp(state_on, "true") == 0) {
+      sensor["stat_on"] = true;
+    } else {
+      sensor["stat_on"] = state_on;
+    }
+  if (state_off != nullptr)
+    if (strcmp(state_off, "false") == 0) {
+      sensor["stat_off"] = false;
+    } else {
+      sensor["stat_off"] = state_off;
+    }
+  if (cmd_topic[0]) {
+    char command_topic[mqtt_topic_max_size];
+    strcpy(command_topic, mqtt_topic);
+    strcat(command_topic, gateway_name);
+    strcat(command_topic, cmd_topic);
+    if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "blind") == 0) {
+      sensor["tilt_cmd_t"] = command_topic; // tilt_command_topic for cover
+    } else if (strcmp(sensor_type, HASS_TYPE_COVER) == 0 && strcmp(state_class, "curtain") == 0) {
+      sensor["set_pos_t"] = command_topic; // position_command_topic for curtain
+    } else {
+      sensor["cmd_t"] = command_topic; //command_topic
+    }
+  }
+
+  if (diagnostic_entity) { // entity_category
+    sensor["ent_cat"] = "diagnostic";
+  }
+
+  if (enum_options != nullptr) {
+    sensor["ops"] = enum_options; // options
+  }
+
+  DynamicJsonDocument jsonDeviceBuffer(JSON_MSG_BUFFER);
+  JsonObject device = jsonDeviceBuffer.to<JsonObject>();
+  JsonArray identifiers = device.createNestedArray("ids");
+
+  if (gateway_entity) {
+    //device representing the board
+    device["name"] = String(gateway_name);
+#  ifndef GATEWAY_MODEL
+    String model = "";
+    serializeJson(modules, model);
+    device["mdl"] = model;
+#  else
+    device["mdl"] = GATEWAY_MODEL;
+#  endif
+    device["mf"] = GATEWAY_MANUFACTURER;
+    if (ethConnected) {
+#  ifdef ESP32_ETHERNET
+      device["cu"] = String("http://") + String(ETH.localIP().toString()) + String("/"); //configuration_url
+#  endif
+    } else {
+      device["cu"] = String("http://") + String(WiFi.localIP().toString()) + String("/"); //configuration_url
+    }
+
+    device["sw"] = OMG_VERSION;
+    identifiers.add(String(getMacAddress()));
+  } else {
+    //The Connections
+    if (device_id[0]) {
+      JsonArray connections = device.createNestedArray("cns");
+      JsonArray connection_mac = connections.createNestedArray();
+      connection_mac.add("mac");
+      connection_mac.add(device_id);
+      //Device representing the actual sensor/switch device
+      //The Device ID
+      identifiers.add(device_id);
+    }
+
+    if (device_manufacturer[0]) {
+      device["mf"] = device_manufacturer;
+    }
+
+    if (device_model[0]) {
+      device["mdl"] = device_model;
+    }
+
+    // generate unique device name by adding the second half of the device_id only if device_name and device_id are different and we don't want to use the BLE name
+    if (device_name[0]) {
+      if (strcmp(device_id, device_name) != 0 && device_id[0] && !ForceDeviceName) {
+        device["name"] = device_name + String("-") + String(device_id + 6);
+      } else {
+        device["name"] = device_name;
+      }
+    }
+
+    device["via_device"] = String(getMacAddress()); //mac address of the gateway so that the devices link to the gateway
+  }
+
+  sensor["dev"] = device; // device
+
+  String topic = String(discovery_prefix) + "/" + String(sensor_type) + "/" + String(unique_id) + "/config";
+  THEENGS_LOG_TRACE(F("Announce Device %s on  %s" CR), String(sensor_type).c_str(), topic.c_str());
+  sensor["topic"] = topic;
+  sensor["retain"] = true;
+  enqueueJsonObject(sensor);
+}
+
+void eraseTopic(const char* sensor_type, const char* unique_id) {
+  if (sensor_type == NULL || unique_id == NULL) {
+    return;
+  }
+  String topic = String(discovery_prefix) + "/" + String(sensor_type) + "/" + String(unique_id) + "/config";
+  THEENGS_LOG_TRACE(F("Erase entity discovery %s on  %s" CR), String(sensor_type).c_str(), topic.c_str());
+  pubMQTT((char*)topic.c_str(), "", true);
+}
+
+#  if defined(ZgatewayBT) || defined(SecondaryModule)
+void btPresenceParametersDiscovery() {
+  createDiscovery(HASS_TYPE_NUMBER, //set Type
+                  subjectBTtoMQTT, "BT: Presence/Tracker timeout", (char*)getUniqueId("presenceawaytimer", "").c_str(), //set state_topic,name,uniqueId
+                  will_Topic, "", "{{ value_json.presenceawaytimer/60000 }}", //set availability_topic,device_class,value_template,
+                  "{\"presenceawaytimer\":{{value*60000}},\"save\":true}", "", HASS_UNIT_MIN, //set,payload_on,payload_off,unit_of_meas,
+                  0, //set  off_delay
+                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoBTset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
+                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain,
+                  stateClassNone //State Class
+  );
+}
+void btScanParametersDiscovery() {
+  const char* btScanParams[][13] = {
+      {HASS_TYPE_NUMBER, "BT: Interval between scans", "interval", "", "{{ value_json.interval/1000 }}", "{\"interval\":{{value*1000}},\"save\":true}", "", HASS_UNIT_SECOND, stateClassNone, nullptr, nullptr, nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_NUMBER, "BT: Interval between active scans", "intervalacts", "", "{{ value_json.intervalacts/1000 }}", "{\"intervalacts\":{{value*1000}},\"save\":true}", "", HASS_UNIT_SECOND, stateClassNone, nullptr, nullptr, nullptr, subjectMQTTtoBTset},
+  };
+
+  createDiscoveryFromList(nullptr, btScanParams, 2, nullptr, nullptr, nullptr,
+                          true, subjectBTtoMQTT, will_Topic, nullptr);
+}
+#  endif
+
+void pubMqttDiscovery() {
+  THEENGS_LOG_TRACE(F("omgStatusDiscovery" CR));
+
+  // System sensors and controls - using extended 13-column format with macros
+  const char* systemEntities[][13] = {
+      // Sensors
+      {HASS_TYPE_BINARY_SENSOR, "SYS: Connectivity", "connectivity", HASS_CLASS_CONNECTIVITY, "", Gateway_AnnouncementMsg, will_Message, "", stateClassNone, nullptr, nullptr, will_Topic, nullptr},
+      {HASS_TYPE_SENSOR, "SYS: Uptime", "uptime", HASS_CLASS_DURATION, "{{ value_json.uptime }}", "", "", HASS_UNIT_SECOND, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "SYS: Free memory", "freemem", HASS_CLASS_DATA_SIZE, "{{ value_json.freemem }}", "", "", HASS_UNIT_BYTE, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "SYS: IP", "ip", "", "{{ value_json.ip }}", "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr},
+#  ifndef ESP32_ETHERNET
+      {HASS_TYPE_SENSOR, "SYS: RSSI", "rssi", HASS_CLASS_SIGNAL_STRENGTH, "{{ value_json.rssi }}", "", "", HASS_UNIT_DB, stateClassNone, nullptr, nullptr, nullptr, nullptr},
+#  endif
+      // Switch with state_on/state_off
+      {HASS_TYPE_SWITCH, "SYS: Auto discovery", "disc", "", "{{ value_json.disc }}", "{\"disc\":true,\"save\":true}", "{\"disc\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoSYSset},
+      // Buttons
+      {HASS_TYPE_BUTTON, "SYS: Restart gateway", "restart", HASS_CLASS_RESTART, "", "{\"cmd\":\"restart\"}", "", "", stateClassNone, nullptr, nullptr, will_Topic, subjectMQTTtoSYSset},
+      {HASS_TYPE_BUTTON, "SYS: Erase credentials", "erase", "", "", "{\"cmd\":\"erase\"}", "", "", stateClassNone, nullptr, nullptr, will_Topic, subjectMQTTtoSYSset},
+  };
+
+  int entityCount = sizeof(systemEntities) / sizeof(systemEntities[0]);
+  createDiscoveryFromList(nullptr, systemEntities, entityCount, nullptr, nullptr, nullptr,
+                          true, subjectSYStoMQTT, will_Topic, nullptr);
+
+#  ifdef SecondaryModule
+  // Secondary module system sensors - dynamic string handling required
+  String secondaryPrefix = String(SecondaryModule);
+  String uptimeName = "SYS: Uptime " + secondaryPrefix;
+  String uptimeId = "uptime-" + secondaryPrefix;
+  String freememName = "SYS: Free memory " + secondaryPrefix;
+  String freememId = "freemem-" + secondaryPrefix;
+  String restartName = "SYS: Restart " + secondaryPrefix;
+  String restartId = "restart-" + secondaryPrefix;
+
+  const char* secondarySensors[][13] = {
+      {HASS_TYPE_SENSOR, uptimeName.c_str(), uptimeId.c_str(), HASS_CLASS_DURATION, "{{ value_json.uptime }}", "", "", HASS_UNIT_SECOND, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, freememName.c_str(), freememId.c_str(), HASS_CLASS_DATA_SIZE, "{{ value_json.freemem }}", "", "", HASS_UNIT_BYTE, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_BUTTON, restartName.c_str(), restartId.c_str(), HASS_CLASS_RESTART, "", "{\"cmd\":\"restart\"}", "", "", stateClassNone, nullptr, nullptr, will_Topic, subjectMQTTtoSYSsetSecondaryModule},
+  };
+
+  createDiscoveryFromList(nullptr, secondarySensors, 3, nullptr, nullptr, nullptr,
+                          true, subjectSYStoMQTTSecondaryModule, will_Topic, nullptr);
+#  endif
+
+#  ifdef LED_ADDRESSABLE
+  createDiscovery(HASS_TYPE_NUMBER, //set Type
+                  subjectSYStoMQTT, "SYS: LED Brightness", (char*)getUniqueId("rgbb", "").c_str(), //set state_topic,name,uniqueId
+                  will_Topic, "", "{{ (value_json.rgbb/2.55) | round(0) }}", //set availability_topic,device_class,value_template,
+                  "{\"rgbb\":{{ (value*2.55) | round(0) }},\"save\":true}", "", "", //set,payload_on,payload_off,unit_of_meas,
+                  0, //set  off_delay
+                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_available,payload_not available   ,is a gateway entity, command topic
+                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain,
+                  stateClassNone //State Class
+  );
+#  endif
+
+#  ifdef ZdisplaySSD1306
+#    include "config_SSD1306.h"
+  const char* ssd1306Entities[][13] = {
+      {HASS_TYPE_SWITCH, "SSD1306: Control", "onstate", "", "{{ value_json.onstate }}", "{\"onstate\":true,\"save\":true}", "{\"onstate\":false,\"save\":true}", "", stateClassNone, "false", "true", subjectSSD1306toMQTT, subjectMQTTtoSSD1306set},
+      {HASS_TYPE_SWITCH, "SSD1306: Display metric", "displayMetric", "", "{{ value_json.displayMetric }}", "{\"displayMetric\":true,\"save\":true}", "{\"displayMetric\":false,\"save\":true}", "", stateClassNone, "false", "true", subjectWebUItoMQTT, subjectMQTTtoWebUIset},
+      {HASS_TYPE_NUMBER, "SSD1306: Brightness", "brightness", "", "{{ value_json.brightness }}", "{\"brightness\":{{value}},\"save\":true}", "", "", stateClassNone, nullptr, nullptr, subjectSSD1306toMQTT, subjectMQTTtoSSD1306set},
+  };
+
+  createDiscoveryFromList(nullptr, ssd1306Entities, 3, nullptr, nullptr, nullptr,
+                          true, subjectSSD1306toMQTT, will_Topic, nullptr);
+#  endif
+
+#  if defined(ESP32) && !defined(NO_INT_TEMP_READING)
+  const char* esp32Sensors[][13] = {
+      {HASS_TYPE_SENSOR, "SYS: Internal temperature", "tempc", HASS_CLASS_TEMPERATURE, "{{ value_json.tempc  | round(1)}}", "", "", HASS_UNIT_CELSIUS, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+#    if defined(ZboardM5STICKC) || defined(ZboardM5STICKCP) || defined(ZboardM5TOUGH)
+      // Portable M5Unified battery telemetry. The AXP192-only Vin sensors were
+      // dropped in the M5Unified migration (no portable equivalent).
+      {HASS_TYPE_SENSOR, "SYS: Bat voltage", "m5batvoltage", HASS_CLASS_VOLTAGE, "{{ value_json.m5batvoltage }}", "", "", HASS_UNIT_VOLT, stateClassNone, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "SYS: Bat current", "m5batcurrent", HASS_CLASS_CURRENT, "{{ value_json.m5batcurrent }}", "", "", HASS_UNIT_AMP, stateClassNone, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "SYS: Batt level", "m5battlevel", HASS_CLASS_BATTERY, "{{ value_json.m5battlevel }}", "", "", HASS_UNIT_PERCENT, stateClassNone, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_BINARY_SENSOR, "SYS: Is Charging", "m5ischarging", "", "{{ value_json.m5ischarging }}", "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr},
+#    endif
+#    ifdef ZboardM5STACK
+      {HASS_TYPE_SENSOR, "SYS: Batt level", "m5battlevel", HASS_CLASS_BATTERY, "{{ value_json.m5battlevel }}", "", "", HASS_UNIT_PERCENT, stateClassNone, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_BINARY_SENSOR, "SYS: Is Charging", "m5ischarging", "", "{{ value_json.m5ischarging }}", "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_BINARY_SENSOR, "SYS: Is Charge Full", "m5ischargefull", "", "{{ value_json.m5ischargefull }}", "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr},
+#    endif
+  };
+
+  int esp32SensorCount = sizeof(esp32Sensors) / sizeof(esp32Sensors[0]);
+  createDiscoveryFromList(nullptr, esp32Sensors, esp32SensorCount, nullptr, nullptr, nullptr,
+                          true, subjectSYStoMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef MQTT_HTTPS_FW_UPDATE
+  createDiscovery(HASS_TYPE_UPDATE, //set Type
+                  subjectRLStoMQTT, "SYS: Firmware Update", (char*)getUniqueId(HASS_TYPE_UPDATE, "").c_str(), //set state_topic,name,uniqueId
+                  will_Topic, "firmware", "", //set availability_topic,device_class,value_template,
+                  LATEST_OR_DEV, "", "", //set,payload_on,payload_off,unit_of_meas,
+                  0, //set  off_delay
+                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSupdate, //set,payload_available,payload_not available   ,is a gateway entity, command topic
+                  "", "", "", "", false, // device name, device manufacturer, device model, device ID, retain
+                  stateClassNone //State Class
+  );
+#  endif
+
+#  ifdef ZsensorBME280
+#    include "config_BME280.h"
+  const char* BMEsensor[][13] = {
+      {HASS_TYPE_SENSOR, "BME: Temp", "bme-temp", HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "BME: Pressure", "bme-pressure", HASS_CLASS_PRESSURE, jsonPa, "", "", HASS_UNIT_HPA, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "BME: Humidity", "bme-humidity", HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "BME: Altitude", "bme-altim", "", jsonAltim, "", "", HASS_UNIT_METER, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "BME: Altitude (ft)", "bme-altift", "", jsonAltif, "", "", HASS_UNIT_FT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("bme280Discovery" CR));
+  createDiscoveryFromList(nullptr, BMEsensor, 5, nullptr, nullptr, nullptr,
+                          true, BMETOPIC, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorHTU21
+#    include "config_HTU21.h"
+  const char* HTUsensor[][13] = {
+      {HASS_TYPE_SENSOR, "HTU: Temperature", "htu-temp", HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "HTU: Humidity", "htu-hum", HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("htu21Discovery" CR));
+  createDiscoveryFromList(nullptr, HTUsensor, 2, nullptr, nullptr, nullptr,
+                          true, HTUTOPIC, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorLM75
+  THEENGS_LOG_TRACE(F("LM75Discovery" CR));
+  const char* LM75sensor[][13] = {
+      {HASS_TYPE_SENSOR, "LM75: Temperature", "lm75-temp", HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, LM75sensor, 1, nullptr, nullptr, nullptr,
+                          true, LM75TOPIC, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorAHTx0
+#    include "config_AHTx0.h"
+  const char* AHTsensor[][13] = {
+      {HASS_TYPE_SENSOR, "AHT: Temperature", "aht-temp", HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "AHT: Humidity", "aht-hum", HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("AHTx0Discovery" CR));
+  createDiscoveryFromList(nullptr, AHTsensor, 2, nullptr, nullptr, nullptr,
+                          true, AHTTOPIC, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorDHT
+#    include "config_DHT.h"
+  const char* DHTsensor[][13] = {
+      {HASS_TYPE_SENSOR, "DHT: Temperature", "dht-temp", HASS_CLASS_TEMPERATURE, jsonTempc, "", "", HASS_UNIT_CELSIUS, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "DHT: Humidity", "dht-hum", HASS_CLASS_HUMIDITY, jsonHum, "", "", HASS_UNIT_PERCENT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("DHTDiscovery" CR));
+  createDiscoveryFromList(nullptr, DHTsensor, 2, nullptr, nullptr, nullptr,
+                          true, DHTTOPIC, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorADC
+#    include "config_ADC.h"
+  THEENGS_LOG_TRACE(F("ADCDiscovery" CR));
+  const char* ADCsensor[][13] = {
+      {HASS_TYPE_SENSOR, "ADC", "adc", "", jsonAdc, "", "", "", stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, ADCsensor, 1, nullptr, nullptr, nullptr,
+                          true, ADCTOPIC, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorBH1750
+#    include "config_BH1750.h"
+  const char* BH1750sensor[][13] = {
+      {HASS_TYPE_SENSOR, "BH1750: Lux", "BH1750-lux", HASS_CLASS_ILLUMINANCE, jsonLux, "", "", HASS_UNIT_LX, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "BH1750: ftCd", "BH1750-ftcd", HASS_CLASS_IRRADIANCE, jsonFtcd, "", "", "", stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "BH1750: wattsm2", "BH1750-wm2", HASS_CLASS_IRRADIANCE, jsonWm2, "", "", HASS_UNIT_WM2, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("BH1750Discovery" CR));
+  createDiscoveryFromList(nullptr, BH1750sensor, 3, nullptr, nullptr, nullptr,
+                          true, subjectBH1750toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorMQ2
+#    include "config_MQ2.h"
+  const char* MQ2sensor[][13] = {
+      {HASS_TYPE_SENSOR, "MQ2: gas", "MQ2-gas", HASS_CLASS_GAS, jsonVal, "", "", HASS_UNIT_PPM, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_BINARY_SENSOR, "MQ2", "", HASS_CLASS_GAS, jsonPresence, "true", "false", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("MQ2Discovery" CR));
+  createDiscoveryFromList(nullptr, MQ2sensor, 2, nullptr, nullptr, nullptr,
+                          true, subjectMQ2toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorTEMT6000
+#    include "config_TEMT6000.h"
+  const char* TEMT6000sensor[][13] = {
+      {HASS_TYPE_SENSOR, "TEMT6000: Lux", "TEMT6000-lux", HASS_CLASS_ILLUMINANCE, jsonLux, "", "", HASS_UNIT_LX, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "TEMT6000: ftCd", "TEMT6000-ftcd", HASS_CLASS_IRRADIANCE, jsonFtcd, "", "", "", stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "TEMT6000: wattsm2", "TEMT6000-wm2", HASS_CLASS_IRRADIANCE, jsonWm2, "", "", HASS_UNIT_WM2, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("TEMT6000Discovery" CR));
+  createDiscoveryFromList(nullptr, TEMT6000sensor, 3, nullptr, nullptr, nullptr,
+                          true, subjectTEMT6000toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorTSL2561
+#    include "config_TSL2561.h"
+  const char* TSL2561sensor[][13] = {
+      {HASS_TYPE_SENSOR, "TSL2561: Lux", "TSL2561-lux", HASS_CLASS_ILLUMINANCE, jsonLux, "", "", HASS_UNIT_LX, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "TSL2561: ftCd", "TSL2561-ftcd", HASS_CLASS_IRRADIANCE, jsonFtcd, "", "", "", stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "TSL2561: wattsm2", "TSL2561-wm2", HASS_CLASS_IRRADIANCE, jsonWm2, "", "", HASS_UNIT_WM2, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("TSL2561Discovery" CR));
+  createDiscoveryFromList(nullptr, TSL2561sensor, 3, nullptr, nullptr, nullptr,
+                          true, subjectTSL12561toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorHCSR501
+#    include "config_HCSR501.h"
+  THEENGS_LOG_TRACE(F("HCSR501Discovery" CR));
+  const char* HCSR501sensor[][13] = {
+      {HASS_TYPE_BINARY_SENSOR, "hcsr501", "", HASS_CLASS_MOTION, jsonPresence, "true", "false", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, HCSR501sensor, 1, nullptr, nullptr, nullptr,
+                          true, subjectHCSR501toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorGPIOInput
+#    include "config_GPIOInput.h"
+  THEENGS_LOG_TRACE(F("GPIOInputDiscovery" CR));
+  const char* GPIOInputsensor[][13] = {
+      {HASS_TYPE_BINARY_SENSOR, "GPIOInput", "", "", jsonGpio, INPUT_GPIO_ON_VALUE, INPUT_GPIO_OFF_VALUE, "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, GPIOInputsensor, 1, nullptr, nullptr, nullptr,
+                          true, subjectGPIOInputtoMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorINA226
+#    include "config_INA226.h"
+  const char* INA226sensor[][13] = {
+      {HASS_TYPE_SENSOR, "INA226: volt", "INA226-volt", HASS_CLASS_VOLTAGE, jsonVolt, "", "", HASS_UNIT_VOLT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "INA226: current", "INA226-current", HASS_CLASS_CURRENT, jsonCurrent, "", "", HASS_UNIT_AMP, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "INA226: power", "INA226-power", HASS_CLASS_POWER, jsonPower, "", "", HASS_UNIT_WATT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("INA226Discovery" CR));
+  createDiscoveryFromList(nullptr, INA226sensor, 3, nullptr, nullptr, nullptr,
+                          true, subjectINA226toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorDS1820
+  extern void pubOneWire_HADiscovery();
+  // Publish any DS1820 sensors found on the OneWire bus
+  pubOneWire_HADiscovery();
+#  endif
+
+#  ifdef ZactuatorONOFF
+#    include "config_ONOFF.h"
+  THEENGS_LOG_TRACE(F("actuatorONOFFDiscovery" CR));
+  const char* actuatorONOFF[][13] = {
+      {HASS_TYPE_SWITCH, "actuatorONOFF", "actuatorONOFF", "", "{{ value_json.cmd }}", "{\"cmd\":1}", "{\"cmd\":0}", "", stateClassNone, "0", "1", nullptr, subjectMQTTtoONOFF}};
+
+  createDiscoveryFromList(nullptr, actuatorONOFF, 1, nullptr, nullptr, nullptr,
+                          true, subjectGTWONOFFtoMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZsensorRN8209
+#    include "config_RN8209.h"
+  const char* RN8209sensor[][13] = {
+      {HASS_TYPE_SENSOR, "NRG: volt", "volt", HASS_CLASS_VOLTAGE, jsonVolt, "", "", HASS_UNIT_VOLT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "NRG: current", "current", HASS_CLASS_CURRENT, jsonCurrent, "", "", HASS_UNIT_AMP, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_SENSOR, "NRG: power", "power", HASS_CLASS_POWER, jsonPower, "", "", HASS_UNIT_WATT, stateClassMeasurement, nullptr, nullptr, nullptr, nullptr},
+      {HASS_TYPE_BINARY_SENSOR, "NRG: inUse", "inUse", HASS_CLASS_POWER, jsonInuseRN8209, "on", "off", "", stateClassMeasurement, nullptr, nullptr, nullptr, nullptr}};
+
+  THEENGS_LOG_TRACE(F("RN8209Discovery" CR));
+  createDiscoveryFromList(nullptr, RN8209sensor, 4, nullptr, nullptr, nullptr,
+                          true, subjectRN8209toMQTT, will_Topic, nullptr);
+#  endif
+
+// Gateway sensors for various modules
+#  if defined(ZgatewayRF) && defined(RF_on_HAS_as_MQTTSensor)
+  THEENGS_LOG_TRACE(F("gatewayRFDiscovery" CR));
+  const char* gatewayRF[][13] = {
+      {HASS_TYPE_SENSOR, "gatewayRF", "", "", jsonVal, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewayRF, 1, nullptr, nullptr, nullptr,
+                          true,
+#    if valueAsATopic
+                          subjectRFtoMQTTvalueAsATopic,
+#    else
+                          subjectRFtoMQTT,
+#    endif
+                          will_Topic, nullptr);
+#  endif
+
+#  ifdef ZgatewayRF2
+#    include "config_RF.h"
+  THEENGS_LOG_TRACE(F("gatewayRF2Discovery" CR));
+  const char* gatewayRF2[][13] = {
+      {HASS_TYPE_SENSOR, "gatewayRF2", "", "", jsonAddress, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewayRF2, 1, nullptr, nullptr, nullptr,
+                          true,
+#    if valueAsATopic
+                          subjectRF2toMQTTvalueAsATopic,
+#    else
+                          subjectRF2toMQTT,
+#    endif
+                          will_Topic, nullptr);
+#  endif
+
+#  ifdef ZgatewayRFM69
+#    include "config_RFM69.h"
+  THEENGS_LOG_TRACE(F("gatewayRFM69Discovery" CR));
+  const char* gatewayRFM69[][13] = {
+      {HASS_TYPE_SENSOR, "gatewayRFM69", "", "", jsonVal, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewayRFM69, 1, nullptr, nullptr, nullptr,
+                          true, subjectRFM69toMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZgatewayLORA
+#    include "config_LORA.h"
+  THEENGS_LOG_TRACE(F("gatewayLORADiscovery" CR));
+  const char* gatewayLORA[][13] = {
+      {HASS_TYPE_SENSOR, "gatewayLORA", "", "", jsonMsg, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewayLORA, 1, nullptr, nullptr, nullptr,
+                          true, subjectLORAtoMQTT, will_Topic, nullptr);
+
+  const char* LORAswitches[][13] = {
+      {HASS_TYPE_SWITCH, "LORA: CRC", "enablecrc", "", "{{ value_json.enablecrc }}", "{\"enablecrc\":true,\"save\":true}", "{\"enablecrc\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoLORAset},
+      {HASS_TYPE_SWITCH, "LORA: Invert IQ", "invertiq", "", "{{ value_json.invertiq }}", "{\"invertiq\":true,\"save\":true}", "{\"invertiq\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoLORAset},
+      {HASS_TYPE_SWITCH, "LORA: Only Known", "onlyknown", "", "{{ value_json.onlyknown }}", "{\"onlyknown\":true,\"save\":true}", "{\"onlyknown\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoLORAset},
+  };
+
+  createDiscoveryFromList(nullptr, LORAswitches, 3, nullptr, nullptr, nullptr,
+                          true, subjectLORAtoMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZgatewaySRFB
+#    include "config_SRFB.h"
+  THEENGS_LOG_TRACE(F("gatewaySRFBDiscovery" CR));
+  const char* gatewaySRFB[][13] = {
+      {HASS_TYPE_SENSOR, "gatewaySRFB", "", "", jsonVal, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewaySRFB, 1, nullptr, nullptr, nullptr,
+                          true, subjectSRFBtoMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef ZgatewayPilight
+#    include "config_RF.h"
+  THEENGS_LOG_TRACE(F("gatewayPilightDiscovery" CR));
+  const char* gatewayPilight[][13] = {
+      {HASS_TYPE_SENSOR, "gatewayPilight", "", "", jsonMsg, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewayPilight, 1, nullptr, nullptr, nullptr,
+                          true,
+#    if valueAsATopic
+                          subjectPilighttoMQTTvalueAsATopic,
+#    else
+                          subjectPilighttoMQTT,
+#    endif
+                          will_Topic, nullptr);
+#  endif
+
+#  ifdef ZgatewayIR
+#    include "config_IR.h"
+  THEENGS_LOG_TRACE(F("gatewayIRDiscovery" CR));
+  const char* gatewayIR[][13] = {
+      {HASS_TYPE_SENSOR, "gatewayIR", "", "", jsonVal, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gatewayIR, 1, nullptr, nullptr, nullptr,
+                          true, subjectIRtoMQTT, will_Topic, nullptr);
+#  endif
+
+#  ifdef Zgateway2G
+#    include "config_2G.h"
+  THEENGS_LOG_TRACE(F("gateway2GDiscovery" CR));
+  const char* gateway2G[][13] = {
+      {HASS_TYPE_SENSOR, "gateway2G", "", "", jsonMsg, "", "", "", stateClassNone, nullptr, nullptr, nullptr, nullptr}};
+
+  createDiscoveryFromList(nullptr, gateway2G, 1, nullptr, nullptr, nullptr,
+                          true, subject2GtoMQTT, will_Topic, nullptr);
+#  endif
+
+#  if defined(ZgatewayBT) || defined(SecondaryModule)
+#    ifdef ESP32
+
+  // BT configuration entities - all in arrays now with macros
+  const char* btConfigEntities[][13] = {
+      // Numbers
+      {HASS_TYPE_NUMBER, "BT: Connect interval", "intervalcnct", "", "{{ value_json.intervalcnct/60000 }}", "{\"intervalcnct\":{{value*60000}},\"save\":true}", "", HASS_UNIT_MIN, stateClassNone, nullptr, nullptr, nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_NUMBER, "BT: Scan duration", "scanduration", "", "{{ value_json.scanduration/1000 }}", "{\"scanduration\":{{value*1000}},\"save\":true}", "", HASS_UNIT_SECOND, stateClassNone, nullptr, nullptr, nullptr, subjectMQTTtoBTset},
+      // Buttons
+      {HASS_TYPE_BUTTON, "BT: Force scan", "force_scan", "", "", "{\"interval\":0}", "", "", stateClassNone, nullptr, nullptr, will_Topic, subjectMQTTtoBTset},
+      {HASS_TYPE_BUTTON, "BT: Erase config", "erase_bt_config", "", "", "{\"erase\":true}", "", "", stateClassNone, nullptr, nullptr, will_Topic, subjectMQTTtoBTset},
+      // Switches with state_on/state_off
+      {HASS_TYPE_SWITCH, "BT: Publish only sensors", "only_sensors", "", "{{ value_json.onlysensors }}", "{\"onlysensors\":true,\"save\":true}", "{\"onlysensors\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_SWITCH, "BT: Adaptive scan", "adaptive_scan", "", "{{ value_json.adaptivescan }}", "{\"adaptivescan\":true,\"save\":true}", "{\"adaptivescan\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_SWITCH, "BT: Enabled", "enabled", "", "{{ value_json.enabled }}", "{\"enabled\":true,\"save\":true}", "{\"enabled\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_SWITCH, "BT: Publish HASS presence", "hasspresence", "", "{{ value_json.hasspresence }}", "{\"hasspresence\":true,\"save\":true}", "{\"hasspresence\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_SWITCH, "BT: Publish Advertisement data", "pubadvdata", "", "{{ value_json.pubadvdata }}", "{\"pubadvdata\":true,\"save\":true}", "{\"pubadvdata\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoBTset},
+      {HASS_TYPE_SWITCH, "BT: Connect to devices", "bleconnect", "", "{{ value_json.bleconnect }}", "{\"bleconnect\":true,\"save\":true}", "{\"bleconnect\":false,\"save\":true}", "", stateClassNone, "false", "true", nullptr, subjectMQTTtoBTset},
+  };
+
+  createDiscoveryFromList(nullptr, btConfigEntities, 10, nullptr, nullptr, nullptr,
+                          true, subjectBTtoMQTT, will_Topic, nullptr);
+
+#      define EntitiesCount 9
+  const char* obsoleteEntities[EntitiesCount][2] = {
+      // Remove previously created entities for version < 1.4.0
+      {HASS_TYPE_SWITCH, "active_scan"}, // Replaced by adaptive scan
+      // Remove previously created entities for version < 1.3.0
+      {HASS_TYPE_NUMBER, "scanbcnct"}, // Now a connect interval
+      // Remove previously created entities for version < 1.2.0
+      {HASS_TYPE_SWITCH, "restart"}, // Now a button
+      {HASS_TYPE_SWITCH, "erase"}, // Now a button
+      {HASS_TYPE_SWITCH, "force_scan"}, // Now a button
+      {HASS_TYPE_SENSOR, "interval"}, // Now a number
+      {HASS_TYPE_SENSOR, "scanbcnct"}, // Now a number
+      {HASS_TYPE_SWITCH, "ohdiscovery"}, // Now a new key
+      {HASS_TYPE_SWITCH, "discovery"}}; // Now a new key
+
+  for (int i = 0; i < EntitiesCount; i++) {
+    eraseTopic(obsoleteEntities[i][0], (char*)getUniqueId(obsoleteEntities[i][1], "").c_str());
+  }
+
+  btScanParametersDiscovery();
+  btPresenceParametersDiscovery();
+
+#      if DEFAULT_LOW_POWER_MODE != DEACTIVATED
+  createDiscovery(HASS_TYPE_SWITCH, //set Type
+                  subjectSYStoMQTT, "SYS: Low Power Mode command", (char*)getUniqueId("powermode", "").c_str(), //set state_topic,name,uniqueId
+                  will_Topic, "", "{{ value_json.powermode | bool }}", //set availability_topic,device_class,value_template,
+                  "{\"powermode\":1,\"save\":true}", "{\"powermode\":0,\"save\":true}", "", //set,payload_on,payload_off,unit_of_meas,
+                  0, //set off_delay
+                  Gateway_AnnouncementMsg, will_Message, true, subjectMQTTtoSYSset, //set,payload_available,payload_not available,is a gateway entity, command topic
+                  "", "", "", "", true, // device name, device manufacturer, device model, device MAC, retain
+                  stateClassNone, //State Class
+                  "false", "true" //state_off, state_on
+  );
+#      else
+  // Remove previously created switch for version < 1.4.0
+  eraseTopic(HASS_TYPE_SWITCH, (char*)getUniqueId("powermode", "").c_str());
+#      endif
+#    endif
+#  endif
+}
+#else
+void pubMqttDiscovery() {}
+#endif
\ No newline at end of file
diff --git a/main/rf/RFConfiguration.cpp b/main/rf/RFConfiguration.cpp
new file mode 100644
index 0000000..20366cc
--- /dev/null
+++ b/main/rf/RFConfiguration.cpp
@@ -0,0 +1,334 @@
+#include "RFConfiguration.h"
+
+#include <config_RF.h>
+
+#ifdef ZgatewayRTL_433
+#  include <rtl_433_ESP.h>
+extern rtl_433_ESP rtl_433;
+#endif
+
+// Constructor
+RFConfiguration::RFConfiguration(RFReceiver& receiver) : iRFReceiver(receiver) {
+  reInit();
+}
+
+// Destructor
+RFConfiguration::~RFConfiguration() {
+}
+
+// Getters and Setters
+float RFConfiguration::getFrequency() const {
+  return frequency;
+}
+
+void RFConfiguration::setFrequency(float freq) {
+  frequency = freq;
+}
+
+int RFConfiguration::getRssiThreshold() const {
+  return rssiThreshold;
+}
+
+void RFConfiguration::setRssiThreshold(int threshold) {
+  rssiThreshold = threshold;
+}
+
+int RFConfiguration::getNewOokThreshold() const {
+  return newOokThreshold;
+}
+
+void RFConfiguration::setNewOokThreshold(int threshold) {
+  newOokThreshold = threshold;
+}
+
+int RFConfiguration::getActiveReceiver() const {
+  return activeReceiver;
+}
+
+void RFConfiguration::setActiveReceiver(int receiver) {
+  activeReceiver = receiver;
+}
+
+/**
+ * @brief Initializes the RFConfiguration  with default values.
+ * 
+ * This function sets up the RFConfiguration by assigning default values 
+ * to its members, including frequency, active receiver, RSSI threshold, 
+ * and new OOK threshold. It also clears and shrinks the whiteList and 
+ * blackList containers to ensure they are empty and optimized for memory usage.
+ * 
+ * @note This function should be called during the initialization phase 
+ *       to ensure the RFConfiguration is properly configured.
+ */
+void RFConfiguration::reInit() {
+  frequency = RF_FREQUENCY;
+  activeReceiver = ACTIVE_RECEIVER;
+  rssiThreshold = 0;
+  newOokThreshold = 0;
+  THEENGS_LOG_TRACE(F("RFConfiguration reInit: frequency=%F, activeReceiver=%d" CR), frequency, activeReceiver);
+}
+
+/**
+ * @brief Erases the RF configuration from non-volatile storage (NVS).
+ *
+ * This function removes the RF configuration stored in NVS. It checks if
+ * the configuration exists and, if so, removes it. If the configuration
+ * is not found, a notice is logged.
+ *
+ * @note This function is only available on ESP32 platforms.
+ */
+void RFConfiguration::eraseStorage() {
+#ifdef ESP32
+  // Erase config from NVS (non-volatile storage)
+  preferences.begin(Gateway_Short_Name, false);
+  if (preferences.isKey("RFConfig")) {
+    int result = preferences.remove("RFConfig");
+    THEENGS_LOG_NOTICE(F("RF config erase result: %d" CR), result);
+  } else {
+    THEENGS_LOG_NOTICE(F("RF config not found" CR));
+  }
+  preferences.end();
+#else
+  THEENGS_LOG_WARNING(F("RF Config Erase not support with this board" CR));
+#endif
+}
+
+/**
+   * @brief Saves the RF configuration to non-volatile storage (NVS).
+   *
+   * This function serializes the RF configuration data into a JSON object
+   * and saves it to NVS. The saved configuration includes frequency, active
+   * receiver, and other relevant parameters.
+   *
+   * @note This function is only available on ESP32 platforms.
+   * @note Ensure that the `JSON_MSG_BUFFER` is large enough to hold the
+   *       serialized configuration data to avoid deserialization errors.
+   */
+void RFConfiguration::saveOnStorage() {
+#ifdef ESP32
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  JsonObject jo = jsonBuffer.to<JsonObject>();
+  toJson(jo);
+#  ifdef ZgatewayRTL_433
+  // FROM ORIGINAL CONFIGURATION:
+  // > Don't save those for now, need to be tested
+  jo.remove("rssithreshold");
+  jo.remove("ookthreshold");
+#  endif
+  // Save config into NVS (non-volatile storage)
+  String conf = "";
+  serializeJson(jsonBuffer, conf);
+  preferences.begin(Gateway_Short_Name, false);
+  int result = preferences.putString("RFConfig", conf);
+  preferences.end();
+  THEENGS_LOG_NOTICE(F("RF Config_save: %s, result: %d" CR), conf.c_str(), result);
+#else
+  THEENGS_LOG_WARNING(F("RF Config_save not support with this board" CR));
+#endif
+}
+
+/**
+ * @brief Loads the RF configuration from persistent storage and applies it.
+ *
+ * This function retrieves the RF configuration stored in non-volatile
+ * storage (NVS) and applies it to the RF receiver. If the configuration
+ * is not found, a notice is logged, and the RF receiver is enabled with
+ * default settings.
+ *
+ * @param reinitReceiver If true (default), disables and re-enables the receiver.
+ *                       If false, only loads the configuration without reinitialization.
+ *
+ * @note This function has specific behavior for ESP32 platforms. On ESP32,
+ *       it uses the Preferences library to access stored configuration data.
+ *       For other platforms, it directly enables the active receiver.
+ */
+void RFConfiguration::loadFromStorage(bool reinitReceiver) {
+#ifdef ESP32
+  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+  preferences.begin(Gateway_Short_Name, true);
+  if (preferences.isKey("RFConfig")) {
+    auto error = deserializeJson(jsonBuffer, preferences.getString("RFConfig", "{}"));
+    preferences.end();
+    if (error) {
+      THEENGS_LOG_ERROR(F("RF Config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      return;
+    }
+    if (jsonBuffer.isNull()) {
+      THEENGS_LOG_WARNING(F("RF Config is null" CR));
+      return;
+    }
+    JsonObject jo = jsonBuffer.as<JsonObject>();
+    fromJson(jo);
+    THEENGS_LOG_NOTICE(F("RF Config loaded" CR));
+  } else {
+    preferences.end();
+    THEENGS_LOG_NOTICE(F("RF Config not found using default" CR));
+  }
+#endif
+  // Disable and re-enable the receiver to ensure proper initialization
+  if (reinitReceiver) {
+    iRFReceiver.disable();
+    delay(100);
+    iRFReceiver.enable();
+  }
+}
+
+/**
+ * @brief Loads the RF configuration from a JSON object and applies it.
+ *
+ * This function takes a JSON object containing RF configuration data and
+ * applies it to the RF receiver. It also handles the erasure and saving of
+ * the configuration based on the provided JSON data.
+ * 
+ * Configuration modifications priorities:
+ * - First `init=true` and `load=true` commands are executed (if both are present, INIT prevails on LOAD)
+ * - Then parameters included in json are taken in account
+ * - Finally `erase=true` and `save=true` commands are executed (if both are present, ERASE prevails on SAVE)* 
+ *
+ * @param RFdata A reference to a JsonObject containing the RF configuration data.
+ *
+ * The following keys are supported in the JSON object:
+ * - "init": If true, restores the default RF configuration.
+ * - "load": If true, loads the saved RF configuration from storage.
+ * - "erase": If true, erases the RF configuration from storage.
+ * - "save": If true, saves the current RF configuration to storage.
+ *
+ * Logs messages to indicate the success or failure of each operation.
+ */
+void RFConfiguration::loadFromMessage(JsonObject& RFdata) {
+  if (RFdata.containsKey("init") && RFdata["init"].as<bool>()) {
+    // Restore the default (initial) configuration
+    reInit();
+  } else if (RFdata.containsKey("load") && RFdata["load"].as<bool>()) {
+    // Load the saved configuration from storage (without receiver reinitialization)
+    loadFromStorage(false);
+  }
+
+  fromJson(RFdata);
+
+  iRFReceiver.disable();
+  iRFReceiver.enable();
+
+  if (RFdata.containsKey("erase") && RFdata["erase"].as<bool>()) {
+    eraseStorage();
+    THEENGS_LOG_NOTICE(F("RF Config erased" CR));
+  } else if (RFdata.containsKey("save") && RFdata["save"].as<bool>()) {
+    saveOnStorage();
+    THEENGS_LOG_NOTICE(F("RF Config saved" CR));
+  }
+}
+
+/**
+ * @brief Updates the RF configuration from a JSON object.
+ *
+ * This function parses the provided JSON object and updates the RF configuration
+ * based on the keys and values present in the object. It supports updating
+ * white-list, black-list, frequency, active receiver status, and other RF-related
+ * parameters depending on the defined preprocessor directives.
+ *
+ * @param RFdata A reference to a JsonObject containing the RF configuration data.
+ *
+ * The following keys are supported in the JSON object:
+ * - "white-list": Updates the RF white-list.
+ * - "black-list": Updates the RF black-list.
+ * - "frequency": Updates the RF frequency if the value is valid.
+ * - "active": Updates the active receiver status.
+ *
+ * Additional keys supported when ZgatewayRTL_433 is defined:
+ * - "rssithreshold": Updates the RSSI threshold for RTL_433.
+ * - "ookthreshold": Updates the OOK threshold for RTL_433 (requires RF_SX1276 or RF_SX1278).
+ * - "status": Retrieves the current status of the RF configuration.
+ *
+ * Logs messages to indicate the success or failure of each update operation.
+ * If no valid keys are found in the JSON object, an error message is logged.
+ */
+void RFConfiguration::fromJson(JsonObject& RFdata) {
+  bool success = false;
+
+  if (RFdata.containsKey("frequency") && validFrequency(RFdata["frequency"])) {
+    Config_update(RFdata, "frequency", frequency);
+    THEENGS_LOG_NOTICE(F("RF Receive mhz: %F" CR), frequency);
+    success = true;
+  }
+  if (RFdata.containsKey("active")) {
+    Config_update(RFdata, "active", activeReceiver);
+    THEENGS_LOG_NOTICE(F("RF receiver active: %d" CR), activeReceiver);
+    success = true;
+  }
+#ifdef ZgatewayRTL_433
+  if (RFdata.containsKey("rssithreshold")) {
+    THEENGS_LOG_NOTICE(F("RTL_433 RSSI Threshold : %d " CR), rssiThreshold);
+    Config_update(RFdata, "rssithreshold", rssiThreshold);
+    rtl_433.setRSSIThreshold(rssiThreshold);
+    success = true;
+  }
+#  if defined(RF_SX1276) || defined(RF_SX1278)
+  if (RFdata.containsKey("ookthreshold")) {
+    Config_update(RFdata, "ookthreshold", newOokThreshold);
+    THEENGS_LOG_NOTICE(F("RTL_433 ookThreshold %d" CR), newOokThreshold);
+    rtl_433.setOOKThreshold(newOokThreshold);
+    success = true;
+  }
+#  endif
+  if (RFdata.containsKey("status")) {
+    THEENGS_LOG_NOTICE(F("RF get status:" CR));
+    rtl_433.getStatus();
+    success = true;
+  }
+  if (!success) {
+    THEENGS_LOG_ERROR(F("MQTTtoRF Fail json" CR));
+  }
+#endif
+}
+
+/**
+ * @brief Serializes the RFConfiguration object into a JSON object.
+ * 
+ * This method populates the provided JSON object with the configuration
+ * details of the RF module, including frequency, RSSI threshold, OOK threshold,
+ * active receiver status, and ignore list settings. Additionally, it includes
+ * the white-list and black-list vectors as nested JSON arrays.
+ * 
+ * @param RFdata A reference to a JsonObject where the RF configuration data 
+ *               will be serialized.
+ * 
+ * JSON Structure:
+ * {
+ *   "frequency": <float>,          // Frequency value
+ *   "rssithreshold": <float>,      // RSSI threshold value
+ *   "ookthreshold": <float>,       // OOK threshold value
+ *   "active": <bool>,              // Active receiver status
+ *   "ignoreWhitelist": <bool>,     // Ignore white-list flag
+ *   "ignoreBlacklist": <bool>,     // Ignore black-list flag
+ *   "white-list": [<int>, ...],    // Array of white-list values
+ *   "black-list": [<int>, ...]     // Array of black-list values
+ * }
+ */
+void RFConfiguration::toJson(JsonObject& RFdata) {
+  RFdata["frequency"] = frequency;
+  RFdata["rssithreshold"] = rssiThreshold;
+  RFdata["ookthreshold"] = newOokThreshold;
+  RFdata["active"] = activeReceiver;
+}
+
+/**
+ * @brief Validates if the given frequency is within the acceptable ranges for the CC1101 module.
+ *
+ * The CC1101 module supports the following frequency ranges:
+ * - 300 MHz to 348 MHz
+ * - 387 MHz to 464 MHz
+ * - 779 MHz to 928 MHz
+ *
+ * @param mhz The frequency in MHz to validate.
+ * @return true if the frequency is within one of the valid ranges, false otherwise.
+ */
+bool RFConfiguration::validFrequency(float mhz) {
+  //  CC1101 valid frequencies 300-348 MHZ, 387-464MHZ and 779-928MHZ.
+  if (mhz >= 300 && mhz <= 348)
+    return true;
+  if (mhz >= 387 && mhz <= 464)
+    return true;
+  if (mhz >= 779 && mhz <= 928)
+    return true;
+  return false;
+}
diff --git a/main/rf/RFConfiguration.h b/main/rf/RFConfiguration.h
new file mode 100644
index 0000000..34dacf5
--- /dev/null
+++ b/main/rf/RFConfiguration.h
@@ -0,0 +1,121 @@
+#ifndef RFCONFIG_H
+#define RFCONFIG_H
+#pragma once
+
+#include <TheengsCommon.h>
+#include <rf/RFReceiver.h>
+
+class RFConfiguration {
+public:
+  // Constructor
+  RFConfiguration(RFReceiver& receiver);
+  ~RFConfiguration();
+
+  // Getters and Setters
+  float getFrequency() const;
+  void setFrequency(float freq);
+
+  int getRssiThreshold() const;
+  void setRssiThreshold(int threshold);
+
+  int getNewOokThreshold() const;
+  void setNewOokThreshold(int threshold);
+
+  int getActiveReceiver() const;
+  void setActiveReceiver(int receiver);
+
+  /**
+   * Initializes the  structure with default values.
+   * 
+   * @note This function should be called during the initialization phase 
+   *       to ensure the  structure is properly configured.
+   */
+  void reInit();
+
+  /**
+   * Erases the RF configuration from non-volatile storage (NVS).
+   * 
+   * @note This function is only available on ESP32 platforms.
+   */
+  void eraseStorage();
+
+  /**
+   * Saves the RF configuration to non-volatile storage (NVS).
+   *
+   * @note This function is only available on ESP32 platforms.
+   */
+  void saveOnStorage();
+
+  /**
+   * Loads the RF configuration from persistent storage and applies it.
+   *
+   * @param reinitReceiver If true (default), disables and re-enables the receiver.
+   *                       If false, only loads the configuration without reinitialization.
+   *
+   * @note This function has specific behavior for ESP32 platforms. On ESP32,
+   *       it uses the Preferences library to access stored configuration data.
+   *       For other platforms, it directly enables the active receiver.
+   */
+  void loadFromStorage(bool reinitReceiver = true);
+
+  /**
+   * Loads the RF configuration from a JSON object and applies it.
+   *
+   * @param RFdata A reference to a JsonObject containing the RF configuration data.
+   *
+   * The following keys are supported in the JSON object:
+   * - "erase": If true, erases the RF configuration from storage.
+   * - "save": If true, saves the current RF configuration to storage.
+   *
+   * Logs messages to indicate the success or failure of each operation.
+   */
+  void loadFromMessage(JsonObject& RFdata);
+
+  /**
+   * Updates the RF configuration from a JSON object.
+   *
+   * @param RFdata A reference to a JsonObject containing the RF configuration data.
+   *
+   * The following keys are supported in the JSON object:
+   * - "white-list": Updates the RF white-list.
+   * - "black-list": Updates the RF black-list.
+   * - "frequency": Updates the RF frequency if the value is valid.
+   * - "active": Updates the active receiver status.
+   *
+   * Additional keys supported when ZgatewayRTL_433 is defined:
+   * - "rssithreshold": Updates the RSSI threshold for RTL_433.
+   * - "ookthreshold": Updates the OOK threshold for RTL_433 (requires RF_SX1276 or RF_SX1278).
+   * - "status": Retrieves the current status of the RF configuration.
+   */
+  void fromJson(JsonObject& RFdata);
+
+  /**
+   * Serializes the RF configuration to a JSON object.
+   *
+   * @param RFdata A reference to a JsonObject where the RF configuration will be serialized.
+   */
+  void toJson(JsonObject& RFdata);
+
+  /**
+   * @brief Validates if the given frequency is within the acceptable ranges for the CC1101 module.
+   *
+   * The CC1101 module supports the following frequency ranges:
+   * - 300 MHz to 348 MHz
+   * - 387 MHz to 464 MHz
+   * - 779 MHz to 928 MHz
+   *
+   * @param mhz The frequency in MHz to validate.
+   * @return true if the frequency is within one of the valid ranges, false otherwise.
+   */
+  bool validFrequency(float mhz);
+
+private:
+  // Reference to the RFReceiver object
+  RFReceiver& iRFReceiver;
+  float frequency;
+  int rssiThreshold;
+  int newOokThreshold;
+  int activeReceiver;
+};
+
+#endif // RFCONFIG_H
\ No newline at end of file
diff --git a/main/rf/RFReceiver.h b/main/rf/RFReceiver.h
new file mode 100644
index 0000000..312a29f
--- /dev/null
+++ b/main/rf/RFReceiver.h
@@ -0,0 +1,15 @@
+#ifndef RFRECEIVER_H
+#define RFRECEIVER_H
+#pragma once
+
+class RFReceiver {
+public:
+  virtual ~RFReceiver() = default;
+
+  // Pure virtual methods
+  virtual void enable() = 0;
+  virtual void disable() = 0;
+  virtual int getReceiverID() const = 0;
+};
+
+#endif // RFRECEIVER_H
\ No newline at end of file
diff --git a/main/ZsensorADC.ino b/main/sensorADC.cpp
similarity index 88%
rename from main/ZsensorADC.ino
rename to main/sensorADC.cpp
index 00b4a68..3369872 100644
--- a/main/ZsensorADC.ino
+++ b/main/sensorADC.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     Analog GPIO reading Addon
@@ -29,6 +29,8 @@
 #include "User_config.h"
 
 #ifdef ZsensorADC
+#  include "TheengsCommon.h"
+#  include "config_ADC.h"
 
 #  if defined(ESP8266)
 ADC_MODE(ADC_TOUT);
@@ -40,7 +42,7 @@ static int persistedadc = -1024; // so that the first reading will always be pub
 unsigned long timeadc = 0;
 unsigned long timeadcpub = 0;
 void setupADC() {
-  Log.notice(F("ADC_GPIO: %d" CR), ADC_GPIO);
+  THEENGS_LOG_NOTICE(F("ADC_GPIO: %d" CR), ADC_GPIO);
 }
 
 void MeasureADC() {
@@ -59,11 +61,11 @@ void MeasureADC() {
       val = sum_val / NumberOfReadingsADC;
     }
     if (isnan(val)) {
-      Log.error(F("Failed to read from ADC !" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from ADC !" CR));
     } else {
       if (val >= persistedadc + ThresholdReadingADC || val <= persistedadc - ThresholdReadingADC || (MinTimeInSecBetweenPublishingADC > 0 && millis() - timeadcpub > (MinTimeInSecBetweenPublishingADC * 1000UL))) {
         timeadcpub = millis();
-        Log.trace(F("Creating ADC buffer" CR));
+        THEENGS_LOG_TRACE(F("Creating ADC buffer" CR));
         StaticJsonDocument<JSON_MSG_BUFFER> ADCdataBuffer;
         JsonObject ADCdata = ADCdataBuffer.to<JsonObject>();
         ADCdata["adc"] = (int)val;
@@ -94,7 +96,7 @@ void MeasureADC() {
         ADCdata["mvolt_scaled"] = (int)voltage; // real scaled/calibrated value in mV
 #  endif
         ADCdata["origin"] = ADCTOPIC;
-        handleJsonEnqueue(ADCdata);
+        enqueueJsonObject(ADCdata);
         persistedadc = val;
       }
     }
diff --git a/main/ZsensorAHTx0.ino b/main/sensorAHTx0.cpp
similarity index 75%
rename from main/ZsensorAHTx0.ino
rename to main/sensorAHTx0.cpp
index 16af5ed..c46531e 100644
--- a/main/ZsensorAHTx0.ino
+++ b/main/sensorAHTx0.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
  
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
    
    This is the Climate Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   AHT10 ------> Arduino Uno ----------> ESP8266
+   AHT10 ------> ESP8266
    ==============================================
-   Vcc ---------> 5V -------------------> 3v3 (3V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
+   Vcc ---------> 3v3 (3V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
    
     This file is part of OpenMQTTGateway.
     
@@ -41,6 +41,7 @@
 #  include <stdint.h>
 
 #  include "Adafruit_AHTX0.h"
+#  include "TheengsCommon.h"
 #  include "Wire.h" // Library for communication with I2C / TWI devices
 #  include "config_AHTx0.h"
 
@@ -52,23 +53,23 @@ Adafruit_AHTX0 ahtSensor;
 
 void setupZsensorAHTx0() {
   delay(10); // Gives the Sensor enough time to turn on
-  Log.notice(F("AHTx0 Initialized - begin()" CR));
+  THEENGS_LOG_NOTICE(F("AHTx0 Initialized - begin()" CR));
 
 #  if defined(ESP32)
   Wire.begin(AHT_I2C_SDA, AHT_I2C_SCL);
   if (!ahtSensor.begin(&Wire)) {
-    Log.error(F("Failed to initialize AHTx0 sensor!" CR));
+    THEENGS_LOG_ERROR(F("Failed to initialize AHTx0 sensor!" CR));
   }
 #  else
   if (!ahtSensor.begin()) {
-    Log.error(F("Failed to initialize AHTx0 sensor!" CR));
+    THEENGS_LOG_ERROR(F("Failed to initialize AHTx0 sensor!" CR));
   }
 #  endif
 }
 
 void MeasureAHTTempHum() {
   if (millis() > (timeAHTx0 + TimeBetweenReadingAHTx0)) {
-    Log.trace(F("Read AHTx0 Sensor" CR));
+    THEENGS_LOG_TRACE(F("Read AHTx0 Sensor" CR));
 
     timeAHTx0 = millis();
     static float persisted_aht_tempc;
@@ -77,15 +78,15 @@ void MeasureAHTTempHum() {
     sensors_event_t ahtTempC, ahtHum;
     if (!ahtSensor.getEvent(&ahtHum, &ahtTempC)) // get sensor data
     {
-      Log.error(F("Failed to read from sensor AHTx0!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from sensor AHTx0!" CR));
       return;
     }
 
     // Check if reads failed and exit early (to try again).
     if (isnan(ahtTempC.temperature) || isnan(ahtHum.relative_humidity)) {
-      Log.error(F("Failed to read from sensor AHTx0!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from sensor AHTx0!" CR));
     } else {
-      Log.notice(F("Creating AHTx0 buffer" CR));
+      THEENGS_LOG_NOTICE(F("Creating AHTx0 buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> AHTx0dataBuffer;
       JsonObject AHTx0data = AHTx0dataBuffer.to<JsonObject>();
       // Generate Temperature in degrees C
@@ -94,17 +95,17 @@ void MeasureAHTTempHum() {
         AHTx0data["tempc"] = (float)ahtTempC.temperature;
         AHTx0data["tempf"] = (float)ahtTempF;
       } else {
-        Log.notice(F("Same Temp. Don't send it" CR));
+        THEENGS_LOG_NOTICE(F("Same Temp. Don't send it" CR));
       }
 
       // Generate Humidity in percent
       if (ahtHum.relative_humidity != persisted_aht_hum || AHTx0_always) {
         AHTx0data["hum"] = (float)ahtHum.relative_humidity;
       } else {
-        Log.notice(F("Same Humidity. Don't send it" CR));
+        THEENGS_LOG_NOTICE(F("Same Humidity. Don't send it" CR));
       }
       AHTx0data["origin"] = AHTTOPIC;
-      handleJsonEnqueue(AHTx0data);
+      enqueueJsonObject(AHTx0data);
     }
     persisted_aht_tempc = ahtTempC.temperature;
     persisted_aht_hum = ahtHum.relative_humidity;
diff --git a/main/ZsensorBH1750.ino b/main/sensorBH1750.cpp
similarity index 74%
rename from main/ZsensorBH1750.ino
rename to main/sensorBH1750.cpp
index aca97bb..a6ad869 100644
--- a/main/ZsensorBH1750.ino
+++ b/main/sensorBH1750.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This is the Light Meter Addon:
@@ -11,13 +11,13 @@
    Connection Schemata:
    --------------------
 
-   BH1750 ------> Arduino Uno ----------> ESP8266
+   BH1750 ------> ESP8266
    ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
-   ADD ---------> N/C (Not Connected) --> N/C (Not Connected)
+   Vcc ---------> Vu (5V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
+   ADD ---------> N/C (Not Connected)
  
     Copyright: (c) Hans-Juergen Dinges
   
@@ -39,11 +39,17 @@
 #include "User_config.h"
 
 #ifdef ZsensorBH1750
+#  include "TheengsCommon.h"
 #  include "Wire.h" // Library for communication with I2C / TWI devices
+#  include "config_BH1750.h"
 #  include "math.h" // Library for trig and exponential functions
 
+//Time used to wait for an interval before resending measured values
+static unsigned long timebh1750 = 0;
+static int BH1750_i2c_addr = BH1750_I2C_ADDR;
+
 void setupZsensorBH1750() {
-  Log.notice(F("Setup BH1750 on adress: %H" CR), BH1750_i2c_addr);
+  THEENGS_LOG_NOTICE(F("Setup BH1750 on adress: %H" CR), BH1750_i2c_addr);
   Wire.begin();
   Wire.beginTransmission(BH1750_i2c_addr);
   Wire.write(0x10); // Set resolution to 1 Lux
@@ -53,7 +59,7 @@ void setupZsensorBH1750() {
 
 void MeasureLightIntensity() {
   if (millis() > (timebh1750 + TimeBetweenReadingBH1750)) { //retrieving value of Lux, FtCd and Wattsm2 from BH1750
-    Log.trace(F("Creating BH1750 buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating BH1750 buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> BH1750dataBuffer;
     JsonObject BH1750data = BH1750dataBuffer.to<JsonObject>();
 
@@ -69,7 +75,7 @@ void MeasureLightIntensity() {
     // Check if reads failed and exit early (to try again).
     Wire.requestFrom(BH1750_i2c_addr, 2);
     if (Wire.available() != 2) {
-      Log.error(F("Failed to read from LightSensor BH1750!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from LightSensor BH1750!" CR));
     } else {
       i = Wire.read();
       i <<= 8;
@@ -84,24 +90,24 @@ void MeasureLightIntensity() {
       if (Lux != persistedll || bh1750_always) {
         BH1750data["lux"] = (unsigned int)Lux;
       } else {
-        Log.trace(F("Same lux don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same lux don't send it" CR));
       }
 
       // Generate FtCd
       if (ftcd != persistedlf || bh1750_always) {
         BH1750data["ftcd"] = (unsigned int)ftcd;
       } else {
-        Log.trace(F("Same ftcd don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same ftcd don't send it" CR));
       }
 
       // Generate Watts/m2
       if (Wattsm2 != persistedlw || bh1750_always) {
         BH1750data["wattsm2"] = (unsigned int)Wattsm2;
       } else {
-        Log.trace(F("Same wattsm2 don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same wattsm2 don't send it" CR));
       }
       BH1750data["origin"] = subjectBH1750toMQTT;
-      handleJsonEnqueue(BH1750data);
+      enqueueJsonObject(BH1750data);
     }
     persistedll = Lux;
     persistedlf = ftcd;
diff --git a/main/ZsensorBME280.ino b/main/sensorBME280.cpp
similarity index 78%
rename from main/ZsensorBME280.ino
rename to main/sensorBME280.cpp
index 0088730..aad8612 100644
--- a/main/ZsensorBME280.ino
+++ b/main/sensorBME280.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This is the Climate Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   BME280/BMP280 ------> Arduino Uno ----------> ESP8266
+   BME280/BMP280 ------> ESP8266
    =====================================================
-   Vcc ----------------> 5V/3.3V     ----------> 5V/3.3V    (5V or 3.3V depends on the BME280/BMP280 board variant)
-   GND ----------------> GND         ----------> GND
-   SCL ----------------> Pin A5      ----------> D1
-   SDA ----------------> Pin A4      ----------> D2
+   Vcc ----------------> 5V/3.3V    (5V or 3.3V depends on the BME280/BMP280 board variant)
+   GND ----------------> GND
+   SCL ----------------> D1
+   SDA ----------------> D2
 
     Copyright: (c) Hans-Juergen Dinges
 
@@ -43,22 +43,22 @@
 #  include <stdint.h>
 
 #  include "SparkFunBME280.h"
+#  include "TheengsCommon.h"
 #  include "Wire.h" // Library for communication with I2C / TWI devices
+#  include "config_BME280.h"
 
-//Global sensor object
-BME280 mySensor;
+//Time used to wait for an interval before resending measured values
+static unsigned long timebme280 = 0;
+static int BME280_i2c_addr = BME280_I2C_ADDR; // Default I2C address for BME280 is 0x76, for BMP280 is 0x77
+static BME280 mySensor;
 
 void setupZsensorBME280() {
-#  if defined(ESP8266) || defined(ESP32)
   // Allow custom pins on ESP Platforms
   Wire.begin(BME280_PIN_SDA, BME280_PIN_SCL);
-#  else
-  Wire.begin();
-#  endif
 
   mySensor.settings.commInterface = I2C_MODE;
   mySensor.settings.I2CAddress = BME280_i2c_addr;
-  Log.notice(F("Setup BME280/BMP280 on address: %X" CR), BME280_i2c_addr);
+  THEENGS_LOG_NOTICE(F("Setup BME280/BMP280 on address: %X" CR), BME280_i2c_addr);
   //***Operation settings*****************************//
 
   // runMode Setting - Values:
@@ -117,11 +117,11 @@ void setupZsensorBME280() {
 
   int ret = mySensor.begin();
   if (ret == 0x60) {
-    Log.notice(F("Bosch BME280 successfully initialized: %X" CR), ret);
+    THEENGS_LOG_NOTICE(F("Bosch BME280 successfully initialized: %X" CR), ret);
   } else if (ret == 0x58) {
-    Log.notice(F("Bosch BMP280 successfully initialized: %X" CR), ret);
+    THEENGS_LOG_NOTICE(F("Bosch BMP280 successfully initialized: %X" CR), ret);
   } else {
-    Log.notice(F("Bosch BME280/BMP280 failed: %X" CR), ret);
+    THEENGS_LOG_NOTICE(F("Bosch BME280/BMP280 failed: %X" CR), ret);
   }
 }
 
@@ -144,55 +144,55 @@ void MeasureTempHumAndPressure() {
 
     // Check if reads failed and exit early (to try again).
     if (isnan(BmeTempC) || isnan(BmeTempF) || isnan(BmeHum) || isnan(BmePa) || isnan(BmeAltiM) || isnan(BmeAltiFt)) {
-      Log.error(F("Failed to read from BME280/BMP280!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from BME280/BMP280!" CR));
     } else {
-      Log.trace(F("Creating BME280/BMP280 buffer" CR));
+      THEENGS_LOG_TRACE(F("Creating BME280/BMP280 buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> BME280dataBuffer;
       JsonObject BME280data = BME280dataBuffer.to<JsonObject>();
       // Generate Temperature in degrees C
       if (BmeTempC != persisted_bme_tempc || bme280_always) {
         BME280data["tempc"] = (float)BmeTempC;
       } else {
-        Log.trace(F("Same Degrees C don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same Degrees C don't send it" CR));
       }
 
       // Generate Temperature in degrees F
       if (BmeTempF != persisted_bme_tempf || bme280_always) {
         BME280data["tempf"] = (float)BmeTempF;
       } else {
-        Log.trace(F("Same Degrees F don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same Degrees F don't send it" CR));
       }
 
       // Generate Humidity in percent
       if (BmeHum != persisted_bme_hum || bme280_always) {
         BME280data["hum"] = (float)BmeHum;
       } else {
-        Log.trace(F("Same Humidity don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same Humidity don't send it" CR));
       }
 
       // Generate Pressure in Pa
       if (BmePa != persisted_bme_pa || bme280_always) {
         BME280data["pa"] = (float)BmePa;
       } else {
-        Log.trace(F("Same Pressure don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same Pressure don't send it" CR));
       }
 
       // Generate Altitude in Meter
       if (BmeAltiM != persisted_bme_altim || bme280_always) {
-        Log.trace(F("Sending Altitude Meter to MQTT" CR));
+        THEENGS_LOG_TRACE(F("Sending Altitude Meter to MQTT" CR));
         BME280data["altim"] = (float)BmeAltiM;
       } else {
-        Log.trace(F("Same Altitude Meter don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same Altitude Meter don't send it" CR));
       }
 
       // Generate Altitude in Feet
       if (BmeAltiFt != persisted_bme_altift || bme280_always) {
         BME280data["altift"] = (float)BmeAltiFt;
       } else {
-        Log.trace(F("Same Altitude Feet don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same Altitude Feet don't send it" CR));
       }
       BME280data["origin"] = BMETOPIC;
-      handleJsonEnqueue(BME280data);
+      enqueueJsonObject(BME280data);
     }
 
     persisted_bme_tempc = BmeTempC;
diff --git a/main/ZsensorC37_YL83_HMRD.ino b/main/sensorC37_YL83_HMRD.cpp
similarity index 75%
rename from main/ZsensorC37_YL83_HMRD.ino
rename to main/sensorC37_YL83_HMRD.cpp
index b93adda..2f85cd6 100644
--- a/main/ZsensorC37_YL83_HMRD.ino
+++ b/main/sensorC37_YL83_HMRD.cpp
@@ -1,5 +1,5 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your 433mhz/infrared IR/BLE signal  and a MQTT broker 
    Send and receiving command by MQTT
@@ -24,6 +24,8 @@
 #include "User_config.h"
 
 #ifdef ZsensorC37_YL83_HMRD
+#  include "TheengsCommon.h"
+#  include "config_C37_YL83_HMRD.h"
 
 //Time used to wait for an interval before resending temp and hum
 unsigned long timeC37YL83HMRD = 0;
@@ -32,14 +34,14 @@ unsigned int persisteddigital = 0;
 
 void setupZsensorC37_YL83_HMRD() {
   pinMode(C37_YL83_HMRD_Digital_GPIO, INPUT);
-  Log.trace(F("C37_YL83_HMRD: digital configured pin: %d" CR), C37_YL83_HMRD_Digital_GPIO);
+  THEENGS_LOG_TRACE(F("C37_YL83_HMRD: digital configured pin: %d" CR), C37_YL83_HMRD_Digital_GPIO);
 
   pinMode(C37_YL83_HMRD_Analog_GPIO, INPUT);
-  Log.trace(F("C37_YL83_HMRD: Analog configured pin: %d" CR), C37_YL83_HMRD_Analog_GPIO);
+  THEENGS_LOG_TRACE(F("C37_YL83_HMRD: Analog configured pin: %d" CR), C37_YL83_HMRD_Analog_GPIO);
 
 #  ifdef C37_YL83_HMRD_Analog_RESOLUTION
   analogReadResolution(C37_YL83_HMRD_Analog_RESOLUTION);
-  Log.trace(F("C37_YL83_HMRD: resolution: %d" CR), C37_YL83_HMRD_Analog_RESOLUTION);
+  THEENGS_LOG_TRACE(F("C37_YL83_HMRD: resolution: %d" CR), C37_YL83_HMRD_Analog_RESOLUTION);
 #  endif
 }
 
@@ -52,27 +54,26 @@ void MeasureC37_YL83_HMRDWater() {
     int sensorDigitalValue = digitalRead(C37_YL83_HMRD_Digital_GPIO); // Read the analog value from sensor
     int sensorAnalogValue = analogRead(C37_YL83_HMRD_Analog_GPIO);
 
-    Log.trace(F("Creating C37_YL83_HMRD buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating C37_YL83_HMRD buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> C37_YL83_HMRDdataBuffer;
     JsonObject C37_YL83_HMRDdata = C37_YL83_HMRDdataBuffer.to<JsonObject>();
     if (sensorDigitalValue != persisteddigital || C37_YL83_HMRD_ALWAYS) {
       C37_YL83_HMRDdata["detected"] = (sensorDigitalValue == 1 ? "false" : "true");
     } else {
-      Log.trace(F("Same digital don't send it" CR));
+      THEENGS_LOG_TRACE(F("Same digital don't send it" CR));
     }
     if (sensorAnalogValue != persistedanalog || C37_YL83_HMRD_ALWAYS) {
       C37_YL83_HMRDdata["reading"] = sensorAnalogValue;
     } else {
-      Log.trace(F("Same analog don't send it" CR));
+      THEENGS_LOG_TRACE(F("Same analog don't send it" CR));
     }
     if (C37_YL83_HMRDdata.size() > 0) {
       C37_YL83_HMRDdata["origin"] = C37_YL83_HMRD_TOPIC;
-      handleJsonEnqueue(C37_YL83_HMRDdata);
-      delay(10);
-#  if defined(DEEP_SLEEP_IN_US) || defined(ESP32_EXT0_WAKE_PIN)
-      if (sensorDigitalValue == 1) //No water detected, all good we can sleep
-        ready_to_sleep = true;
-#  endif
+      enqueueJsonObject(C37_YL83_HMRDdata);
+      if (sensorDigitalValue == 1) { //No water detected, all good we can sleep
+        if (SYSConfig.powerMode > 0)
+          ready_to_sleep = true;
+      }
     }
     persistedanalog = sensorAnalogValue;
     persisteddigital = sensorDigitalValue;
diff --git a/main/ZsensorDHT.ino b/main/sensorDHT.cpp
similarity index 77%
rename from main/ZsensorDHT.ino
rename to main/sensorDHT.cpp
index 70c72c0..475ce85 100644
--- a/main/ZsensorDHT.ino
+++ b/main/sensorDHT.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     DHT reading Addon
@@ -33,13 +33,16 @@
 #  include <DHT.h>
 #  include <DHT_U.h>
 
+#  include "TheengsCommon.h"
+#  include "config_DHT.h"
+
 DHT dht(DHT_RECEIVER_GPIO, DHT_SENSOR_TYPE);
 
 //Time used to wait for an interval before resending temp and hum
 unsigned long timedht = 0;
 
 void setupDHT() {
-  Log.notice(F("Reading DHT on pin: %d" CR), DHT_RECEIVER_GPIO);
+  THEENGS_LOG_NOTICE(F("Reading DHT on pin: %d" CR), DHT_RECEIVER_GPIO);
 }
 
 void MeasureTempAndHum() {
@@ -52,24 +55,24 @@ void MeasureTempAndHum() {
     float t = dht.readTemperature();
     // Check if any reads failed and exit early (to try again).
     if (isnan(h) || isnan(t)) {
-      Log.error(F("Failed to read from DHT sensor!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from DHT sensor!" CR));
     } else {
-      Log.trace(F("Creating DHT buffer" CR));
+      THEENGS_LOG_TRACE(F("Creating DHT buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> DHTdataBuffer;
       JsonObject DHTdata = DHTdataBuffer.to<JsonObject>();
       if (h != persistedh || dht_always) {
         DHTdata["hum"] = (float)h;
       } else {
-        Log.trace(F("Same hum don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same hum don't send it" CR));
       }
       if (t != persistedt || dht_always) {
         DHTdata["tempc"] = (float)t;
         DHTdata["tempf"] = dht.convertCtoF(t);
       } else {
-        Log.trace(F("Same temp don't send it" CR));
+        THEENGS_LOG_TRACE(F("Same temp don't send it" CR));
       }
       DHTdata["origin"] = DHTTOPIC;
-      handleJsonEnqueue(DHTdata);
+      enqueueJsonObject(DHTdata);
     }
     persistedh = h;
     persistedt = t;
diff --git a/main/ZsensorDS1820.ino b/main/sensorDS1820.cpp
similarity index 72%
rename from main/ZsensorDS1820.ino
rename to main/sensorDS1820.cpp
index 4c55bc5..3cfd05c 100644
--- a/main/ZsensorDS1820.ino
+++ b/main/sensorDS1820.cpp
@@ -1,5 +1,5 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
    Act as a wifi or ethernet gateway between your 433mhz/infrared IR/BLE signal  and a MQTT broker 
    Send and receiving command by MQTT
@@ -29,6 +29,9 @@
 #  include <DallasTemperature.h>
 #  include <OneWire.h>
 
+#  include "TheengsCommon.h"
+#  include "config_DS1820.h"
+
 OneWire owbus(DS1820_OWBUS_GPIO);
 DallasTemperature ds1820(&owbus);
 DeviceAddress ds1820_address, ds1820_devices[OW_MAX_SENSORS];
@@ -38,15 +41,24 @@ static uint8_t ds1820_resolution[OW_MAX_SENSORS];
 static String ds1820_type[OW_MAX_SENSORS];
 static String ds1820_addr[OW_MAX_SENSORS];
 
+extern void createDiscovery(const char* sensor_type,
+                            const char* st_topic, const char* s_name, const char* unique_id,
+                            const char* availability_topic, const char* device_class, const char* value_template,
+                            const char* payload_on, const char* payload_off, const char* unit_of_meas,
+                            int off_delay,
+                            const char* payload_available, const char* payload_not_available, bool gateway_entity, const char* cmd_topic,
+                            const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_id, bool retainCmd,
+                            const char* state_class, const char* state_off, const char* state_on, const char* enum_options, const char* command_template);
+
 void setupZsensorDS1820() {
-  Log.trace(F("DS1820: configured pin: %d for 1-wire bus" CR), DS1820_OWBUS_GPIO);
+  THEENGS_LOG_TRACE(F("DS1820: configured pin: %d for 1-wire bus" CR), DS1820_OWBUS_GPIO);
   ds1820.begin();
 
   // Search the OneWire bus for all devices
   uint8_t numDevicesOnBus = ds1820.getDeviceCount();
 
   // locate device(s) on 1-wire bus
-  Log.notice(F("DS1820: Found %d devices" CR), numDevicesOnBus);
+  THEENGS_LOG_NOTICE(F("DS1820: Found %d devices" CR), numDevicesOnBus);
 
   // Cycle though all of the devices on the OneWire bus
   for (int deviceIndex = 0; deviceIndex < numDevicesOnBus && ds1820_count < OW_MAX_SENSORS; deviceIndex++) {
@@ -79,17 +91,17 @@ void setupZsensorDS1820() {
         ds1820.setResolution(ds1820_address, DS1820_RESOLUTION);
       }
       ds1820_resolution[ds1820_count] = ds1820.getResolution(ds1820_address);
-      Log.trace(F("DS1820: Device %d, Type: %s, Address: %s, Resolution: %d" CR),
-                ds1820_count,
-                (char*)ds1820_type[ds1820_count].c_str(),
-                (char*)ds1820_addr[ds1820_count].c_str(),
-                ds1820_resolution[ds1820_count]);
+      THEENGS_LOG_TRACE(F("DS1820: Device %d, Type: %s, Address: %s, Resolution: %d" CR),
+                        ds1820_count,
+                        (char*)ds1820_type[ds1820_count].c_str(),
+                        (char*)ds1820_addr[ds1820_count].c_str(),
+                        ds1820_resolution[ds1820_count]);
       ds1820_count++;
     }
   }
 
   if (ds1820.getDS18Count() == 0) {
-    Log.error(F("DS1820: Failed to enumerate sensors on 1-wire bus. Check your GPIO assignment!" CR));
+    THEENGS_LOG_ERROR(F("DS1820: Failed to enumerate sensors on 1-wire bus. Check your GPIO assignment!" CR));
   }
 
   // make requestTemperatures() non-blocking
@@ -100,6 +112,8 @@ void setupZsensorDS1820() {
 void pubOneWire_HADiscovery() {
   // If zmqttDiscovery is enabled, create a sensor topic for each DS18b20 sensor found on the bus, using addr as uniqueID
 #  ifdef ZmqttDiscovery
+#    include "config_mqttDiscovery.h"
+
   // If zmqtt discovery is enabled, create a sensor topic for each DS18b20 sensor found on the bus, using addr as uniqueID
   if (SYSConfig.discovery) {
     for (int index = 0; index < ds1820_count; index++) {
@@ -108,9 +122,9 @@ void pubOneWire_HADiscovery() {
                       (char*)("DS12B20_" + String(index + 1) + "_c").c_str(),
                       (char*)(ds1820_addr[index] + "_c").c_str(),
                       will_Topic,
-                      "temperature",
+                      HASS_CLASS_TEMPERATURE,
                       jsonTempc,
-                      "", "", "°C",
+                      "", "", HASS_UNIT_CELSIUS,
                       0, "", "", true, "",
                       "", "", "", "", false,
                       stateClassMeasurement // state class
@@ -129,7 +143,7 @@ void MeasureDS1820Temp() {
   // trigger temperature conversion some time before actually
   // calling getTempC() to make reading temperatures non-blocking
   if (!triggeredConversion && ((millis() - timeDS1820) > (DS1820_INTERVAL_SEC * 1000UL - DS1820_CONV_TIME))) {
-    Log.trace(F("DS1820: Trigger temperature conversion..." CR));
+    THEENGS_LOG_TRACE(F("DS1820: Trigger temperature conversion..." CR));
     ds1820.requestTemperatures();
     triggeredConversion = true;
   } else if (triggeredConversion && ((millis() - timeDS1820) > DS1820_INTERVAL_SEC * 1000UL)) {
@@ -137,16 +151,16 @@ void MeasureDS1820Temp() {
     triggeredConversion = false;
 
     if (ds1820_count < 1) {
-      Log.error(F("DS1820: Failed to identify any temperature sensors on 1-wire bus during setup!" CR));
+      THEENGS_LOG_ERROR(F("DS1820: Failed to identify any temperature sensors on 1-wire bus during setup!" CR));
     } else {
-      Log.trace(F("DS1820: Reading temperature(s) from %d sensor(s)..." CR), ds1820_count);
+      THEENGS_LOG_TRACE(F("DS1820: Reading temperature(s) from %d sensor(s)..." CR), ds1820_count);
       StaticJsonDocument<JSON_MSG_BUFFER> DS1820dataBuffer;
       JsonObject DS1820data = DS1820dataBuffer.to<JsonObject>();
 
       for (uint8_t i = 0; i < ds1820_count; i++) {
         current_temp[i] = round(ds1820.getTempC(ds1820_devices[i]) * 10) / 10.0;
         if (current_temp[i] == -127) {
-          Log.error(F("DS1820: Device %s currently disconnected!" CR), (char*)ds1820_addr[i].c_str());
+          THEENGS_LOG_ERROR(F("DS1820: Device %s currently disconnected!" CR), (char*)ds1820_addr[i].c_str());
         } else if (DS1820_ALWAYS || current_temp[i] != persisted_temp[i]) {
           DS1820data["tempf"] = (float)DallasTemperature::toFahrenheit(current_temp[i]);
           DS1820data["tempc"] = (float)current_temp[i];
@@ -158,13 +172,11 @@ void MeasureDS1820Temp() {
           }
           String origin = String(OW_TOPIC) + "/" + ds1820_addr[i];
           DS1820data["origin"] = origin;
-          handleJsonEnqueue(DS1820data);
-          delay(10);
-#  if defined(DEEP_SLEEP_IN_US) || defined(ESP32_EXT0_WAKE_PIN)
-          ready_to_sleep = true;
-#  endif
+          enqueueJsonObject(DS1820data);
+          if (SYSConfig.powerMode > 0)
+            ready_to_sleep = true;
         } else {
-          Log.trace(F("DS1820: Temperature for device %s didn't change, don't publish it." CR), (char*)ds1820_addr[i].c_str());
+          THEENGS_LOG_TRACE(F("DS1820: Temperature for device %s didn't change, don't publish it." CR), (char*)ds1820_addr[i].c_str());
         }
         persisted_temp[i] = current_temp[i];
       }
diff --git a/main/ZsensorGPIOInput.ino b/main/sensorGPIOInput.cpp
similarity index 84%
rename from main/ZsensorGPIOInput.ino
rename to main/sensorGPIOInput.cpp
index 113d89c..b74f1be 100644
--- a/main/ZsensorGPIOInput.ino
+++ b/main/sensorGPIOInput.cpp
@@ -1,6 +1,6 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     GPIO Input derived from HC SR-501 reading Addon and https://www.arduino.cc/en/Tutorial/Debounce
@@ -29,6 +29,12 @@
 #include "User_config.h"
 
 #ifdef ZsensorGPIOInput
+#  include "TheengsCommon.h"
+#  include "config_GPIOInput.h"
+
+extern void ActuatorTrigger();
+extern void eraseConfig();
+
 #  if defined(TRIGGER_GPIO) && INPUT_GPIO == TRIGGER_GPIO
 unsigned long resetTime = 0;
 #  endif
@@ -37,7 +43,7 @@ int InputState = 3; // Set to 3 so that it reads on startup
 int previousInputState = 3;
 
 void setupGPIOInput() {
-  Log.notice(F("Reading GPIO at pin: %d" CR), INPUT_GPIO);
+  THEENGS_LOG_NOTICE(F("Reading GPIO at pin: %d" CR), INPUT_GPIO);
   pinMode(INPUT_GPIO, GPIO_INPUT_TYPE); // declare GPIOInput pin as input_pullup to prevent floating. Pin will be high when not connected to ground
 }
 
@@ -57,17 +63,14 @@ void MeasureGPIOInput() {
   if ((millis() - lastDebounceTime) > GPIOInputDebounceDelay) {
     // whatever the reading is at, it's been there for longer than the debounce
     // delay, so take it as the actual current state:
-#  if defined(ESP8266) || defined(ESP32)
     yield();
-#  endif
 #  if defined(TRIGGER_GPIO) && INPUT_GPIO == TRIGGER_GPIO && !defined(ESPWifiManualSetup)
     if (reading == LOW) {
       if (resetTime == 0) {
         resetTime = millis();
       } else if ((millis() - resetTime) > 3000) {
-        Log.trace(F("Button Held" CR));
-        InfoIndicatorOFF();
-        SendReceiveIndicatorOFF();
+        THEENGS_LOG_TRACE(F("Button Held" CR));
+        gatewayState = GatewayState::WAITING_ONBOARDING;
 // Switching off the relay during reset or failsafe operations
 #    ifdef ZactuatorONOFF
         uint8_t level = digitalRead(ACTUATOR_ONOFF_GPIO);
@@ -75,8 +78,8 @@ void MeasureGPIOInput() {
           ActuatorTrigger();
         }
 #    endif
-        Log.notice(F("Erasing ESP Config, restarting" CR));
-        setupwifi(true);
+        THEENGS_LOG_NOTICE(F("Erasing ESP Config, restarting" CR));
+        eraseConfig();
       }
     } else {
       resetTime = 0;
@@ -84,7 +87,7 @@ void MeasureGPIOInput() {
 #  endif
     // if the Input state has changed:
     if (reading != InputState) {
-      Log.trace(F("Creating GPIOInput buffer" CR));
+      THEENGS_LOG_TRACE(F("Creating GPIOInput buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> GPIOdataBuffer;
       JsonObject GPIOdata = GPIOdataBuffer.to<JsonObject>();
       if (InputState == HIGH) {
@@ -94,7 +97,7 @@ void MeasureGPIOInput() {
         GPIOdata["gpio"] = "LOW";
       }
       GPIOdata["origin"] = subjectGPIOInputtoMQTT;
-      handleJsonEnqueue(GPIOdata);
+      enqueueJsonObject(GPIOdata);
 
 #  if defined(ZactuatorONOFF) && defined(ACTUATOR_TRIGGER)
       //Trigger the actuator if we are not at startup
diff --git a/main/ZsensorGPIOKeyCode.ino b/main/sensorGPIOKeyCode.cpp
similarity index 88%
rename from main/ZsensorGPIOKeyCode.ino
rename to main/sensorGPIOKeyCode.cpp
index 4e2189b..1f654b0 100644
--- a/main/ZsensorGPIOKeyCode.ino
+++ b/main/sensorGPIOKeyCode.cpp
@@ -1,6 +1,6 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     GPIO KeyCode derived from  GPIO Input
@@ -26,6 +26,8 @@
 #include "User_config.h"
 
 #ifdef ZsensorGPIOKeyCode
+#  include "TheengsCommon.h"
+#  include "config_GPIOKeyCode.h"
 
 int InputStateGPIOKeyCode = 0x0f; // Set to 3 so that it reads on startup
 int lastInputStateGPIOKeyCode = 0x0f;
@@ -49,9 +51,7 @@ void MeasureGPIOKeyCode() {
   {
     // whatever the reading is at, it's been there for longer than the debounce
     // delay, so take it as the actual current state:
-#  if defined(ESP8266) || defined(ESP32)
     yield();
-#  endif
     // if the Input state has changed:
     if (latch > 0 && lastLatchStateGPIOKeyCode != latch) {
       int reading = digitalRead(GPIOKeyCode_D0_GPIO) | (digitalRead(GPIOKeyCode_D1_GPIO) << 1) | (digitalRead(GPIOKeyCode_D2_GPIO) << 2);
@@ -62,14 +62,14 @@ void MeasureGPIOKeyCode() {
       InputStateGPIOKeyCode = reading;
       sprintf(hex, "%02x", InputStateGPIOKeyCode);
       hex[2] = 0;
-      Log.notice(F("GPIOKeyCode %H" CR), hex);
+      THEENGS_LOG_NOTICE(F("GPIOKeyCode %H" CR), hex);
       pub(subjectGPIOKeyCodetoMQTT, hex);
       lastLatchStateGPIOKeyCode = latch;
     }
 
     if (latch != lastLatchStateGPIOKeyCode) {
       lastLatchStateGPIOKeyCode = latch;
-      Log.notice(F("GPIOKeyCode latch %d" CR), latch);
+      THEENGS_LOG_NOTICE(F("GPIOKeyCode latch %d" CR), latch);
       if (latch == 0)
         pub(subjectGPIOKeyCodeStatetoMQTT, "done");
     }
diff --git a/main/ZsensorHCSR04.ino b/main/sensorHCSR04.cpp
similarity index 73%
rename from main/ZsensorHCSR04.ino
rename to main/sensorHCSR04.cpp
index eed7840..51ba6f1 100644
--- a/main/ZsensorHCSR04.ino
+++ b/main/sensorHCSR04.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker  
    Send and receiving command by MQTT
  
     HC SR-04 reading Addon
@@ -30,12 +30,14 @@
 #include "User_config.h"
 
 #ifdef ZsensorHCSR04
+#  include "TheengsCommon.h"
+#  include "config_HCSR04.h"
 
 unsigned long timeHCSR04 = 0;
 
 void setupHCSR04() {
-  Log.notice(F("HCSR04 trigger pin: %d" CR), HCSR04_TRI_GPIO);
-  Log.notice(F("HCSR04 echo pin: %d" CR), HCSR04_ECH_GPIO);
+  THEENGS_LOG_NOTICE(F("HCSR04 trigger pin: %d" CR), HCSR04_TRI_GPIO);
+  THEENGS_LOG_NOTICE(F("HCSR04 echo pin: %d" CR), HCSR04_ECH_GPIO);
   pinMode(HCSR04_TRI_GPIO, OUTPUT); // declare HC SR-04 trigger GPIO as output
   pinMode(HCSR04_ECH_GPIO, INPUT); // declare HC SR-04 echo GPIO as input
 }
@@ -43,7 +45,7 @@ void setupHCSR04() {
 void MeasureDistance() {
   if (millis() > (timeHCSR04 + TimeBetweenReadingHCSR04)) {
     timeHCSR04 = millis();
-    Log.trace(F("Creating HCSR04 buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating HCSR04 buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> HCSR04dataBuffer;
     JsonObject HCSR04data = HCSR04dataBuffer.to<JsonObject>();
     digitalWrite(HCSR04_TRI_GPIO, LOW);
@@ -53,23 +55,23 @@ void MeasureDistance() {
     digitalWrite(HCSR04_TRI_GPIO, LOW);
     unsigned long duration = pulseIn(HCSR04_ECH_GPIO, HIGH);
     if (isnan(duration)) {
-      Log.error(F("Failed to read from HC SR04 sensor!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from HC SR04 sensor!" CR));
     } else {
       static unsigned int distance = 99999;
       unsigned int d = duration / 58.2;
       HCSR04data["distance"] = (int)d;
       if (d > distance) {
         HCSR04data["direction"] = "away";
-        Log.trace(F("HC SR04 Distance changed" CR));
+        THEENGS_LOG_TRACE(F("HC SR04 Distance changed" CR));
       } else if (d < distance) {
         HCSR04data["direction"] = "towards";
-        Log.trace(F("HC SR04 Distance changed" CR));
+        THEENGS_LOG_TRACE(F("HC SR04 Distance changed" CR));
       } else if (HCSR04_always) {
         HCSR04data["direction"] = "static";
-        Log.trace(F("HC SR04 Distance hasn't changed" CR));
+        THEENGS_LOG_TRACE(F("HC SR04 Distance hasn't changed" CR));
       }
       distance = d;
-      handleJsonEnqueue(HCSR04data);
+      enqueueJsonObject(HCSR04data);
     }
   }
 }
diff --git a/main/ZsensorHCSR501.ino b/main/sensorHCSR501.cpp
similarity index 85%
rename from main/ZsensorHCSR501.ino
rename to main/sensorHCSR501.cpp
index 83b2dc9..10e7fc8 100644
--- a/main/ZsensorHCSR501.ino
+++ b/main/sensorHCSR501.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     HC SR-501 reading Addon
@@ -29,9 +29,11 @@
 #include "User_config.h"
 
 #ifdef ZsensorHCSR501
+#  include "TheengsCommon.h"
+#  include "config_HCSR501.h"
 
 void setupHCSR501() {
-  Log.notice(F("HCSR501 pin: %d" CR), HCSR501_GPIO);
+  THEENGS_LOG_NOTICE(F("HCSR501 pin: %d" CR), HCSR501_GPIO);
   pinMode(HCSR501_GPIO, INPUT); // declare HC SR-501 GPIO as input
 #  ifdef HCSR501_LED_NOTIFY_GPIO
   pinMode(HCSR501_LED_NOTIFY_GPIO, OUTPUT);
@@ -45,9 +47,7 @@ void MeasureHCSR501() {
     JsonObject HCSR501data = HCSR501dataBuffer.to<JsonObject>();
     static int pirState = LOW;
     int PresenceValue = digitalRead(HCSR501_GPIO);
-#  if defined(ESP8266) || defined(ESP32)
     yield();
-#  endif
     if (PresenceValue == HIGH) {
       if (pirState == LOW) {
         //turned on
@@ -66,7 +66,7 @@ void MeasureHCSR501() {
 #  endif
     if (HCSR501data.size() > 0) {
       HCSR501data["origin"] = subjectHCSR501toMQTT;
-      handleJsonEnqueue(HCSR501data);
+      enqueueJsonObject(HCSR501data);
     }
   }
 }
diff --git a/main/ZsensorHTU21.ino b/main/sensorHTU21.cpp
similarity index 77%
rename from main/ZsensorHTU21.ino
rename to main/sensorHTU21.cpp
index 7b6445c..b37c72a 100644
--- a/main/ZsensorHTU21.ino
+++ b/main/sensorHTU21.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
  
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
    
    This is the Climate Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   HTU21 ------> Arduino Uno ----------> ESP8266
+   HTU21 ------> ESP8266
    ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
+   Vcc ---------> Vu (5V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
    
     This file is part of OpenMQTTGateway.
     
@@ -41,6 +41,7 @@
 #  include <stdint.h>
 
 #  include "SparkFunHTU21D.h"
+#  include "TheengsCommon.h"
 #  include "Wire.h" // Library for communication with I2C / TWI devices
 #  include "config_HTU21.h"
 
@@ -52,7 +53,7 @@ HTU21D htuSensor;
 
 void setupZsensorHTU21() {
   delay(10); // Gives the Sensor enough time to turn on
-  Log.notice(F("HTU21 Initialized - begin()" CR));
+  THEENGS_LOG_NOTICE(F("HTU21 Initialized - begin()" CR));
 
 #  if defined(ESP32)
   Wire.begin(I2C_SDA, I2C_SCL);
@@ -64,7 +65,7 @@ void setupZsensorHTU21() {
 
 void MeasureTempHum() {
   if (millis() > (timehtu21 + TimeBetweenReadinghtu21)) {
-    Log.trace(F("Read HTU21 Sensor" CR));
+    THEENGS_LOG_TRACE(F("Read HTU21 Sensor" CR));
 
     timehtu21 = millis();
     static float persisted_htu_tempc;
@@ -74,15 +75,15 @@ void MeasureTempHum() {
     float HtuHum = htuSensor.readHumidity();
 
     if (HtuTempC >= 998 || HtuHum >= 998) {
-      Log.error(F("Failed to read from sensor HTU21!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from sensor HTU21!" CR));
       return;
     }
 
     // Check if reads failed and exit early (to try again).
     if (isnan(HtuTempC) || isnan(HtuHum)) {
-      Log.error(F("Failed to read from sensor HTU21!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from sensor HTU21!" CR));
     } else {
-      Log.notice(F("Creating HTU21 buffer" CR));
+      THEENGS_LOG_NOTICE(F("Creating HTU21 buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> HTU21dataBuffer;
       JsonObject HTU21data = HTU21dataBuffer.to<JsonObject>();
       // Generate Temperature in degrees C
@@ -91,17 +92,17 @@ void MeasureTempHum() {
         HTU21data["tempc"] = (float)HtuTempC;
         HTU21data["tempf"] = (float)HtuTempF;
       } else {
-        Log.notice(F("Same Temp. Don't send it" CR));
+        THEENGS_LOG_NOTICE(F("Same Temp. Don't send it" CR));
       }
 
       // Generate Humidity in percent
       if (HtuHum != persisted_htu_hum || htu21_always) {
         HTU21data["hum"] = (float)HtuHum;
       } else {
-        Log.notice(F("Same Humidity. Don't send it" CR));
+        THEENGS_LOG_NOTICE(F("Same Humidity. Don't send it" CR));
       }
       HTU21data["origin"] = HTUTOPIC;
-      handleJsonEnqueue(HTU21data);
+      enqueueJsonObject(HTU21data);
     }
     persisted_htu_tempc = HtuTempC;
     persisted_htu_hum = HtuHum;
diff --git a/main/ZsensorINA226.ino b/main/sensorINA226.cpp
similarity index 80%
rename from main/ZsensorINA226.ino
rename to main/sensorINA226.cpp
index ce2146e..85924d0 100644
--- a/main/ZsensorINA226.ino
+++ b/main/sensorINA226.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     INA226 reading Addon
@@ -37,6 +37,12 @@
 #ifdef ZsensorINA226
 #  include <Wire.h>
 
+#  include "TheengsCommon.h"
+#  include "config_INA226.h"
+
+static void writeRegister(byte reg, word value);
+static word readRegister(byte reg);
+
 float rShunt = 0.1; // Shunt Widerstand festlegen, hier 0.1 Ohm
 const int INA226_ADDR = 0x40; // A0 und A1 auf GND > Adresse 40 Hex auf Seite 18 im Datenblatt
 
@@ -52,20 +58,16 @@ void setupINA226() {
 void MeasureINA226() {
   if (millis() > (timeINA226 + TimeBetweenReadingINA226)) { //retrieving value of temperature and humidity of the box from DHT every xUL
     timeINA226 = millis();
-    Log.trace(F("Creating INA226 buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating INA226 buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> INA226dataBuffer;
     JsonObject INA226data = INA226dataBuffer.to<JsonObject>();
     // Topic on which we will send data
-    Log.trace(F("Retrieving electrical data" CR));
+    THEENGS_LOG_TRACE(F("Retrieving electrical data" CR));
     // Bus Spannung, read-only, 16Bit, 0...40.96V max., LSB 1.25mV
     float volt = readRegister(0x02) * 0.00125;
     // Seite 24: Shunt Spannung +- 81,92mV mit 16 Bit, LSB 2,5uV
-    int shuntvolt = readRegister(0x01);
-    if (shuntvolt && 0x8000) { // eine negative Zahl? Dann 2er Komplement bilden
-      shuntvolt = ~shuntvolt; // alle Bits invertieren
-      shuntvolt += 1; // 1 dazuzählen
-      shuntvolt *= -1; // negativ machen
-    }
+    // The register holds a signed two's complement value, so a reverse current reads as negative
+    int16_t shuntvolt = (int16_t)readRegister(0x01);
     float current = shuntvolt * 0.0000025 / rShunt; // * LSB / R
     float power = abs(volt * current);
 
@@ -73,11 +75,11 @@ void MeasureINA226() {
     INA226data["current"] = current;
     INA226data["power"] = power;
     INA226data["origin"] = subjectINA226toMQTT;
-    handleJsonEnqueue(INA226data);
+    enqueueJsonObject(INA226data);
   }
 }
 
-static void writeRegister(byte reg, word value) {
+void writeRegister(byte reg, word value) {
   Wire.beginTransmission(INA226_ADDR);
   Wire.write(reg);
   Wire.write((value >> 8) & 0xFF);
@@ -85,7 +87,7 @@ static void writeRegister(byte reg, word value) {
   Wire.endTransmission();
 }
 
-static word readRegister(byte reg) {
+word readRegister(byte reg) {
   word res = 0x0000;
   Wire.beginTransmission(INA226_ADDR);
   Wire.write(reg);
diff --git a/main/ZsensorLM75.ino b/main/sensorLM75.cpp
similarity index 78%
rename from main/ZsensorLM75.ino
rename to main/sensorLM75.cpp
index b30080a..f406828 100644
--- a/main/ZsensorLM75.ino
+++ b/main/sensorLM75.cpp
@@ -1,7 +1,7 @@
 /*
   OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
    This is a Temperature Addon:
@@ -13,12 +13,12 @@
    Connection Schemata:
    --------------------
 
-   LM75 ------> Arduino Uno ----------> ESP8266
+   LM75 ------> ESP8266
    ==============================================
-   Vcc ---------> 5V -------------------> Vu (5V)
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
+   Vcc ---------> Vu (5V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
 
     This file is part of OpenMQTTGateway.
 
@@ -41,6 +41,7 @@
 #  include <stdint.h>
 
 #  include "Temperature_LM75_Derived.h"
+#  include "TheengsCommon.h"
 #  include "Wire.h" // Library for communication with I2C / TWI devices
 #  include "config_LM75.h"
 
@@ -52,7 +53,7 @@ Generic_LM75 lm75Sensor;
 
 void setupZsensorLM75() {
   delay(10); // Gives the Sensor enough time to turn on
-  Log.notice(F("LM75 Initialized - begin()" CR));
+  THEENGS_LOG_NOTICE(F("LM75 Initialized - begin()" CR));
 
 #  if defined(ESP32)
   Wire.begin(I2C_SDA, I2C_SCL);
@@ -63,7 +64,7 @@ void setupZsensorLM75() {
 
 void MeasureTemp() {
   if (millis() > (timelm75 + TimeBetweenReadinglm75)) {
-    Log.trace(F("Read LM75 Sensor" CR));
+    THEENGS_LOG_TRACE(F("Read LM75 Sensor" CR));
 
     timelm75 = millis();
     static float persisted_lm75_tempc;
@@ -71,15 +72,15 @@ void MeasureTemp() {
     float lm75TempC = lm75Sensor.readTemperatureC();
 
     if (lm75TempC >= 998) {
-      Log.error(F("Failed to read from sensor LM75!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from sensor LM75!" CR));
       return;
     }
 
     // Check if reads failed and exit early (to try again).
     if (isnan(lm75TempC)) {
-      Log.error(F("Failed to read from sensor HLM75!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from sensor HLM75!" CR));
     } else {
-      Log.notice(F("Creating LM75 buffer" CR));
+      THEENGS_LOG_NOTICE(F("Creating LM75 buffer" CR));
       StaticJsonDocument<JSON_MSG_BUFFER> LM75dataBuffer;
       JsonObject LM75data = LM75dataBuffer.to<JsonObject>();
       // Generate Temperature in degrees C
@@ -88,9 +89,9 @@ void MeasureTemp() {
         LM75data["tempc"] = (float)lm75TempC;
         LM75data["tempf"] = (float)lm75TempF;
         LM75data["origin"] = LM75TOPIC;
-        handleJsonEnqueue(LM75data);
+        enqueueJsonObject(LM75data);
       } else {
-        Log.notice(F("Same Temp. Don't send it" CR));
+        THEENGS_LOG_NOTICE(F("Same Temp. Don't send it" CR));
       }
     }
     persisted_lm75_tempc = lm75TempC;
diff --git a/main/ZsensorMQ2.ino b/main/sensorMQ2.cpp
similarity index 70%
rename from main/ZsensorMQ2.ino
rename to main/sensorMQ2.cpp
index e3b00f0..99b7bce 100644
--- a/main/ZsensorMQ2.ino
+++ b/main/sensorMQ2.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This is the MQ2 GAS Sensor Addon based on modules with a MQ:
@@ -11,12 +11,12 @@
    Connection Scheme:
    --------------------
 
-   MQ-2 -------> Arduino Uno ----------> ESP8266
+   MQ-2 -------> ESP8266
    ==============================================
-   Vcc ---------> 3.3V or 5V------------> 3.3V or 5V
-   GND ---------> GND ------------------> GND
-   A0 ----------> Pin A0 ---------------> A0
-   D0 ----------> Pin D4 ---------------> D4
+   Vcc ---------> 3.3V or 5V
+   GND ---------> GND
+   A0 ----------> A0
+   D0 ----------> D4
   
     This file is part of OpenMQTTGateway.
     
@@ -36,15 +36,19 @@
 #include "User_config.h"
 
 #ifdef ZsensorMQ2
-
+#  include "TheengsCommon.h"
 #  include "Wire.h"
+#  include "config_MQ2.h"
 #  include "math.h"
 
+//Time used to wait for an interval before resending measured values
+unsigned long timemq2 = 0;
+
 void setupZsensorMQ2() {
-  Log.notice(F("Setup MQ2 detection on pin: %d" CR), MQ2SENSORDETECTPIN);
+  THEENGS_LOG_NOTICE(F("Setup MQ2 detection on pin: %d" CR), MQ2SENSORDETECTPIN);
   pinMode(MQ2SENSORDETECTPIN, INPUT); // declare GPIOInput pin as input_pullup to prevent floating. Pin will be high when not connected to ground
 
-  Log.notice(F("Starting MQ2 calibration on pin: %d" CR), MQ2SENSORADCPIN);
+  THEENGS_LOG_NOTICE(F("Starting MQ2 calibration on pin: %d" CR), MQ2SENSORADCPIN);
 
   //Simple calibrate
   float sensorValue;
@@ -53,21 +57,21 @@ void setupZsensorMQ2() {
   }
   delay(1000);
 
-  Log.trace(F("MQ2 Initialized." CR));
+  THEENGS_LOG_TRACE(F("MQ2 Initialized." CR));
 }
 
 void MeasureGasMQ2() {
   if (millis() > (timemq2 + TimeBetweenReadingmq2)) {
     timemq2 = millis();
 
-    Log.trace(F("Creating MQ2 buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating MQ2 buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> MQ2dataBuffer;
     JsonObject MQ2data = MQ2dataBuffer.to<JsonObject>();
 
     MQ2data["gas"] = analogRead(MQ2SENSORADCPIN);
     MQ2data["detected"] = digitalRead(MQ2SENSORDETECTPIN) == HIGH ? "false" : "true";
     MQ2data["origin"] = subjectMQ2toMQTT;
-    handleJsonEnqueue(MQ2data);
+    enqueueJsonObject(MQ2data);
   }
 }
 #endif
diff --git a/main/ZsensorRN8209.ino b/main/sensorRN8209.cpp
similarity index 79%
rename from main/ZsensorRN8209.ino
rename to main/sensorRN8209.cpp
index d0fced6..f1063a5 100644
--- a/main/ZsensorRN8209.ino
+++ b/main/sensorRN8209.cpp
@@ -1,7 +1,7 @@
 /*  
   OpenMQTTGateway Addon  - ESP8266, ESP32 or Arduino program for home automation 
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
     RN8209 reading Addon
@@ -24,14 +24,21 @@
     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 ZsensorRN8209
+#include "User_config.h"
 
-#  include "ArduinoJson.h"
-#  include "driver/uart.h"
-#  include "rn8209_flash.h"
-#  include "rn8209c_user.h"
+#ifdef ZsensorRN8209
+#  include <TheengsUtils.h>
+#  include <driver/uart.h>
+#  include <rn8209_flash.h>
+#  include <rn8209c_user.h>
+
+#  include "TheengsCommon.h"
+#  include "config_RN8209.h"
 
 extern "C" bool init_8209c_interface();
+extern void overLimitCurrent(float RN8209current);
+
+extern bool ProcessLock;
 
 float voltage = 0;
 float current = 0;
@@ -75,13 +82,13 @@ void rn8209_loop(void* mode) {
       JsonObject RN8209data = RN8209dataBuffer.to<JsonObject>();
       if (retc == 0) {
         previousCurrent = current;
-        RN8209data["current"] = round2(current);
+        RN8209data["current"] = TheengsUtils::round2(current);
       }
       uint32_t temp_power = 0;
       retp = rn8209c_read_power(phase_A, &temp_power);
       if (retv == 0) {
         previousVoltage = voltage;
-        RN8209data["volt"] = round2(voltage);
+        RN8209data["volt"] = TheengsUtils::round2(voltage);
       }
       if (ret == 1) {
         power = temp_power;
@@ -90,12 +97,12 @@ void rn8209_loop(void* mode) {
       }
       if (retp == 0) {
         power = power / 10000.0;
-        RN8209data["power"] = round2(power);
+        RN8209data["power"] = TheengsUtils::round2(power);
       }
       PublishingTimerRN8209 = now;
       if (RN8209data) {
         RN8209data["origin"] = subjectRN8209toMQTT;
-        handleJsonEnqueue(RN8209data, QueueSemaphoreTimeOutTask);
+        enqueueJsonObject(RN8209data, QueueSemaphoreTimeOutTask);
       }
     }
     //esp_task_wdt_reset();
@@ -110,9 +117,9 @@ void setupRN8209() {
   cal.EC = RN8209_EC;
   set_user_param(cal);
   init_8209c_interface();
-  xTaskCreate(rn8209_loop, "rn8209_loop", 5500, NULL, 10, &rn8209TaskHandle);
+  xTaskCreate(rn8209_loop, "rn8209_loop", RN8209_TASK_STACK_SIZE_OVERRIDE, NULL, 10, &rn8209TaskHandle);
   //esp_task_wdt_add(rn8209TaskHandle);
-  Log.trace(F("ZsensorRN8209 setup done " CR));
+  THEENGS_LOG_TRACE(F("sensorRN8209 setup done " CR));
 }
 
 #endif // ZsensorRN8209
\ No newline at end of file
diff --git a/main/ZsensorSHTC3.ino b/main/sensorSHTC3.cpp
similarity index 77%
rename from main/ZsensorSHTC3.ino
rename to main/sensorSHTC3.cpp
index 040551e..2e9c628 100644
--- a/main/ZsensorSHTC3.ino
+++ b/main/sensorSHTC3.cpp
@@ -3,6 +3,8 @@
 #ifdef ZsensorSHTC3
 #  include <SparkFun_SHTC3.h>
 
+#  include "TheengsCommon.h"
+
 SHTC3 mySHTC3;
 
 //Time used to wait for an interval before resending temp and hum
@@ -13,16 +15,16 @@ void errorDecoder(SHTC3_Status_TypeDef message) // The errorDecoder function pri
 {
   switch (message) {
     case SHTC3_Status_Nominal:
-      Log.notice(F("Nominal"));
+      THEENGS_LOG_NOTICE(F("Nominal"));
       break;
     case SHTC3_Status_Error:
-      Log.error(F("Error"));
+      THEENGS_LOG_ERROR(F("Error"));
       break;
     case SHTC3_Status_CRC_Fail:
-      Log.error(F("CRC Fail"));
+      THEENGS_LOG_ERROR(F("CRC Fail"));
       break;
     default:
-      Log.error(F("Unknown return code"));
+      THEENGS_LOG_ERROR(F("Unknown return code"));
       break;
   }
 }
@@ -44,30 +46,30 @@ void MeasureTempAndHum() {
       float h = mySHTC3.toPercent();
       // Check if any reads failed and exit early (to try again).
       if (isnan(h) || isnan(t)) {
-        Log.error(F("Failed to read from SHTC3 sensor!" CR));
+        THEENGS_LOG_ERROR(F("Failed to read from SHTC3 sensor!" CR));
       } else {
-        Log.trace(F("Creating SHTC3 buffer" CR));
+        THEENGS_LOG_TRACE(F("Creating SHTC3 buffer" CR));
         StaticJsonDocument<JSON_MSG_BUFFER> SHTC3dataBuffer;
         JsonObject SHTC3data = SHTC3dataBuffer.to<JsonObject>();
         if (h != persistedh || shtc3_always) {
           SHTC3data["hum"] = (float)h;
         } else {
-          Log.trace(F("Same hum don't send it" CR));
+          THEENGS_LOG_TRACE(F("Same hum don't send it" CR));
         }
         if (t != persistedt || shtc3_always) {
           SHTC3data["tempc"] = (float)t;
           SHTC3data["tempf"] = mySHTC3.toDegF();
         } else {
-          Log.trace(F("Same temp don't send it" CR));
+          THEENGS_LOG_TRACE(F("Same temp don't send it" CR));
         }
         SHTC3data["origin"] = SHTC3TOPIC;
-        handleJsonEnqueue(SHTC3data);
+        enqueueJsonObject(SHTC3data);
       }
       persistedh = h;
       persistedt = t;
     } else {
       errorDecoder(mySHTC3.lastStatus);
-      Log.error(F("Failed to read from SHTC3 sensor!" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from SHTC3 sensor!" CR));
     }
   }
 }
diff --git a/main/ZsensorTEMT6000.ino b/main/sensorTEMT6000.cpp
similarity index 78%
rename from main/ZsensorTEMT6000.ino
rename to main/sensorTEMT6000.cpp
index a83e9be..5bf7f5b 100644
--- a/main/ZsensorTEMT6000.ino
+++ b/main/sensorTEMT6000.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This is the Light Meter Addon based on modules with a TEMT6000:
@@ -38,12 +38,16 @@
 #include "User_config.h"
 
 #ifdef ZsensorTEMT6000
-
+#  include "TheengsCommon.h"
 #  include "Wire.h"
+#  include "config_TEMT6000.h"
 #  include "math.h"
 
+//Time used to wait for an interval before resending measured values
+static unsigned long timetemt6000 = 0;
+
 void setupZsensorTEMT6000() {
-  Log.notice(F("Setup TEMT6000 on pin: %i" CR), TEMT6000LIGHTSENSORPIN);
+  THEENGS_LOG_NOTICE(F("Setup TEMT6000 on pin: %i" CR), TEMT6000LIGHTSENSORPIN);
   pinMode(TEMT6000LIGHTSENSORPIN, INPUT);
 }
 
@@ -52,7 +56,7 @@ void MeasureLightIntensityTEMT6000() {
     static uint32_t persisted_lux;
     timetemt6000 = millis();
 
-    Log.trace(F("Creating TEMT6000 buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating TEMT6000 buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> TEMT6000dataBuffer;
     JsonObject TEMT6000data = TEMT6000dataBuffer.to<JsonObject>();
 
@@ -68,9 +72,9 @@ void MeasureLightIntensityTEMT6000() {
       TEMT6000data["ftcd"] = (float)(lux) / 10.764;
       TEMT6000data["wattsm2"] = (float)(lux) / 683.0;
       TEMT6000data["origin"] = subjectTEMT6000toMQTT;
-      handleJsonEnqueue(TEMT6000data);
+      enqueueJsonObject(TEMT6000data);
     } else {
-      Log.trace(F("Same lux value, do not send" CR));
+      THEENGS_LOG_TRACE(F("Same lux value, do not send" CR));
     }
   }
 }
diff --git a/main/ZsensorTSL2561.ino b/main/sensorTSL2561.cpp
similarity index 67%
rename from main/ZsensorTSL2561.ino
rename to main/sensorTSL2561.cpp
index c1063be..2c6e8fe 100644
--- a/main/ZsensorTSL2561.ino
+++ b/main/sensorTSL2561.cpp
@@ -1,7 +1,7 @@
 /*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
    Send and receiving command by MQTT
  
    This is the Light Meter Addon based on modules with a TSL2561:
@@ -12,13 +12,13 @@
    Connection Scheme:
    --------------------
 
-   TSL2561------> Arduino Uno ----------> ESP8266
+   TSL2561------> ESP8266
    ==============================================
-   Vcc ---------> 3.3V -----------------> 3.3V
-   GND ---------> GND ------------------> GND
-   SCL ---------> Pin A5 ---------------> D1
-   SDA ---------> Pin A4 ---------------> D2
-   ADD ---------> N/C (Not Connected) --> N/C (Not Connected)
+   Vcc ---------> 3.3V
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
+   ADD ---------> N/C (Not Connected)
  
     Copyright: (c) Chris Broekema
   
@@ -43,32 +43,38 @@
 #  include <Adafruit_Sensor.h>
 #  include <Adafruit_TSL2561_U.h>
 
+#  include "TheengsCommon.h"
 #  include "Wire.h"
+#  include "config_TSL2561.h"
 #  include "math.h"
 
+//Time used to wait for an interval before resending measured values
+static unsigned long timetsl2561 = 0;
+//int TSL2561_i2c_addr = 0x37; // Light Sensor I2C Address (Set in Adafruit library)
+
 Adafruit_TSL2561_Unified tsl = Adafruit_TSL2561_Unified(TSL2561_ADDR_FLOAT, 12345);
 
 void displaySensorDetails(void) {
   sensor_t sensor;
   tsl.getSensor(&sensor);
-  Log.trace(F("------------------------------------" CR));
-  Log.trace(("Sensor: %s" CR), sensor.name);
-  Log.trace(("Driver Ver: %s" CR), sensor.version);
-  Log.trace(("Unique ID: %s" CR), sensor.sensor_id);
-  Log.trace(("Max Value: %s lux" CR), sensor.max_value);
-  Log.trace(("Min Value: %s lux" CR), sensor.min_value);
-  Log.trace(("Resolution: %s lux" CR), sensor.resolution);
-  Log.trace(F("------------------------------------" CR));
+  THEENGS_LOG_TRACE(F("------------------------------------" CR));
+  THEENGS_LOG_TRACE(("Sensor: %s" CR), sensor.name);
+  THEENGS_LOG_TRACE(("Driver Ver: %s" CR), sensor.version);
+  THEENGS_LOG_TRACE(("Unique ID: %s" CR), sensor.sensor_id);
+  THEENGS_LOG_TRACE(("Max Value: %s lux" CR), sensor.max_value);
+  THEENGS_LOG_TRACE(("Min Value: %s lux" CR), sensor.min_value);
+  THEENGS_LOG_TRACE(("Resolution: %s lux" CR), sensor.resolution);
+  THEENGS_LOG_TRACE(F("------------------------------------" CR));
   delay(500);
 }
 
 void setupZsensorTSL2561() {
-  Log.notice(F("Setup TSL2561 on adress: %H" CR), TSL2561_ADDR_FLOAT);
+  THEENGS_LOG_NOTICE(F("Setup TSL2561 on adress: %H" CR), TSL2561_ADDR_FLOAT);
   Wire.begin();
   Wire.beginTransmission(TSL2561_ADDR_FLOAT);
 
   if (!tsl.begin()) {
-    Log.error(F("No TSL2561 detected" CR));
+    THEENGS_LOG_ERROR(F("No TSL2561 detected" CR));
   }
 
   // enable auto ranging
@@ -80,7 +86,7 @@ void setupZsensorTSL2561() {
   // tsl.setIntegrationTime(TSL2561_INTEGRATIONTIME_101MS);  /* medium resolution and speed   */
   tsl.setIntegrationTime(TSL2561_INTEGRATIONTIME_402MS);
 
-  Log.trace(F("TSL2561 Initialized. Printing detials now." CR));
+  THEENGS_LOG_TRACE(F("TSL2561 Initialized. Printing detials now." CR));
   displaySensorDetails();
 }
 
@@ -89,7 +95,7 @@ void MeasureLightIntensityTSL2561() {
     static uint32_t persisted_lux;
     timetsl2561 = millis();
 
-    Log.trace(F("Creating TSL2561 buffer" CR));
+    THEENGS_LOG_TRACE(F("Creating TSL2561 buffer" CR));
     StaticJsonDocument<JSON_MSG_BUFFER> TSL2561dataBuffer;
     JsonObject TSL2561data = TSL2561dataBuffer.to<JsonObject>();
 
@@ -105,12 +111,12 @@ void MeasureLightIntensityTSL2561() {
         TSL2561data["ftcd"] = (float)(event.light) / 10.764;
         TSL2561data["wattsm2"] = (float)(event.light) / 683.0;
         TSL2561data["origin"] = subjectTSL12561toMQTT;
-        handleJsonEnqueue(TSL2561data);
+        enqueueJsonObject(TSL2561data);
       } else {
-        Log.trace(F("Same lux value, do not send" CR));
+        THEENGS_LOG_TRACE(F("Same lux value, do not send" CR));
       }
     } else {
-      Log.error(F("Failed to read from TSL2561" CR));
+      THEENGS_LOG_ERROR(F("Failed to read from TSL2561" CR));
     }
   }
 }
diff --git a/main/ZsensorTouch.ino b/main/sensorTouch.cpp
similarity index 90%
rename from main/ZsensorTouch.ino
rename to main/sensorTouch.cpp
index 82d154f..7a2f12b 100644
--- a/main/ZsensorTouch.ino
+++ b/main/sensorTouch.cpp
@@ -1,154 +1,153 @@
-/*  
-  OpenMQTTGateway Addon  - ESP8266 or Arduino program for home automation 
-
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
-   Send and receiving command by MQTT
- 
-    For esp32, touch sensor reading add-on.
-  
-    Copyright: (c) Florian Xhumari
-    
-    This file is part of OpenMQTTGateway.
-    
-    OpenMQTTGateway 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.
-
-    OpenMQTTGateway 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/>.
-*/
-#include <HardwareSerial.h>
-
-#include "ArduinoJson.h"
-#include "User_config.h"
-#include "config_Touch.h"
-
-#ifdef ZsensorTouch
-
-#  ifndef ESP32
-#    error Only supported on esp32
-#  endif
-
-//Time used to wait for an interval before resending touch sensor value
-static unsigned long touchTimeRead = 0;
-
-// for each touch button
-struct TouchStatus {
-  uint8_t pin;
-  uint16_t timePublished = 0;
-  uint16_t timeStatusChanged = 0;
-  uint16_t avg = 10 * 256; // starting value; multiplied by 256
-  bool isOn = false;
-  bool wasOn = false;
-  int onCount = 0; // number of consecutive readings that were considered "ON"
-  unsigned long onTime; // time the button was turned on
-};
-
-static TouchStatus status[TOUCH_SENSORS];
-
-void setupTouch() {
-#  if TOUCH_SENSORS > 0
-  status[0].pin = TOUCH_GPIO_0;
-#  endif
-#  if TOUCH_SENSORS > 1
-  status[1].pin = TOUCH_GPIO_1;
-#  endif
-#  if TOUCH_SENSORS > 2
-  status[2].pin = TOUCH_GPIO_2;
-#  endif
-#  if TOUCH_SENSORS > 3
-  status[3].pin = TOUCH_GPIO_3;
-#  endif
-#  if TOUCH_SENSORS > 4
-  status[4].pin = TOUCH_GPIO_4;
-#  endif
-#  if TOUCH_SENSORS > 5
-  status[5].pin = TOUCH_GPIO_5;
-#  endif
-#  if TOUCH_SENSORS > 6
-  status[6].pin = TOUCH_GPIO_6;
-#  endif
-#  if TOUCH_SENSORS > 7
-  status[7].pin = TOUCH_GPIO_7;
-#  endif
-#  if TOUCH_SENSORS > 8
-  status[8].pin = TOUCH_GPIO_8;
-#  endif
-#  if TOUCH_SENSORS > 9
-  status[9].pin = TOUCH_GPIO_9;
-#  endif
-  for (int i = 0; i < TOUCH_SENSORS; i++) {
-    Log.notice(F("TOUCH_GPIO_%d: %d" CR), i, status[i].pin);
-  }
-  touchTimeRead = millis() - TOUCH_TIME_BETWEEN_READINGS; // so we get a first reading at the beginning
-}
-
-void MeasureTouch() {
-  unsigned long now = millis();
-  if (now - touchTimeRead < TOUCH_TIME_BETWEEN_READINGS) {
-    return;
-  }
-  touchTimeRead = now;
-  for (int i = 0; i < TOUCH_SENSORS; i++) {
-    TouchStatus* button = &status[i];
-
-    uint16_t val = touchRead(button->pin);
-    if (val == 0) {
-      // just ignore a 0 reading
-      continue;
-    }
-
-    // we'll work in 1/265th of a unit value returned by touchRead(), in order
-    // to have a better precision when performing averages and divisions, while
-    // not using floating point calculations.
-    uint16_t curValue = val * 256;
-    bool isOn = (curValue < button->avg * (TOUCH_THRESHOLD * 256 / 100) / 256); // just so that we divide by 256 and not by 100
-    if (!isOn) {
-      button->avg = (button->avg * 127 + val * 256 * 1) / 128; // exponential averaging, factor = 1/128
-    }
-    int lastOnCount = button->onCount;
-    if (isOn) {
-      ++button->onCount;
-    } else {
-      button->onCount = 0;
-    }
-
-    bool isStatusChanged = false;
-    if (((button->wasOn && !isOn) || (!button->wasOn && isOn && button->onCount >= TOUCH_MIN_DURATION / TOUCH_TIME_BETWEEN_READINGS)) && now - button->timeStatusChanged > TOUCH_DEBOUNCE_TIME) { // debounce
-      isStatusChanged = true;
-      button->wasOn = isOn;
-      button->timeStatusChanged = now;
-      if (isOn) {
-        button->onTime = now;
-      }
-    }
-    // keep timeStatusChanged from getting too old, so not to go
-    // beyond timestamp wrapping
-    if (now - button->timeStatusChanged > 100000) {
-      button->timeStatusChanged = now - 100000;
-    }
-    if (isStatusChanged) {
-      const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(4);
-      StaticJsonDocument<JSON_MSG_CALC_BUFFER> jsonDoc;
-      JsonObject touchData = jsonDoc.to<JsonObject>();
-      touchData["id"] = i;
-      touchData["on"] = (isOn ? 1 : 0);
-      touchData["value"] = (int)(curValue / 256);
-      if (!isOn) { // when turning off, send the duration the button was on
-        touchData["onDuration"] = now - button->onTime + TOUCH_MIN_DURATION;
-      }
-      pub(TOUCHTOPIC, touchData);
-      button->timePublished = now;
-    }
-    // adjust measure time so that min(avg of all buttons) is around 60 (between 40 and 80)
-    // TODO
-
-  } // loop
-}
-#endif
+/*  
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
+   Send and receiving command by MQTT
+ 
+    For esp32, touch sensor reading add-on.
+  
+    Copyright: (c) Florian Xhumari
+    
+    This file is part of OpenMQTTGateway.
+    
+    OpenMQTTGateway 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.
+
+    OpenMQTTGateway 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/>.
+*/
+
+#include "User_config.h"
+
+#ifdef ZsensorTouch
+#  include "TheengsCommon.h"
+#  include "config_Touch.h"
+#  ifndef ESP32
+#    error Only supported on esp32
+#  endif
+
+//Time used to wait for an interval before resending touch sensor value
+static unsigned long touchTimeRead = 0;
+
+// for each touch button
+struct TouchStatus {
+  uint8_t pin;
+  uint16_t timePublished = 0;
+  uint16_t timeStatusChanged = 0;
+  uint16_t avg = 10 * 256; // starting value; multiplied by 256
+  bool isOn = false;
+  bool wasOn = false;
+  int onCount = 0; // number of consecutive readings that were considered "ON"
+  unsigned long onTime; // time the button was turned on
+};
+
+static TouchStatus status[TOUCH_SENSORS];
+
+void setupTouch() {
+#  if TOUCH_SENSORS > 0
+  status[0].pin = TOUCH_GPIO_0;
+#  endif
+#  if TOUCH_SENSORS > 1
+  status[1].pin = TOUCH_GPIO_1;
+#  endif
+#  if TOUCH_SENSORS > 2
+  status[2].pin = TOUCH_GPIO_2;
+#  endif
+#  if TOUCH_SENSORS > 3
+  status[3].pin = TOUCH_GPIO_3;
+#  endif
+#  if TOUCH_SENSORS > 4
+  status[4].pin = TOUCH_GPIO_4;
+#  endif
+#  if TOUCH_SENSORS > 5
+  status[5].pin = TOUCH_GPIO_5;
+#  endif
+#  if TOUCH_SENSORS > 6
+  status[6].pin = TOUCH_GPIO_6;
+#  endif
+#  if TOUCH_SENSORS > 7
+  status[7].pin = TOUCH_GPIO_7;
+#  endif
+#  if TOUCH_SENSORS > 8
+  status[8].pin = TOUCH_GPIO_8;
+#  endif
+#  if TOUCH_SENSORS > 9
+  status[9].pin = TOUCH_GPIO_9;
+#  endif
+  for (int i = 0; i < TOUCH_SENSORS; i++) {
+    THEENGS_LOG_NOTICE(F("TOUCH_GPIO_%d: %d" CR), i, status[i].pin);
+  }
+  touchTimeRead = millis() - TOUCH_TIME_BETWEEN_READINGS; // so we get a first reading at the beginning
+}
+
+void MeasureTouch() {
+  unsigned long now = millis();
+  if (now - touchTimeRead < TOUCH_TIME_BETWEEN_READINGS) {
+    return;
+  }
+  touchTimeRead = now;
+  for (int i = 0; i < TOUCH_SENSORS; i++) {
+    TouchStatus* button = &status[i];
+
+    uint16_t val = touchRead(button->pin);
+    if (val == 0) {
+      // just ignore a 0 reading
+      continue;
+    }
+
+    // we'll work in 1/265th of a unit value returned by touchRead(), in order
+    // to have a better precision when performing averages and divisions, while
+    // not using floating point calculations.
+    uint16_t curValue = val * 256;
+    bool isOn = (curValue < button->avg * (TOUCH_THRESHOLD * 256 / 100) / 256); // just so that we divide by 256 and not by 100
+    if (!isOn) {
+      button->avg = (button->avg * 127 + val * 256 * 1) / 128; // exponential averaging, factor = 1/128
+    }
+    int lastOnCount = button->onCount;
+    if (isOn) {
+      ++button->onCount;
+    } else {
+      button->onCount = 0;
+    }
+
+    bool isStatusChanged = false;
+    if (((button->wasOn && !isOn) || (!button->wasOn && isOn && button->onCount >= TOUCH_MIN_DURATION / TOUCH_TIME_BETWEEN_READINGS)) && now - button->timeStatusChanged > TOUCH_DEBOUNCE_TIME) { // debounce
+      isStatusChanged = true;
+      button->wasOn = isOn;
+      button->timeStatusChanged = now;
+      if (isOn) {
+        button->onTime = now;
+      }
+    }
+    // keep timeStatusChanged from getting too old, so not to go
+    // beyond timestamp wrapping
+    if (now - button->timeStatusChanged > 100000) {
+      button->timeStatusChanged = now - 100000;
+    }
+    if (isStatusChanged) {
+      const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(4);
+      StaticJsonDocument<JSON_MSG_CALC_BUFFER> jsonDoc;
+      JsonObject touchData = jsonDoc.to<JsonObject>();
+      touchData["id"] = i;
+      touchData["on"] = (isOn ? 1 : 0);
+      touchData["value"] = (int)(curValue / 256);
+      if (!isOn) { // when turning off, send the duration the button was on
+        touchData["onDuration"] = now - button->onTime + TOUCH_MIN_DURATION;
+      }
+      touchData["origin"] = subjectTouchtoMQTT;
+      enqueueJsonObject(touchData);
+      button->timePublished = now;
+    }
+    // adjust measure time so that min(avg of all buttons) is around 60 (between 40 and 80)
+    // TODO
+
+  } // loop
+}
+#endif
diff --git a/main/ZwebUI.ino b/main/webUI.cpp
similarity index 62%
rename from main/ZwebUI.ino
rename to main/webUI.cpp
index f743aac..45aebc6 100644
--- a/main/ZwebUI.ino
+++ b/main/webUI.cpp
@@ -1,13 +1,13 @@
-/*  
-  OpenMQTTGateway  - ESP8266 or Arduino program for home automation 
+/*
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
 
-   Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal  and a MQTT broker 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
    Send and receiving command by MQTT
 
     Copyright: (c)Florian ROBERT
-  
+
     This file is part of OpenMQTTGateway.
-    
+
     OpenMQTTGateway 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
@@ -23,11 +23,13 @@
 */
 #include "User_config.h"
 #if defined(ZwebUI) && defined(ESP32)
-#  include <ArduinoJson.h>
 #  include <SPIFFS.h>
 #  include <WebServer.h> // Docs for this are here - https://github.com/espressif/arduino-esp32/tree/master/libraries/WebServer
+#  include <WiFi.h>
 
-#  include "ArduinoLog.h"
+#  include <cstdarg>
+
+#  include "TheengsCommon.h"
 #  include "config_WebContent.h"
 #  include "config_WebUI.h"
 
@@ -39,26 +41,65 @@
 #    include "config_SSD1306.h"
 #  endif
 
+extern String stateRFMeasures();
+
 uint32_t requestToken = 0;
 
 QueueHandle_t webUIQueue;
 
 WebServer server(80);
 
+webUIQueueMessage* currentWebUIMessage;
+
+extern JsonArray modules;
+
+/**
+ * Active modules as readable text for the page heading, e.g. "LilyGo_SSD1306, WebUI, LORA"
+ * (the modules list is a JSON array, serializing it showed ["LilyGo_SSD1306","WebUI","LORA"]).
+ * Truncated to the buffer size.
+ */
+static void modulesHeading(char* out, size_t size) {
+  String text;
+  for (JsonVariant module : modules) {
+    if (text.length()) text += ", ";
+    text += module.as<const char*>();
+  }
+  strlcpy(out, text.c_str(), size);
+}
+extern char discovery_prefix[];
+extern String latestVersion;
+
+bool WebUIConfig_save();
+void sendRestartPage();
+bool WebUIConfig_load();
+void WebUIConfig_init();
+void addLog(const uint8_t* buffer, size_t size);
+
 /*------------------- External functions ----------------------*/
-extern void eraseAndRestart();
+extern void eraseConfig();
 extern unsigned long uptime();
+extern void ESPRestart(byte reason);
+extern void XtoSYS(const char* topicOri, JsonObject& SYSdata);
+extern void SYSConfig_save();
+extern String stateMeasures();
+extern void MQTTHttpsFWUpdate(const char* topicOri, JsonObject& HttpsFwUpdateData);
+extern void receivingDATA(const char* topicOri, const char* datacallback);
 
 /*------------------- Web Console Globals ----------------------*/
 
-#  define ROW_LENGTH 1024
+#  define ROW_LENGTH 512
 
-const uint16_t LOG_BUFFER_SIZE = 6096;
+const uint16_t LOG_BUFFER_SIZE = 3072;
 uint32_t log_buffer_pointer;
 void* log_buffer_mutex;
-char log_buffer[LOG_BUFFER_SIZE]; // Log buffer in HEAP
+char* log_buffer = nullptr; // Lazy-allocated on first console access
 
 const uint16_t MAX_LOGSZ = LOG_BUFFER_SIZE - 96;
+
+#  define LOG_BUFFER_IDLE_TIMEOUT 120000 // Free log buffer after 2 minutes of console inactivity
+unsigned long log_buffer_last_access = 0;
+static char* line = nullptr;
+int lineIndex = 0;
 const uint16_t TOPSZ = 151; // Max number of characters in topic string
 uint8_t masterlog_level; // Master log level used to override set log level
 bool reset_web_log_flag = false; // Reset web console log
@@ -68,6 +109,27 @@ String authFailResponse = "Authentication Failed";
 bool webUISecure = WEBUI_AUTH;
 boolean displayMetric = DISPLAY_METRIC;
 
+static void ensureLogBuffer() {
+  if (!log_buffer) {
+    log_buffer = (char*)calloc(LOG_BUFFER_SIZE, 1);
+    log_buffer_pointer = 0;
+  }
+  log_buffer_last_access = millis();
+}
+
+static void freeLogBufferIfIdle() {
+  if (log_buffer && (millis() - log_buffer_last_access > LOG_BUFFER_IDLE_TIMEOUT)) {
+    free(log_buffer);
+    log_buffer = nullptr;
+    log_buffer_pointer = 0;
+    if (line) {
+      free(line);
+      line = nullptr;
+      lineIndex = 0;
+    }
+  }
+}
+
 /*********************************************************************************************\
  * ESP32 AutoMutex
 \*********************************************************************************************/
@@ -284,30 +346,6 @@ void AddLogData(uint32_t loglevel, const char* log_data, const char* log_data_pa
   }
 }
 
-bool NeedLogRefresh(uint32_t req_loglevel, uint32_t index) {
-  if (!log_buffer) {
-    return false;
-  } // Leave now if there is no buffer available
-
-#  ifdef ESP32
-  // this takes the mutex, and will be release when the class is destroyed -
-  // i.e. when the functon leaves  You CAN call mutex.give() to leave early.
-  TasAutoMutex mutex((SemaphoreHandle_t*)&log_buffer_mutex);
-#  endif // ESP32
-
-  // Skip initial buffer fill
-  if (strlen(log_buffer) < LOG_BUFFER_SIZE / 2) {
-    return false;
-  }
-
-  char* line;
-  size_t len;
-  if (!GetLog(req_loglevel, &index, &line, &len)) {
-    return false;
-  }
-  return ((line - log_buffer) < LOG_BUFFER_SIZE / 4);
-}
-
 bool GetLog(uint32_t req_loglevel, uint32_t* index_p, char** entry_pp, size_t* len_p) {
   if (!log_buffer) {
     return false;
@@ -365,6 +403,30 @@ bool GetLog(uint32_t req_loglevel, uint32_t* index_p, char** entry_pp, size_t* l
   return false;
 }
 
+bool NeedLogRefresh(uint32_t req_loglevel, uint32_t index) {
+  if (!log_buffer) {
+    return false;
+  } // Leave now if there is no buffer available
+
+#  ifdef ESP32
+  // this takes the mutex, and will be release when the class is destroyed -
+  // i.e. when the functon leaves  You CAN call mutex.give() to leave early.
+  TasAutoMutex mutex((SemaphoreHandle_t*)&log_buffer_mutex);
+#  endif // ESP32
+
+  // Skip initial buffer fill
+  if (strlen(log_buffer) < LOG_BUFFER_SIZE / 2) {
+    return false;
+  }
+
+  char* line;
+  size_t len;
+  if (!GetLog(req_loglevel, &index, &line, &len)) {
+    return false;
+  }
+  return ((line - log_buffer) < LOG_BUFFER_SIZE / 4);
+}
+
 /*------------------- Local functions ----------------------*/
 
 #  ifdef WEBUI_DEVELOPMENT
@@ -392,9 +454,56 @@ bool exists(String path) {
 }
 #  endif
 
+static String intToString(int number) {
+  char buffer[12];
+  itoa(number, buffer, 10);
+  return String(buffer);
+}
+
+static String doubleToString(double number, signed int width, unsigned int prec) {
+  char buffer[16];
+  int n = snprintf(buffer, sizeof(buffer), "%*.*f", width, prec, number);
+  if (n < 0 || static_cast<size_t>(n) >= sizeof(buffer)) {
+    return String();
+  }
+  return String(buffer);
+}
+
+/*------------------- Chunked Response Helpers ----------------------*/
+// Send HTML pages in chunks to avoid large String heap allocations.
+// Each helper puts a temporary buffer on its own stack frame, sends
+// the chunk, then the buffer is freed when the helper returns.
+
+static void beginChunkedResponse() {
+  server.setContentLength(CONTENT_LENGTH_UNKNOWN);
+  server.send(200, "text/html", "");
+}
+
+static void sendHeaderChunk(const char* title) {
+  char buffer[768];
+  snprintf(buffer, sizeof(buffer), header_html, title);
+  server.sendContent(buffer);
+}
+
+static void sendBodyChunk(const char* fmt, ...) {
+  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
+  va_list args;
+  va_start(args, fmt);
+  vsnprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, fmt, args);
+  va_end(args);
+  server.sendContent(buffer);
+}
+
+static void sendFooterChunk() {
+  char buffer[256];
+  snprintf(buffer, sizeof(buffer), footer, OMG_VERSION);
+  server.sendContent(buffer);
+  server.sendContent(""); // End chunked transfer
+}
+
 /**
  * @brief / - Page
- * 
+ *
  */
 void handleRoot() {
   WEBUI_TRACE_LOG(F("handleRoot: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -410,21 +519,16 @@ void handleRoot() {
         server.send(200, "application/json", "{t}{s}Uptime:{m}" + String(uptime()) + "{e}</table>");
       }
     } else if (server.hasArg("rst")) { // TODO: This should redirect to the RST page
-      Log.warning(F("[WebUI] Restart" CR));
+      THEENGS_LOG_WARNING(F("[WebUI] Restart" CR));
       char jsonChar[100];
-      serializeJson(modules, jsonChar, measureJson(modules) + 1);
-      char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Restart").c_str());
-      String response = String(buffer);
-      response += String(restart_script);
-      response += String(script);
-      response += String(style);
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, reset_body, jsonChar, gateway_name, "Restart");
-      response += String(buffer);
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-      response += String(buffer);
-      server.send(200, "text/html", response);
+      modulesHeading(jsonChar, sizeof(jsonChar));
+      beginChunkedResponse();
+      sendHeaderChunk((String(gateway_name) + " - Restart").c_str());
+      server.sendContent(restart_script);
+      server.sendContent(script);
+      server.sendContent(style);
+      sendBodyChunk(reset_body, jsonChar, gateway_name, "Restart");
+      sendFooterChunk();
 
       delay(2000); // Wait for web page to be sent before
 
@@ -435,26 +539,20 @@ void handleRoot() {
     }
   } else {
     char jsonChar[100];
-    serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-    char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Main Menu").c_str());
-    String response = String(buffer);
-    response += String(root_script);
-    response += String(script);
-    response += String(style);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, root_body, jsonChar, gateway_name);
-    response += String(buffer);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-    response += String(buffer);
-    server.send(200, "text/html", response);
+    modulesHeading(jsonChar, sizeof(jsonChar));
+    beginChunkedResponse();
+    sendHeaderChunk((String(gateway_name) + " - Main Menu").c_str());
+    server.sendContent(root_script);
+    server.sendContent(script);
+    server.sendContent(style);
+    sendBodyChunk(root_body, jsonChar, gateway_name);
+    sendFooterChunk();
   }
 }
 
 /**
  * @brief /CN - Configuration Page
- * 
+ *
  */
 void handleCN() {
   WEBUI_SECURE
@@ -465,19 +563,13 @@ void handleCN() {
     }
   } else {
     char jsonChar[100];
-    serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-    char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configuration").c_str());
-    String response = String(buffer);
-    response += String(script);
-    response += String(style);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_body, jsonChar, gateway_name);
-    response += String(buffer);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-    response += String(buffer);
-    server.send(200, "text/html", response);
+    modulesHeading(jsonChar, sizeof(jsonChar));
+    beginChunkedResponse();
+    sendHeaderChunk((String(gateway_name) + " - Configuration").c_str());
+    server.sendContent(script);
+    server.sendContent(style);
+    sendBodyChunk(config_body, jsonChar, gateway_name);
+    sendFooterChunk();
   }
 }
 
@@ -513,20 +605,13 @@ void handleWU() {
   }
 
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure WebUI").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
-  int logLevel = Log.getLevel();
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_webui_body, jsonChar, gateway_name, (displayMetric ? "checked" : ""), (webUISecure ? "checked" : ""));
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure WebUI").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
+  sendBodyChunk(config_webui_body, jsonChar, gateway_name, (displayMetric ? "checked" : ""), (webUISecure ? "checked" : ""));
+  sendFooterChunk();
 }
 
 /**
@@ -607,20 +692,14 @@ void handleWI() {
       WEBUI_TRACE_LOG(F("handleWI scan: results %s" CR), WiFiScan.c_str());
 
       char jsonChar[100];
-      serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-      char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure WiFi").c_str());
-      String response = String(buffer);
-      response += String(wifi_script);
-      response += String(script);
-      response += String(style);
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_wifi_body, jsonChar, gateway_name, WiFiScan.c_str(), WiFi.SSID());
-      response += String(buffer);
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-      response += String(buffer);
-      server.send(200, "text/html", response);
+      modulesHeading(jsonChar, sizeof(jsonChar));
+      beginChunkedResponse();
+      sendHeaderChunk((String(gateway_name) + " - Configure WiFi").c_str());
+      server.sendContent(wifi_script);
+      server.sendContent(script);
+      server.sendContent(style);
+      sendBodyChunk(config_wifi_body, jsonChar, gateway_name, WiFiScan.c_str(), WiFi.SSID().c_str());
+      sendFooterChunk();
       return;
 
     } else if (server.hasArg("save")) {
@@ -641,45 +720,34 @@ void handleWI() {
       }
       if (update) {
         String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSset);
-        Log.warning(F("[WebUI] Save WiFi and Restart" CR));
+        THEENGS_LOG_WARNING(F("[WebUI] Save WiFi and Restart" CR));
         char jsonChar[100];
-        serializeJson(modules, jsonChar, measureJson(modules) + 1);
-        char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-        snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Save WiFi and Restart").c_str());
-        String response = String(buffer);
-        response += String(restart_script);
-        response += String(script);
-        response += String(style);
-        snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, reset_body, jsonChar, gateway_name, "Save WiFi and Restart");
-        response += String(buffer);
-        snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-        response += String(buffer);
-        server.send(200, "text/html", response);
+        modulesHeading(jsonChar, sizeof(jsonChar));
+        beginChunkedResponse();
+        sendHeaderChunk((String(gateway_name) + " - Save WiFi and Restart").c_str());
+        server.sendContent(restart_script);
+        server.sendContent(script);
+        server.sendContent(style);
+        sendBodyChunk(reset_body, jsonChar, gateway_name, "Save WiFi and Restart");
+        sendFooterChunk();
 
         delay(2000); // Wait for web page to be sent before
-        MQTTtoSYS((char*)topic.c_str(), WEBtoSYS);
+        XtoSYS((char*)topic.c_str(), WEBtoSYS);
         return;
       } else {
-        Log.warning(F("[WebUI] No changes" CR));
+        THEENGS_LOG_WARNING(F("[WebUI] No changes" CR));
       }
     }
   }
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure WiFi").c_str());
-  String response = String(buffer);
-  response += String(wifi_script);
-  response += String(script);
-  response += String(style);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_wifi_body, jsonChar, gateway_name, WiFiScan.c_str(), WiFi.SSID());
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure WiFi").c_str());
+  server.sendContent(wifi_script);
+  server.sendContent(script);
+  server.sendContent(style);
+  sendBodyChunk(config_wifi_body, jsonChar, gateway_name, WiFiScan.c_str(), WiFi.SSID().c_str());
+  sendFooterChunk();
 }
 
 /**
@@ -688,11 +756,12 @@ void handleWI() {
  * T: handleMQ Arg: 0, mh=192.168.1.11
  * T: handleMQ Arg: 1, ml=1883
  * T: handleMQ Arg: 2, mu=1234
- * T: handleMQ Arg: 3, mp= 
+ * T: handleMQ Arg: 3, mp=
  * T: handleMQ Arg: 4, sc=on
  * T: handleMQ Arg: 5, h=
  * T: handleMQ Arg: 6, mt=home/
- * T: handleMQ Arg: 7, save=
+ * T: handleMQ Arg: 7 dp=homeassistant (#ifdef ZmqttDiscovery)
+ * T: handleMQ Arg: 8, save=
  */
 void handleMQ() {
   WEBUI_TRACE_LOG(F("handleMQ: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -706,46 +775,48 @@ void handleMQ() {
       JsonObject WEBtoSYS = WEBtoSYSBuffer.to<JsonObject>();
       bool update = false;
 
+#  if !MQTT_BROKER_MODE
       if (server.hasArg("mh")) {
         WEBtoSYS["mqtt_server"] = server.arg("mh");
-        if (strncmp(mqtt_server, server.arg("mh").c_str(), parameters_size)) {
+        if (strncmp(cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_server, server.arg("mh").c_str(), parameters_size)) {
           update = true;
         }
       }
 
       if (server.hasArg("ml")) {
         WEBtoSYS["mqtt_port"] = server.arg("ml");
-        if (strncmp(mqtt_port, server.arg("ml").c_str(), 6)) {
+        if (strncmp(cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_port, server.arg("ml").c_str(), 6)) {
           update = true;
         }
       }
 
       if (server.hasArg("mu")) {
         WEBtoSYS["mqtt_user"] = server.arg("mu");
-        if (strncmp(mqtt_user, server.arg("mu").c_str(), parameters_size)) {
+        if (strncmp(cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_user, server.arg("mu").c_str(), parameters_size)) {
           update = true;
         }
       }
 
       if (server.hasArg("mp")) {
         WEBtoSYS["mqtt_pass"] = server.arg("mp");
-        if (strncmp(mqtt_pass, server.arg("mp").c_str(), parameters_size)) {
+        if (strncmp(cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_pass, server.arg("mp").c_str(), parameters_size)) {
           update = true;
         }
       }
 
       // SC - Secure Connection argument is only present when true
-      if (mqtt_secure != server.hasArg("sc")) {
+      if (cnt_parameters_array[CNT_DEFAULT_INDEX].isConnectionSecure != server.hasArg("sc")) {
         update = true;
       }
       WEBtoSYS["mqtt_secure"] = server.hasArg("sc");
 
       if (!update) {
-        Log.warning(F("[WebUI] clearing" CR));
+        THEENGS_LOG_WARNING(F("[WebUI] clearing" CR));
         for (JsonObject::iterator it = WEBtoSYS.begin(); it != WEBtoSYS.end(); ++it) {
           WEBtoSYS.remove(it);
         }
       }
+#  endif
 
       if (server.hasArg("h")) {
         WEBtoSYS["gateway_name"] = server.arg("h");
@@ -760,52 +831,62 @@ void handleMQ() {
           update = true;
         }
       }
+#  ifdef ZmqttDiscovery
+      if (server.hasArg("dp")) {
+        WEBtoSYS["discovery_prefix"] = server.arg("dp");
+        if (strncmp(discovery_prefix, server.arg("dp").c_str(), parameters_size)) {
+          update = true;
+        }
+      }
+#  endif
 
 #  ifndef ESPWifiManualSetup
       if (update) {
-        Log.warning(F("[WebUI] Save MQTT and Reconnect" CR));
-
+        THEENGS_LOG_WARNING(F("[WebUI] Save MQTT and Reconnect" CR));
+        WEBtoSYS["cnt_index"] = CNT_DEFAULT_INDEX;
+        WEBtoSYS["save_cnt"] = true;
         char jsonChar[100];
-        serializeJson(modules, jsonChar, measureJson(modules) + 1);
-        char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-        snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Save MQTT and Reconnect").c_str());
-        String response = String(buffer);
-        response += String(restart_script);
-        response += String(script);
-        response += String(style);
-        snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, reset_body, jsonChar, gateway_name, "Save MQTT and Reconnect");
-        response += String(buffer);
-        snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-        response += String(buffer);
-        server.send(200, "text/html", response);
+        modulesHeading(jsonChar, sizeof(jsonChar));
+        beginChunkedResponse();
+        sendHeaderChunk((String(gateway_name) + " - Save MQTT and Reconnect").c_str());
+        server.sendContent(restart_script);
+        server.sendContent(script);
+        server.sendContent(style);
+        sendBodyChunk(reset_body, jsonChar, gateway_name, "Save MQTT and Reconnect");
+        sendFooterChunk();
 
         delay(2000); // Wait for web page to be sent before
         String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSset);
-        MQTTtoSYS((char*)topic.c_str(), WEBtoSYS);
+        XtoSYS((char*)topic.c_str(), WEBtoSYS);
         return;
       } else {
-        Log.warning(F("[WebUI] No changes" CR));
+        THEENGS_LOG_WARNING(F("[WebUI] No changes" CR));
       }
 #  endif
     }
   }
 
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure MQTT").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
-  // mqtt server (mh), mqtt port (ml), mqtt username (mu), mqtt password (mp), secure connection (sc), server certificate (msc), topic (mt)
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_mqtt_body, jsonChar, gateway_name, mqtt_server, mqtt_port, mqtt_user, (mqtt_secure ? "checked" : ""), gateway_name, mqtt_topic);
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure MQTT").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
+  // mqtt server (mh), mqtt port (ml), mqtt username (mu), mqtt password (mp), secure connection (sc), server certificate (msc), mqtt topic (mt), discovery prefix (dp) (last one only #ifdef ZmqttDiscovery)
+#  if MQTT_BROKER_MODE
+#    ifdef ZmqttDiscovery
+  sendBodyChunk(config_mqtt_body, jsonChar, gateway_name, "", "1883", "", "", gateway_name, mqtt_topic, discovery_prefix);
+#    else
+  sendBodyChunk(config_mqtt_body, jsonChar, gateway_name, "", "1883", "", "", gateway_name, mqtt_topic);
+#    endif
+#  else
+#    ifdef ZmqttDiscovery
+  sendBodyChunk(config_mqtt_body, jsonChar, gateway_name, cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_server, cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_port, cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_user, (cnt_parameters_array[CNT_DEFAULT_INDEX].isConnectionSecure ? "checked" : ""), gateway_name, mqtt_topic, discovery_prefix);
+#    else
+  sendBodyChunk(config_mqtt_body, jsonChar, gateway_name, cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_server, cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_port, cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_user, (cnt_parameters_array[CNT_DEFAULT_INDEX].isConnectionSecure ? "checked" : ""), gateway_name, mqtt_topic);
+#    endif
+#  endif
+  sendFooterChunk();
 }
 
 #  ifndef ESPWifiManualSetup
@@ -819,60 +900,81 @@ void handleMQ() {
 void handleCG() {
   WEBUI_TRACE_LOG(F("handleCG: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
   WEBUI_SECURE
-  bool update = false;
-  StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
-  JsonObject WEBtoSYS = jsonBuffer.to<JsonObject>();
+  bool pwUpdate = false;
+  bool sysUpdate = false;
 
   if (server.args()) {
     for (uint8_t i = 0; i < server.args(); i++) {
       WEBUI_TRACE_LOG(F("handleCG Arg: %d, %s=%s" CR), i, server.argName(i).c_str(), server.arg(i).c_str());
     }
-    if (server.hasArg("save") && server.hasArg("gp") && strcmp(ota_pass, server.arg("gp").c_str())) {
-      strncpy(ota_pass, server.arg("gp").c_str(), parameters_size);
-      WEBtoSYS["gw_pass"] = ota_pass;
-      update = true;
+    if (server.hasArg("save")) {
+      if (server.hasArg("gp") && server.arg("gp").length() > 0 && strcmp(ota_pass, server.arg("gp").c_str())) {
+        // HTML maxlength is client-side only — a direct POST can deliver any
+        // length. Reject anything that would not fit (and leave dst
+        // NUL-terminated) before copying into the fixed-size buffer.
+        // Keep the String alive: server.arg() returns a temporary.
+        String gp = server.arg("gp");
+        // ota_pass is extern char[] in this TU; size is parameters_size.
+        if (gp.length() >= parameters_size) {
+          THEENGS_LOG_WARNING(F("[WebUI] gateway password too long, ignoring" CR));
+        } else {
+          strcpy(ota_pass, gp.c_str());
+          pwUpdate = true;
+        }
+      }
+#    ifdef ZmqttDiscovery
+      if (SYSConfig.discovery != server.hasArg("dc")) {
+        SYSConfig.discovery = server.hasArg("dc");
+        sysUpdate = true;
+      }
+#    endif
     }
   }
 
-  if (update) {
-    Log.warning(F("[WebUI] Save Password and Restart" CR));
+  if (pwUpdate || sysUpdate) {
+    THEENGS_LOG_NOTICE(F("[WebUI] Save gateway config and restart" CR));
+
+    if (sysUpdate) {
+      SYSConfig_save();
+    }
 
     char jsonChar[100];
-    serializeJson(modules, jsonChar, measureJson(modules) + 1);
-    char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
+    modulesHeading(jsonChar, sizeof(jsonChar));
+    beginChunkedResponse();
+    sendHeaderChunk((String(gateway_name) + " - Save and Restart").c_str());
+    server.sendContent(restart_script);
+    server.sendContent(script);
+    server.sendContent(style);
+    sendBodyChunk(reset_body, jsonChar, gateway_name, "Save and Restart");
+    sendFooterChunk();
 
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Save Password and Restart").c_str());
-    String response = String(buffer);
-    response += String(restart_script);
-    response += String(script);
-    response += String(style);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, reset_body, jsonChar, gateway_name, "Save Password and Restart");
-    response += String(buffer);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-    response += String(buffer);
-    server.send(200, "text/html", response);
-
-    delay(2000); // Wait for web page to be sent before
-    String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSset);
-    MQTTtoSYS((char*)topic.c_str(), WEBtoSYS);
-  } else {
-    Log.warning(F("[WebUI] No changes" CR));
+    if (pwUpdate) {
+      StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+      JsonObject WEBtoSYS = jsonBuffer.to<JsonObject>();
+      WEBtoSYS["gw_pass"] = ota_pass;
+      delay(2000);
+      String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSset);
+      XtoSYS((char*)topic.c_str(), WEBtoSYS);
+    } else {
+      delay(2000);
+      ESPRestart(5);
+    }
+    return;
   }
 
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure gateway").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_gateway_body, jsonChar, gateway_name, ota_pass);
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure gateway").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
+  sendBodyChunk(config_gateway_body, jsonChar, gateway_name
+#    ifdef ZmqttDiscovery
+                ,
+                (SYSConfig.discovery ? "checked" : "")
+#    endif
+  );
+  sendFooterChunk();
 }
 #  endif
 
@@ -896,23 +998,207 @@ void handleLO() {
   }
 
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure Logging").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure Logging").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
   int logLevel = Log.getLevel();
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_logging_body, jsonChar, gateway_name, (logLevel == 0 ? "selected" : ""), (logLevel == 1 ? "selected" : ""), (logLevel == 2 ? "selected" : ""), (logLevel == 3 ? "selected" : ""), (logLevel == 4 ? "selected" : ""), (logLevel == 5 ? "selected" : ""), (logLevel == 6 ? "selected" : ""));
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  sendBodyChunk(config_logging_body, jsonChar, gateway_name, (logLevel == 0 ? "selected" : ""), (logLevel == 1 ? "selected" : ""), (logLevel == 2 ? "selected" : ""), (logLevel == 3 ? "selected" : ""), (logLevel == 4 ? "selected" : ""), (logLevel == 5 ? "selected" : ""), (logLevel == 6 ? "selected" : ""));
+  sendFooterChunk();
 }
 
+#  ifdef ZgatewayBT
+#    include "config_BT.h"
+extern void BTConfig_fromJson(JsonObject& BTdata, bool startup);
+extern String stateBTMeasures(bool start);
+extern BTConfig_s BTConfig;
+
+/**
+ * @brief /BL - Config BLE
+ */
+void handleBL() {
+  WEBUI_TRACE_LOG(F("handleBL: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
+  WEBUI_SECURE
+  if (server.args()) {
+    for (uint8_t i = 0; i < server.args(); i++) {
+      WEBUI_TRACE_LOG(F("handleBL Arg: %d, %s=%s" CR), i, server.argName(i).c_str(), server.arg(i).c_str());
+    }
+    if (server.hasArg("save")) {
+      // Save BLE config in its own scope so the JSON buffer is freed before stateBTMeasures
+      // runs (via BTConfig_fromJson), avoiding stack overflow from nested StaticJsonDocument allocations
+      {
+        StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
+        JsonObject WEBtoBT = jsonBuffer.to<JsonObject>();
+
+        // Scan settings
+        WEBtoBT["enabled"] = server.hasArg("en");
+        WEBtoBT["adaptivescan"] = server.hasArg("as");
+        if (server.hasArg("bi")) {
+          WEBtoBT["interval"] = server.arg("bi").toInt();
+        }
+        if (server.hasArg("ai")) {
+          WEBtoBT["intervalacts"] = server.arg("ai").toInt();
+        }
+        if (server.hasArg("sd")) {
+          WEBtoBT["scanduration"] = server.arg("sd").toInt();
+        }
+        WEBtoBT["forcepscn"] = server.hasArg("fp");
+        WEBtoBT["bleconnect"] = server.hasArg("bc");
+        if (server.hasArg("mr")) {
+          WEBtoBT["minrssi"] = server.arg("mr").toInt();
+        }
+
+        // Publish settings
+        WEBtoBT["onlysensors"] = server.hasArg("os");
+        WEBtoBT["randommacs"] = server.hasArg("rm");
+        WEBtoBT["pubadvdata"] = server.hasArg("pa");
+        WEBtoBT["pubuuid4topic"] = server.hasArg("ut");
+        WEBtoBT["filterConnectable"] = server.hasArg("fc");
+        WEBtoBT["ignoreWBlist"] = server.hasArg("iw");
+
+        // Presence settings
+        WEBtoBT["hasspresence"] = server.hasArg("hp");
+        WEBtoBT["presuseuuid"] = server.hasArg("pu");
+        if (server.hasArg("pt")) {
+          WEBtoBT["prestopic"] = server.arg("pt");
+        }
+        if (server.hasArg("at")) {
+          WEBtoBT["presenceawaytimer"] = server.arg("at").toInt();
+        }
+        if (server.hasArg("mo")) {
+          WEBtoBT["movingtimer"] = server.arg("mo").toInt();
+        }
+
+        // External decoder
+        WEBtoBT["extDecoderEnable"] = server.hasArg("ed");
+        if (server.hasArg("et")) {
+          WEBtoBT["extDecoderTopic"] = server.arg("et");
+        }
+        if (server.hasArg("ci")) {
+          WEBtoBT["intervalcnct"] = server.arg("ci").toInt();
+        }
+
+        THEENGS_LOG_NOTICE(F("[WebUI] Save BLE config" CR));
+        WEBtoBT["save"] = true;
+        BTConfig_fromJson(WEBtoBT, false);
+      } // jsonBuffer freed here before stateBTMeasures internal allocations complete
+
+#    if BLEDecryptor
+      // Encryption settings (via SYS topic) - separate scope
+      {
+        StaticJsonDocument<JSON_MSG_BUFFER> sysBuffer;
+        JsonObject WEBtoSYS = sysBuffer.to<JsonObject>();
+        bool sysUpdate = false;
+
+        if (server.hasArg("bk")) {
+          WEBtoSYS["ble_aes"] = server.arg("bk");
+          sysUpdate = true;
+        }
+        if (server.hasArg("kp")) {
+          String kp = server.arg("kp");
+          while (kp.length() > 0) {
+            int kpindex = kp.indexOf(' ');
+            if (kpindex == -1) {
+              if (kp.indexOf(':') == 12) {
+                WEBtoSYS["ble_aes_keys"][kp.substring(0, 12)] = kp.substring(13, 45);
+              }
+              break;
+            } else {
+              if (kp.indexOf(':') == 12) {
+                WEBtoSYS["ble_aes_keys"][kp.substring(0, 12)] = kp.substring(13, 45);
+              }
+              kp = kp.substring(kpindex + 1);
+            }
+          }
+          sysUpdate = true;
+        }
+
+        if (sysUpdate) {
+          THEENGS_LOG_NOTICE(F("[WebUI] Save BLE encryption config" CR));
+          String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSset);
+          XtoSYS((char*)topic.c_str(), WEBtoSYS);
+        }
+      }
+#    endif
+    }
+  }
+
+  char jsonChar[100];
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure BLE").c_str());
+  if (strlen(ble_script) > 0) {
+    server.sendContent(ble_script);
+  }
+  server.sendContent(script);
+  server.sendContent(style);
+
+  // Scan settings
+  sendBodyChunk(config_ble_body_scan,
+                jsonChar, gateway_name,
+                (BTConfig.enabled ? "checked" : ""),
+                (BTConfig.adaptiveScan ? "checked" : ""),
+                BTConfig.BLEinterval,
+                BTConfig.intervalActiveScan,
+                BTConfig.scanDuration,
+                (BTConfig.forcePassiveScan ? "checked" : ""),
+                (BTConfig.bleConnect ? "checked" : ""),
+                BTConfig.minRssi);
+
+  // Publish settings
+  sendBodyChunk(config_ble_body_publish,
+                (BTConfig.pubOnlySensors ? "checked" : ""),
+                (BTConfig.pubRandomMACs ? "checked" : ""),
+                (BTConfig.pubAdvData ? "checked" : ""),
+                (BTConfig.pubBeaconUuidForTopic ? "checked" : ""),
+                (BTConfig.filterConnectable ? "checked" : ""),
+                (BTConfig.ignoreWBlist ? "checked" : ""));
+
+  // Presence settings
+  sendBodyChunk(config_ble_body_presence,
+                (BTConfig.presenceEnable ? "checked" : ""),
+                (BTConfig.presenceUseBeaconUuid ? "checked" : ""),
+                BTConfig.presenceTopic.c_str(),
+                BTConfig.presenceAwayTimer,
+                BTConfig.movingTimer);
+
+  // External decoder settings
+  sendBodyChunk(config_ble_body_decoder,
+                (BTConfig.extDecoderEnable ? "checked" : ""),
+                BTConfig.extDecoderTopic.c_str(),
+                BTConfig.intervalConnect);
+
+#    if BLEDecryptor
+  // Encryption settings
+  std::string aeskeysstring;
+  JsonObject root = ble_aes_keys.as<JsonObject>();
+  for (JsonPair kv : root) {
+    aeskeysstring += kv.key().c_str();
+    aeskeysstring += ":";
+    aeskeysstring += kv.value().as<const char*>();
+    aeskeysstring += " ";
+  }
+  if (!aeskeysstring.empty()) {
+    aeskeysstring.pop_back();
+  }
+
+  sendBodyChunk(config_ble_body_encrypt,
+                ble_aes, aeskeysstring.c_str());
+#    endif
+
+  // Save button + footer
+  server.sendContent(config_ble_body_footer);
+  sendFooterChunk();
+}
+#  endif
+
 #  ifdef ZgatewayLORA
+#    include "config_LORA.h"
+extern void LORAConfig_fromJson(JsonObject& LORAdata);
+extern String stateLORAMeasures();
+extern LORAConfig_s LORAConfig;
+
 /**
  * @brief /LA - Configure LORA Page
  * T: handleLA: uri: /la, args: 11, method: 1
@@ -998,76 +1284,72 @@ void handleLA() {
         update = true;
       }
       if (update) {
-        Log.notice(F("[WebUI] Save data" CR));
+        THEENGS_LOG_NOTICE(F("[WebUI] Save data" CR));
         WEBtoLORA["save"] = true;
         LORAConfig_fromJson(WEBtoLORA);
         stateLORAMeasures();
-        Log.trace(F("[WebUI] LORAConfig end" CR));
+        THEENGS_LOG_TRACE(F("[WebUI] LORAConfig end" CR));
       }
     }
   }
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure LORA").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_lora_body,
-           jsonChar,
-           gateway_name,
-           LORAConfig.frequency == 868000000 ? "selected" : "",
-           LORAConfig.frequency == 915000000 ? "selected" : "",
-           LORAConfig.frequency == 433000000 ? "selected" : "",
-           LORAConfig.txPower == 0 ? "selected" : "",
-           LORAConfig.txPower == 1 ? "selected" : "",
-           LORAConfig.txPower == 2 ? "selected" : "",
-           LORAConfig.txPower == 3 ? "selected" : "",
-           LORAConfig.txPower == 4 ? "selected" : "",
-           LORAConfig.txPower == 5 ? "selected" : "",
-           LORAConfig.txPower == 6 ? "selected" : "",
-           LORAConfig.txPower == 7 ? "selected" : "",
-           LORAConfig.txPower == 8 ? "selected" : "",
-           LORAConfig.txPower == 9 ? "selected" : "",
-           LORAConfig.txPower == 10 ? "selected" : "",
-           LORAConfig.txPower == 11 ? "selected" : "",
-           LORAConfig.txPower == 12 ? "selected" : "",
-           LORAConfig.txPower == 13 ? "selected" : "",
-           LORAConfig.txPower == 14 ? "selected" : "",
-           LORAConfig.spreadingFactor == 7 ? "selected" : "",
-           LORAConfig.spreadingFactor == 8 ? "selected" : "",
-           LORAConfig.spreadingFactor == 9 ? "selected" : "",
-           LORAConfig.spreadingFactor == 10 ? "selected" : "",
-           LORAConfig.spreadingFactor == 11 ? "selected" : "",
-           LORAConfig.spreadingFactor == 12 ? "selected" : "",
-           LORAConfig.signalBandwidth == 7800 ? "selected" : "",
-           LORAConfig.signalBandwidth == 10400 ? "selected" : "",
-           LORAConfig.signalBandwidth == 15600 ? "selected" : "",
-           LORAConfig.signalBandwidth == 20800 ? "selected" : "",
-           LORAConfig.signalBandwidth == 31250 ? "selected" : "",
-           LORAConfig.signalBandwidth == 41700 ? "selected" : "",
-           LORAConfig.signalBandwidth == 62500 ? "selected" : "",
-           LORAConfig.signalBandwidth == 125000 ? "selected" : "",
-           LORAConfig.signalBandwidth == 250000 ? "selected" : "",
-           LORAConfig.signalBandwidth == 500000 ? "selected" : "",
-           LORAConfig.codingRateDenominator == 5 ? "selected" : "",
-           LORAConfig.codingRateDenominator == 6 ? "selected" : "",
-           LORAConfig.codingRateDenominator == 7 ? "selected" : "",
-           LORAConfig.codingRateDenominator == 8 ? "selected" : "",
-           LORAConfig.preambleLength,
-           LORAConfig.syncWord,
-           LORAConfig.crc ? "checked" : "",
-           LORAConfig.invertIQ ? "checked" : "",
-           LORAConfig.onlyKnown ? "checked" : "");
-
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure LORA").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
+  sendBodyChunk(config_lora_body,
+                jsonChar,
+                gateway_name,
+                LORAConfig.frequency == 868000000 ? "selected" : "",
+                LORAConfig.frequency == 915000000 ? "selected" : "",
+                LORAConfig.frequency == 433000000 ? "selected" : "",
+                LORAConfig.txPower == 0 ? "selected" : "",
+                LORAConfig.txPower == 1 ? "selected" : "",
+                LORAConfig.txPower == 2 ? "selected" : "",
+                LORAConfig.txPower == 3 ? "selected" : "",
+                LORAConfig.txPower == 4 ? "selected" : "",
+                LORAConfig.txPower == 5 ? "selected" : "",
+                LORAConfig.txPower == 6 ? "selected" : "",
+                LORAConfig.txPower == 7 ? "selected" : "",
+                LORAConfig.txPower == 8 ? "selected" : "",
+                LORAConfig.txPower == 9 ? "selected" : "",
+                LORAConfig.txPower == 10 ? "selected" : "",
+                LORAConfig.txPower == 11 ? "selected" : "",
+                LORAConfig.txPower == 12 ? "selected" : "",
+                LORAConfig.txPower == 13 ? "selected" : "",
+                LORAConfig.txPower == 14 ? "selected" : "",
+                LORAConfig.spreadingFactor == 7 ? "selected" : "",
+                LORAConfig.spreadingFactor == 8 ? "selected" : "",
+                LORAConfig.spreadingFactor == 9 ? "selected" : "",
+                LORAConfig.spreadingFactor == 10 ? "selected" : "",
+                LORAConfig.spreadingFactor == 11 ? "selected" : "",
+                LORAConfig.spreadingFactor == 12 ? "selected" : "",
+                LORAConfig.signalBandwidth == 7800 ? "selected" : "",
+                LORAConfig.signalBandwidth == 10400 ? "selected" : "",
+                LORAConfig.signalBandwidth == 15600 ? "selected" : "",
+                LORAConfig.signalBandwidth == 20800 ? "selected" : "",
+                LORAConfig.signalBandwidth == 31250 ? "selected" : "",
+                LORAConfig.signalBandwidth == 41700 ? "selected" : "",
+                LORAConfig.signalBandwidth == 62500 ? "selected" : "",
+                LORAConfig.signalBandwidth == 125000 ? "selected" : "",
+                LORAConfig.signalBandwidth == 250000 ? "selected" : "",
+                LORAConfig.signalBandwidth == 500000 ? "selected" : "",
+                LORAConfig.codingRateDenominator == 5 ? "selected" : "",
+                LORAConfig.codingRateDenominator == 6 ? "selected" : "",
+                LORAConfig.codingRateDenominator == 7 ? "selected" : "",
+                LORAConfig.codingRateDenominator == 8 ? "selected" : "",
+                LORAConfig.preambleLength,
+                LORAConfig.syncWord,
+                LORAConfig.crc ? "checked" : "",
+                LORAConfig.invertIQ ? "checked" : "",
+                LORAConfig.onlyKnown ? "checked" : "");
+  sendFooterChunk();
 }
 #  elif defined(ZgatewayRTL_433) || defined(ZgatewayPilight) || defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZactuatorSomfy)
 #    include <map>
+
+#    include "rf/RFConfiguration.h"
 std::map<int, String> activeReceiverOptions = {
     {0, "Inactive"},
 #    if defined(ZgatewayPilight) && !defined(ZradioSX127x)
@@ -1084,6 +1366,8 @@ std::map<int, String> activeReceiverOptions = {
 #    endif
 };
 
+extern RFConfiguration iRFConfig;
+
 bool isValidReceiver(int receiverId) {
   // Check if the receiverId exists in the activeReceiverOptions map
   return activeReceiverOptions.find(receiverId) != activeReceiverOptions.end();
@@ -1110,8 +1394,9 @@ String generateActiveReceiverOptions(int currentSelection) {
  * T: handleRF Arg: 3, dg=0
  * T: handleRF Arg: 4, ar=0
  * T: handleRF Arg: 4, save=
- */
-
+ * TODO: need a review, it's a bit strance set the config in the iRFConfig attribute and then
+ *       setup a message and finally call the loadFromMessage
+  */
 void handleRF() {
   WEBUI_TRACE_LOG(F("handleRF: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
   WEBUI_SECURE
@@ -1126,66 +1411,61 @@ void handleRF() {
     if (server.hasArg("save")) {
       if (server.hasArg("rf")) {
         String freqStr = server.arg("rf");
-        RFConfig.frequency = freqStr.toFloat();
-        if (validFrequency(RFConfig.frequency)) {
-          WEBtoRF["frequency"] = RFConfig.frequency;
+        float freq = freqStr.toFloat();
+        if (iRFConfig.validFrequency(freq)) {
+          iRFConfig.setFrequency(freq);
+          WEBtoRF["frequency"] = iRFConfig.getFrequency();
           update = true;
         } else {
-          Log.warning(F("[WebUI] Invalid Frequency" CR));
+          THEENGS_LOG_WARNING(F("[WebUI] Invalid Frequency" CR));
         }
       }
       if (server.hasArg("ar")) {
         int selectedReceiver = server.arg("ar").toInt();
         if (isValidReceiver(selectedReceiver)) { // Assuming isValidReceiver is a validation function
-          RFConfig.activeReceiver = selectedReceiver;
-          WEBtoRF["activereceiver"] = RFConfig.activeReceiver;
+          iRFConfig.setActiveReceiver(selectedReceiver);
+          WEBtoRF["activereceiver"] = iRFConfig.getActiveReceiver();
           update = true;
         } else {
-          Log.warning(F("[WebUI] Invalid Active Receiver" CR));
+          THEENGS_LOG_WARNING(F("[WebUI] Invalid Active Receiver" CR));
         }
       }
       if (server.hasArg("oo")) {
-        RFConfig.newOokThreshold = server.arg("oo").toInt();
-        WEBtoRF["ookthreshold"] = RFConfig.newOokThreshold;
+        iRFConfig.setNewOokThreshold(server.arg("oo").toInt());
+        WEBtoRF["ookthreshold"] = iRFConfig.getNewOokThreshold();
         update = true;
       }
       if (server.hasArg("rs")) {
-        RFConfig.rssiThreshold = server.arg("rs").toInt();
-        WEBtoRF["rssithreshold"] = RFConfig.rssiThreshold;
+        iRFConfig.setRssiThreshold(server.arg("rs").toInt());
+        WEBtoRF["rssithreshold"] = iRFConfig.getRssiThreshold();
         update = true;
       }
       if (update) {
-        Log.notice(F("[WebUI] Save data" CR));
+        THEENGS_LOG_NOTICE(F("[WebUI] Save data" CR));
         WEBtoRF["save"] = true;
-        RFConfig_fromJson(WEBtoRF);
+        iRFConfig.loadFromMessage(WEBtoRF);
         stateRFMeasures();
-        Log.trace(F("[WebUI] RFConfig end" CR));
+        THEENGS_LOG_TRACE(F("[WebUI] RFConfig end" CR));
       }
     }
   }
 
-  String activeReceiverHtml = generateActiveReceiverOptions(RFConfig.activeReceiver);
+  String activeReceiverHtml = generateActiveReceiverOptions(iRFConfig.getActiveReceiver());
 
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure RF").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_rf_body, jsonChar, gateway_name, RFConfig.frequency, activeReceiverHtml.c_str());
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure RF").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
+  sendBodyChunk(config_rf_body, jsonChar, gateway_name, iRFConfig.getFrequency(), activeReceiverHtml.c_str());
+  sendFooterChunk();
 }
 #  endif
 
 /**
  * @brief /RT - Reset configuration ( Erase and Restart ) from Configuration menu
- * 
+ *
  */
 void handleRT() {
   WEBUI_TRACE_LOG(F("handleRT: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -1197,23 +1477,17 @@ void handleRT() {
   }
   if (server.hasArg("non")) {
     char jsonChar[100];
-    serializeJson(modules, jsonChar, measureJson(modules) + 1);
-    Log.warning(F("[WebUI] Erase and Restart" CR));
+    modulesHeading(jsonChar, sizeof(jsonChar));
+    THEENGS_LOG_WARNING(F("[WebUI] Erase and Restart" CR));
+    beginChunkedResponse();
+    sendHeaderChunk((String(gateway_name) + " - Erase and Restart").c_str());
+    server.sendContent(restart_script);
+    server.sendContent(script);
+    server.sendContent(style);
+    sendBodyChunk(reset_body, jsonChar, gateway_name, "Erase and Restart");
+    sendFooterChunk();
 
-    char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Erase and Restart").c_str());
-    String response = String(buffer);
-    response += String(restart_script);
-    response += String(script);
-    response += String(style);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, reset_body, jsonChar, gateway_name, "Erase and Restart");
-    response += String(buffer);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-    response += String(buffer);
-    server.send(200, "text/html", response);
-
-    eraseAndRestart();
+    eraseConfig();
   } else {
     handleCN();
   }
@@ -1222,7 +1496,7 @@ void handleRT() {
 #  if defined(ZgatewayCloud)
 /**
  * @brief /CL - Cloud Configuration
- * 
+ *
  */
 void handleCL() {
   WEBUI_TRACE_LOG(F("handleCL: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -1243,14 +1517,11 @@ void handleCL() {
   }
 
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Configure Cloud").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Configure Cloud").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
 
   char cloudEnabled[8] = {0};
   if (isCloudEnabled()) {
@@ -1264,19 +1535,16 @@ void handleCL() {
 
   requestToken = esp_random();
 #    ifdef ESP32_ETHERNET
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_cloud_body, jsonChar, gateway_name, " cloud checked", " Not", (String(CLOUDGATEWAY) + "token/start").c_str(), (char*)ETH.macAddress().c_str(), ("http://" + String(ip2CharArray(ETH.localIP())) + "/").c_str(), gateway_name, uptime(), requestToken);
+  sendBodyChunk(config_cloud_body, jsonChar, gateway_name, " cloud checked", " Not", (String(CLOUDGATEWAY) + "token/start").c_str(), (char*)ETH.macAddress().c_str(), ("http://" + String(TheengsUtils::ip2CharArray(ETH.localIP())) + "/").c_str(), gateway_name, uptime(), requestToken);
 #    else
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, config_cloud_body, jsonChar, gateway_name, cloudEnabled, deviceToken, (String(CLOUDGATEWAY) + "token/start").c_str(), (char*)WiFi.macAddress().c_str(), ("http://" + String(ip2CharArray(WiFi.localIP())) + "/").c_str(), gateway_name, uptime(), requestToken);
+  sendBodyChunk(config_cloud_body, jsonChar, gateway_name, cloudEnabled, deviceToken, (String(CLOUDGATEWAY) + "token/start").c_str(), (char*)WiFi.macAddress().c_str(), ("http://" + String(TheengsUtils::ip2CharArray(WiFi.localIP())) + "/").c_str(), gateway_name, uptime(), requestToken);
 #    endif
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  sendFooterChunk();
 }
 
 /**
  * @brief /TK - Receive Cloud Device Token
- * 
+ *
  */
 void handleTK() {
   WEBUI_TRACE_LOG(F("handleTK: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -1293,23 +1561,17 @@ void handleTK() {
     if (setCloudDeviceToken(deviceToken) && server.arg("RT").toInt() == requestToken && server.arg("uptime").toInt() + 600 > uptime()) {
       setCloudEnabled(true);
       char jsonChar[100];
-      serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-      char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Received Device Token").c_str());
-      String response = String(buffer);
-      response += String(script);
-      response += String(style);
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, token_body, jsonChar, gateway_name);
-      response += String(buffer);
-      snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-      response += String(buffer);
-      server.send(200, "text/html", response);
+      modulesHeading(jsonChar, sizeof(jsonChar));
+      beginChunkedResponse();
+      sendHeaderChunk((String(gateway_name) + " - Received Device Token").c_str());
+      server.sendContent(script);
+      server.sendContent(style);
+      sendBodyChunk(token_body, jsonChar, gateway_name);
+      sendFooterChunk();
     } else {
       WEBUI_TRACE_LOG(F("handleTK: uptime: %u, uptime: %u, ok: %T" CR), server.arg("uptime").toInt(), uptime(), server.arg("uptime").toInt() + 600 > uptime());
       WEBUI_TRACE_LOG(F("handleTK: RT: %d, RT: %d, ok: %T " CR), server.arg("RT").toInt(), requestToken, server.arg("RT").toInt() == requestToken);
-      Log.error(F("[WebUI] Invalid Token Response: RT: %T, uptime: %T" CR), server.arg("RT").toInt() == requestToken, server.arg("uptime").toInt() + 600 > uptime());
+      THEENGS_LOG_ERROR(F("[WebUI] Invalid Token Response: RT: %T, uptime: %T" CR), server.arg("RT").toInt() == requestToken, server.arg("uptime").toInt() + 600 > uptime());
       server.send(500, "text/html", "Internal ERROR - Invalid Token");
     }
   }
@@ -1319,7 +1581,7 @@ void handleTK() {
 
 /**
  * @brief /IN - Information Page
- * 
+ *
  */
 void handleIN() {
   WEBUI_TRACE_LOG(F("handleCN: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -1330,12 +1592,13 @@ void handleIN() {
     }
   } else {
     char jsonChar[100];
-    serializeJson(modules, jsonChar, measureJson(modules) + 1);
+    modulesHeading(jsonChar, sizeof(jsonChar));
 
     String informationDisplay = stateMeasures(); // .replace(",\"", "}1");  // .replace("\":", "=2")
 
 // }1 json-oled }2 true } }1 Cloud }2 cloudEnabled}2true}1c
 #  if defined(ZgatewayBT)
+    String stateBTMeasures(bool start);
     informationDisplay += "1<BR>BT}2}1"; // }1 the bracket is not needed as the previous message ends with }
     informationDisplay += stateBTMeasures(false);
 #  endif
@@ -1372,32 +1635,22 @@ void handleIN() {
     // WEBUI_TRACE_LOG(F("[WebUI] informationDisplay after %s" CR), informationDisplay.c_str());
 
     if (informationDisplay.length() > WEB_TEMPLATE_BUFFER_MAX_SIZE) {
-      Log.warning(F("[WebUI] informationDisplay content length ( %d ) greater than WEB_TEMPLATE_BUFFER_MAX_SIZE.  Display truncated" CR), informationDisplay.length());
+      THEENGS_LOG_WARNING(F("[WebUI] informationDisplay content length ( %d ) greater than WEB_TEMPLATE_BUFFER_MAX_SIZE.  Display truncated" CR), informationDisplay.length());
     }
 
-    char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Information").c_str());
-    String response = String(buffer);
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, information_script, informationDisplay.c_str());
-    response += String(buffer);
-
-    response += String(script);
-    response += String(style);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, information_body, jsonChar, gateway_name);
-    response += String(buffer);
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-    response += String(buffer);
-
-    server.send(200, "text/html", response);
+    beginChunkedResponse();
+    sendHeaderChunk((String(gateway_name) + " - Information").c_str());
+    sendBodyChunk(information_script, informationDisplay.c_str());
+    server.sendContent(script);
+    server.sendContent(style);
+    sendBodyChunk(information_body, jsonChar, gateway_name);
+    sendFooterChunk();
   }
 }
 
 /**
  * @brief /handleFavicon - Send Favicon
- * 
+ *
  */
 void handleFavicon() {
   WEBUI_TRACE_LOG(F("handleCN: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -1408,7 +1661,7 @@ void handleFavicon() {
 #  if defined(ESP32) && defined(MQTT_HTTPS_FW_UPDATE)
 /**
  * @brief /UP - Firmware Upgrade Page
- * 
+ *
  */
 void handleUP() {
   WEBUI_TRACE_LOG(F("handleUP: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
@@ -1430,7 +1683,7 @@ void handleUP() {
 
         String output;
         serializeJson(WEBtoSYS, output);
-        Log.notice(F("[WebUI] MQTTtoSYSupdate %s" CR), output.c_str());
+        THEENGS_LOG_NOTICE(F("[WebUI] XtoSYSupdate %s" CR), output.c_str());
       }
 
       String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSupdate);
@@ -1446,7 +1699,7 @@ void handleUP() {
 
           String output;
           serializeJson(WEBtoSYS, output);
-          Log.notice(F("[WebUI] MQTTtoSYSupdate %s" CR), output.c_str());
+          THEENGS_LOG_NOTICE(F("[WebUI] XtoSYSupdate %s" CR), output.c_str());
         }
 
         String topic = String(mqtt_topic) + String(gateway_name) + String(subjectMQTTtoSYSupdate);
@@ -1456,49 +1709,40 @@ void handleUP() {
     }
   }
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
+  modulesHeading(jsonChar, sizeof(jsonChar));
 
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Firmware Upgrade").c_str());
-  String response = String(buffer);
-  response += String(script);
-  response += String(style);
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Firmware Upgrade").c_str());
+  server.sendContent(script);
+  server.sendContent(style);
   String systemUrl = RELEASE_LINK + latestVersion + "/" + ENV_NAME + "-firmware.bin";
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, upgrade_body, jsonChar, gateway_name, systemUrl.c_str());
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  sendBodyChunk(upgrade_body, jsonChar, gateway_name, systemUrl.c_str());
+  sendFooterChunk();
 }
 #  endif
 
 void sendRestartPage() {
   char jsonChar[100];
-  serializeJson(modules, jsonChar, measureJson(modules) + 1);
-  char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Updating Firmware and Restart").c_str());
-  String response = String(buffer);
-  response += String(restart_script);
-  response += String(script);
-  response += String(style);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, reset_body, jsonChar, gateway_name, "Updating Firmware and Restart");
-  response += String(buffer);
-  snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-  response += String(buffer);
-  server.send(200, "text/html", response);
+  modulesHeading(jsonChar, sizeof(jsonChar));
+  beginChunkedResponse();
+  sendHeaderChunk((String(gateway_name) + " - Updating Firmware and Restart").c_str());
+  server.sendContent(restart_script);
+  server.sendContent(script);
+  server.sendContent(style);
+  sendBodyChunk(reset_body, jsonChar, gateway_name, "Updating Firmware and Restart");
+  sendFooterChunk();
 
   delay(2000); // Wait for web page to be sent before
 }
 
 /**
  * @brief /CS - Serial Console and Command Line
- * 
+ *
  */
 void handleCS() {
   WEBUI_TRACE_LOG(F("handleCS: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
   WEBUI_SECURE
+  ensureLogBuffer();
   if (server.args() && server.hasArg("c2")) {
     for (uint8_t i = 0; i < server.args(); i++) {
       WEBUI_TRACE_LOG(F("handleCS Arg: %d, %s=%s" CR), i, server.argName(i).c_str(), server.arg(i).c_str());
@@ -1510,9 +1754,9 @@ void handleCS() {
       String command = c1.substring(c1.indexOf(' ') + 1);
       if (command.length()) {
         WEBUI_TRACE_LOG(F("[WebUI] handleCS inject MQTT Command topic: '%s', command: '%s'" CR), cmdTopic.c_str(), command.c_str());
-        receivingMQTT((char*)cmdTopic.c_str(), (char*)command.c_str());
+        receivingDATA(cmdTopic.c_str(), command.c_str());
       } else {
-        Log.warning(F("[WebUI] Missing command: '%s', command: '%s'" CR), cmdTopic.c_str(), command.c_str());
+        THEENGS_LOG_WARNING(F("[WebUI] Missing command: '%s', command: '%s'" CR), cmdTopic.c_str(), command.c_str());
       }
     }
 
@@ -1540,26 +1784,20 @@ void handleCS() {
     server.send(200, "text/plain", message);
   } else {
     char jsonChar[100];
-    serializeJson(modules, jsonChar, measureJson(modules) + 1);
-
-    char buffer[WEB_TEMPLATE_BUFFER_MAX_SIZE];
-
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, header_html, (String(gateway_name) + " - Console").c_str());
-    String response = String(buffer);
-    response += String(console_script);
-    response += String(script);
-    response += String(style);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, console_body, jsonChar, gateway_name);
-    response += String(buffer);
-    snprintf(buffer, WEB_TEMPLATE_BUFFER_MAX_SIZE, footer, OMG_VERSION);
-    response += String(buffer);
-    server.send(200, "text/html", response);
+    modulesHeading(jsonChar, sizeof(jsonChar));
+    beginChunkedResponse();
+    sendHeaderChunk((String(gateway_name) + " - Console").c_str());
+    server.sendContent(console_script);
+    server.sendContent(script);
+    server.sendContent(style);
+    sendBodyChunk(console_body, jsonChar, gateway_name);
+    sendFooterChunk();
   }
 }
 
 /**
  * @brief Page not found handler
- * 
+ *
  */
 void notFound() {
   WEBUI_SECURE
@@ -1570,7 +1808,7 @@ void notFound() {
       path += ".html";
     } else {
 #  endif
-      Log.warning(F("[WebUI] notFound: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
+      THEENGS_LOG_WARNING(F("[WebUI] notFound: uri: %s, args: %d, method: %d" CR), server.uri(), server.args(), server.method());
       server.send(404, "text/plain", "Not found");
       return;
 #  ifdef WEBUI_DEVELOPMENT
@@ -1584,7 +1822,7 @@ void notFound() {
 }
 
 void WebUISetup() {
-  WEBUI_TRACE_LOG(F("ZwebUI setup start" CR));
+  WEBUI_TRACE_LOG(F("webUI setup start" CR));
 
   WebUIConfig_load();
   webUIQueue = xQueueCreate(5, sizeof(webUIQueueMessage*));
@@ -1612,10 +1850,11 @@ void WebUISetup() {
   server.on("/up", handleUP); // Firmware Upgrade
 #  endif
   server.on("/cn", handleCN); // Configuration
-  server.on("/wi", handleWI); // Configure Wifi
-  server.on("/mq", handleMQ); // Configure MQTT
+  server.on("/wi", HTTP_GET, handleWI); // Scan for WiFi networks (GET link)
+  server.on("/wi", HTTP_POST, handleWI); // Configure Wifi (save form, POST)
+  server.on("/mq", HTTP_POST, handleMQ); // Configure MQTT
 #  ifndef ESPWifiManualSetup
-  server.on("/cg", handleCG); // Configure gateway"
+  server.on("/cg", handleCG); // Configure gateway
 #  endif
   server.on("/wu", handleWU); // Configure WebUI
 #  ifdef ZgatewayLORA
@@ -1629,28 +1868,35 @@ void WebUISetup() {
 #  endif
   server.on("/lo", handleLO); // Configure Logging
 
+#  ifdef ZgatewayBT
+  server.on("/bl", handleBL); // Configure BLE
+#  endif
+
   server.on("/rt", handleRT); // Reset configuration ( Erase and Restart )
   server.on("/favicon.ico", handleFavicon); // Information
   server.begin();
 
   Log.begin(LOG_LEVEL, &WebLog);
 
-  Log.trace(F("[WebUI] displayMetric %T" CR), displayMetric);
-  Log.trace(F("[WebUI] WebUI Secure %T" CR), webUISecure);
-  Log.notice(F("OpenMQTTGateway URL: http://%s/" CR), WiFi.localIP().toString().c_str());
+  THEENGS_LOG_TRACE(F("[WebUI] displayMetric %T" CR), displayMetric);
+  THEENGS_LOG_TRACE(F("[WebUI] WebUI Secure %T" CR), webUISecure);
+  THEENGS_LOG_NOTICE(F("OpenMQTTGateway URL: http://%s/" CR), WiFi.localIP().toString().c_str());
   displayPrint("URL: http://", (char*)WiFi.localIP().toString().c_str());
-  Log.notice(F("ZwebUI setup done" CR));
+  THEENGS_LOG_NOTICE(F("webUI setup done" CR));
 }
 
 unsigned long nextWebUIMessage = uptime() + DISPLAY_WEBUI_INTERVAL;
 
 void WebUILoop() {
   server.handleClient();
+  freeLogBufferIfIdle();
 
   if (uptime() >= nextWebUIMessage && uxQueueMessagesWaiting(webUIQueue)) {
     webUIQueueMessage* message = nullptr;
     xQueueReceive(webUIQueue, &message, portMAX_DELAY);
+#  if defined(ZdisplaySSD1306)
     newSSD1306Message = true;
+#  endif
 
     if (currentWebUIMessage) {
       free(currentWebUIMessage);
@@ -1660,32 +1906,32 @@ void WebUILoop() {
   }
 }
 
-void MQTTtoWebUI(char* topicOri, JsonObject& WebUIdata) { // json object decoding
+void XtoWebUI(const char* topicOri, JsonObject& WebUIdata) { // json object decoding
   bool success = false;
   if (cmpToMainTopic(topicOri, subjectMQTTtoWebUIset)) {
     WEBUI_TRACE_LOG(F("MQTTtoWebUI json set" CR));
     // properties
     if (WebUIdata.containsKey("displayMetric")) {
       displayMetric = WebUIdata["displayMetric"].as<bool>();
-      Log.notice(F("Set displayMetric: %T" CR), displayMetric);
+      THEENGS_LOG_NOTICE(F("Set displayMetric: %T" CR), displayMetric);
       success = true;
     }
     // save, load, init, erase
     if (WebUIdata.containsKey("save") && WebUIdata["save"]) {
       success = WebUIConfig_save();
       if (success) {
-        Log.notice(F("WebUI config saved" CR));
+        THEENGS_LOG_NOTICE(F("WebUI config saved" CR));
       }
     } else if (WebUIdata.containsKey("load") && WebUIdata["load"]) {
       success = WebUIConfig_load();
       if (success) {
-        Log.notice(F("WebUI config loaded" CR));
+        THEENGS_LOG_NOTICE(F("WebUI config loaded" CR));
       }
     } else if (WebUIdata.containsKey("init") && WebUIdata["init"]) {
       WebUIConfig_init();
       success = true;
       if (success) {
-        Log.notice(F("WebUI config initialised" CR));
+        THEENGS_LOG_NOTICE(F("WebUI config initialised" CR));
       }
     } else if (WebUIdata.containsKey("erase") && WebUIdata["erase"]) {
       // Erase config from NVS (non-volatile storage)
@@ -1693,13 +1939,13 @@ void MQTTtoWebUI(char* topicOri, JsonObject& WebUIdata) { // json object decodin
       success = preferences.remove("WebUIConfig");
       preferences.end();
       if (success) {
-        Log.notice(F("WebUI config erased" CR));
+        THEENGS_LOG_NOTICE(F("WebUI config erased" CR));
       }
     }
     if (success) {
       stateWebUIStatus();
     } else {
-      Log.error(F("[ WebUI ] MQTTtoWebUI Fail json" CR), WebUIdata);
+      THEENGS_LOG_ERROR(F("[ WebUI ] XtoWebUI Fail json" CR), WebUIdata);
     }
   }
 }
@@ -1717,7 +1963,7 @@ String stateWebUIStatus() {
 
   // WebUIdata["currentMessage"] = currentWebUIMessage;
   WebUIdata["origin"] = subjectWebUItoMQTT;
-  handleJsonEnqueue(WebUIdata);
+  enqueueJsonObject(WebUIdata);
   return output;
 }
 
@@ -1732,14 +1978,14 @@ bool WebUIConfig_save() {
   preferences.begin(Gateway_Short_Name, false);
   int result = preferences.putString("WebUIConfig", conf);
   preferences.end();
-  Log.trace(F("[WebUI] WebUIConfig_save: %s, result: %d" CR), conf.c_str(), result);
+  THEENGS_LOG_TRACE(F("[WebUI] WebUIConfig_save: %s, result: %d" CR), conf.c_str(), result);
   return true;
 }
 
 void WebUIConfig_init() {
   displayMetric = DISPLAY_METRIC;
   webUISecure = WEBUI_AUTH;
-  Log.notice(F("WebUI config initialised" CR));
+  THEENGS_LOG_NOTICE(F("WebUI config initialised" CR));
 }
 
 bool WebUIConfig_load() {
@@ -1749,11 +1995,11 @@ bool WebUIConfig_load() {
     auto error = deserializeJson(jsonBuffer, preferences.getString("WebUIConfig", "{}"));
     preferences.end();
     if (error) {
-      Log.error(F("WebUI config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
+      THEENGS_LOG_ERROR(F("WebUI config deserialization failed: %s, buffer capacity: %u" CR), error.c_str(), jsonBuffer.capacity());
       return false;
     }
     if (jsonBuffer.isNull()) {
-      Log.warning(F("WebUI config is null" CR));
+      THEENGS_LOG_WARNING(F("WebUI config is null" CR));
       return false;
     }
     JsonObject jo = jsonBuffer.as<JsonObject>();
@@ -1762,7 +2008,7 @@ bool WebUIConfig_load() {
     return true;
   } else {
     preferences.end();
-    Log.notice(F("No WebUI config to load" CR));
+    THEENGS_LOG_NOTICE(F("No WebUI config to load" CR));
     return false;
   }
 }
@@ -1823,10 +2069,10 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
           // Queue completed message
 
           if (xQueueSend(webUIQueue, (void*)&message, 0) != pdTRUE) {
-            Log.warning(F("[ WebUI ] ERROR: webUIQueue full, discarding %s" CR), message->title);
+            THEENGS_LOG_WARNING(F("[ WebUI ] ERROR: webUIQueue full, discarding %s" CR), message->title);
             free(message);
           } else {
-            // Log.notice(F("[ WebUI ] Queued %s" CR), message->title);
+            // THEENGS_LOG_NOTICE(F("[ WebUI ] Queued %s" CR), message->title);
           }
           break;
         }
@@ -1859,41 +2105,31 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
 
             if (data.containsKey("temperature_C")) {
               float temperature_C = data["temperature_C"];
-              char temp[5];
 
               if (displayMetric) {
-                dtostrf(temperature_C, 3, 1, temp);
-                line3 = "temp: " + (String)temp + "°C ";
+                line3 = "temp: " + doubleToString(temperature_C, 3, 1) + "°C ";
               } else {
-                dtostrf(convertTemp_CtoF(temperature_C), 3, 1, temp);
-                line3 = "temp: " + (String)temp + "°F ";
+                line3 = "temp: " + doubleToString(convertTemp_CtoF(temperature_C), 3, 1) + "°F ";
               }
             }
 
             float humidity = data["humidity"];
             if (data.containsKey("humidity") && humidity <= 100 && humidity >= 0) {
-              char hum[5];
-              dtostrf(humidity, 3, 1, hum);
-              line3 += "hum: " + (String)hum + "% ";
+              line3 += "hum: " + doubleToString(humidity, 3, 1) + "% ";
             }
             if (data.containsKey("wind_avg_km_h")) {
               float wind_avg_km_h = data["wind_avg_km_h"];
-              char wind[6];
 
               if (displayMetric) {
-                dtostrf(wind_avg_km_h, 3, 1, wind);
-                line3 += "wind: " + (String)wind + "km/h ";
+                line3 += "wind: " + doubleToString(wind_avg_km_h, 3, 1) + "km/h ";
               } else {
-                dtostrf(convert_kmph2mph(wind_avg_km_h), 3, 1, wind);
-                line3 += "wind: " + (String)wind + "mp/h ";
+                line3 += "wind: " + doubleToString(convert_kmph2mph(wind_avg_km_h), 3, 1) + "mp/h ";
               }
             }
 
             float moisture = data["moisture"];
             if (data.containsKey("moisture") && moisture <= 100 && moisture >= 0) {
-              char moist[5];
-              dtostrf(moisture, 3, 1, moist);
-              line3 += "moist: " + (String)moist + "% ";
+              line3 += "moist: " + doubleToString(moisture, 3, 1) + "% ";
             }
 
             line3.toCharArray(message->line3, WEBUI_TEXT_WIDTH);
@@ -1913,13 +2149,13 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
             // Queue completed message
 
             if (xQueueSend(webUIQueue, (void*)&message, 0) != pdTRUE) {
-              Log.error(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
+              THEENGS_LOG_WARNING(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
               free(message);
             } else {
-              // Log.notice(F("[ WebUI ] Queued %s" CR), message->title);
+              // THEENGS_LOG_NOTICE(F("[ WebUI ] Queued %s" CR), message->title);
             }
           } else {
-            Log.error(F("[ WebUI ] rtl_433 not displaying %s" CR), message->title);
+            THEENGS_LOG_ERROR(F("[ WebUI ] rtl_433 not displaying %s" CR), message->title);
             free(message);
           }
           break;
@@ -1937,15 +2173,12 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
 
           String line2 = "";
           if (data.containsKey("tempc")) {
-            char temp[5];
             float temperature_C = data["tempc"];
 
             if (displayMetric) {
-              dtostrf(temperature_C, 3, 1, temp);
-              line2 = "temp: " + (String)temp + "°C ";
+              line2 = "temp: " + doubleToString(temperature_C, 3, 1) + "°C ";
             } else {
-              dtostrf(convertTemp_CtoF(temperature_C), 3, 1, temp);
-              line2 = "temp: " + (String)temp + "°F ";
+              line2 = "temp: " + doubleToString(convertTemp_CtoF(temperature_C), 3, 1) + "°F ";
             }
           }
           line2.toCharArray(message->line2, WEBUI_TEXT_WIDTH);
@@ -1955,34 +2188,29 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
           String line3 = "";
           float humidity = data["hum"];
           if (data.containsKey("hum") && humidity <= 100 && humidity >= 0) {
-            char hum[5];
-            dtostrf(humidity, 3, 1, hum);
-            line3 += "hum: " + (String)hum + "% ";
+            line3 += "hum: " + doubleToString(humidity, 3, 1) + "% ";
           }
           line3.toCharArray(message->line3, WEBUI_TEXT_WIDTH);
 
           // Line 4
 
           float pa = (int)data["pa"] / 100;
-          char pressure[6];
 
           String line4 = "";
           if (displayMetric) {
-            dtostrf(pa, 3, 1, pressure);
-            line4 = "pressure: " + (String)pressure + " hPa";
+            line4 = "pressure: " + doubleToString(pa, 3, 1) + " hPa";
           } else {
-            dtostrf(convert_hpa2inhg(pa), 3, 1, pressure);
-            line4 = "pressure: " + (String)pressure + " inHg";
+            line4 = "pressure: " + doubleToString(convert_hpa2inhg(pa), 3, 1) + " inHg";
           }
           line4.toCharArray(message->line4, WEBUI_TEXT_WIDTH);
 
           // Queue completed message
 
           if (xQueueSend(webUIQueue, (void*)&message, 0) != pdTRUE) {
-            Log.error(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
+            THEENGS_LOG_WARNING(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
             free(message);
           } else {
-            // Log.notice(F("[ WebUI ] Queued %s" CR), message->title);
+            // THEENGS_LOG_NOTICE(F("[ WebUI ] Queued %s" CR), message->title);
           }
           break;
         }
@@ -2004,33 +2232,27 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
             if (data["type"] == "THB" || data["type"] == "THBX" || data["type"] == "PLANT" || data["type"] == "AIR" || data["type"] == "BATT" || data["type"] == "ACEL" || (data["type"] == "UNIQ" && data["model_id"] == "SDLS")) {
               if (data.containsKey("tempc")) {
                 property++;
-                char temp[5];
                 if (displayMetric) {
                   float temperature = data["tempc"];
-                  dtostrf(temperature, 3, 1, temp);
-                  properties[property] = "temp: " + (String)temp + "°C ";
+                  properties[property] = "temp: " + doubleToString(temperature, 3, 1) + "°C ";
                 } else {
                   float temperature = data["tempf"];
-                  dtostrf(temperature, 3, 1, temp);
-                  properties[property] = "temp: " + (String)temp + "°F ";
+                  properties[property] = "temp: " + doubleToString(temperature, 3, 1) + "°F ";
                 }
               }
 
               if (data.containsKey("tempc2_dp")) {
                 property++;
-                char tempdp[5];
                 if (displayMetric) {
                   float temperature = data["tempc2_dp"];
-                  dtostrf(temperature, 3, 1, tempdp);
-                  properties[property] = "dewp: " + (String)tempdp + "°C ";
+                  properties[property] = "dewp: " + doubleToString(temperature, 3, 1) + "°C ";
                 } else {
                   float temperature = data["tempf2_dp"];
-                  dtostrf(temperature, 3, 1, tempdp);
-                  properties[property] = "dewp: " + (String)tempdp + "°F ";
+                  properties[property] = "dewp: " + doubleToString(temperature, 3, 1) + "°F ";
                 }
               }
 
-              if (data.containsKey("extprobe")) {
+              if (data.containsKey("extprobe") && data["extprobe"]) {
                 property++;
                 properties[property] = " ext. probe";
               }
@@ -2038,108 +2260,86 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
               if (data.containsKey("hum")) {
                 property++;
                 float humidity = data["hum"];
-                char hum[5];
 
-                dtostrf(humidity, 3, 1, hum);
-                properties[property] = "hum: " + (String)hum + "% ";
+                properties[property] = "hum: " + doubleToString(humidity, 3, 1) + "% ";
               }
 
               if (data.containsKey("pm25")) {
                 property++;
                 int pm25int = data["pm25"];
-                char pm25[3];
-                itoa(pm25int, pm25, 10);
+                String pm25 = intToString(pm25int);
                 if ((data.containsKey("pm10"))) {
-                  properties[property] = "PM 2.5: " + (String)pm25 + " ";
+                  properties[property] = "PM 2.5: " + pm25 + " ";
 
                 } else {
-                  properties[property] = "pm2.5: " + (String)pm25 + "μg/m³ ";
+                  properties[property] = "pm2.5: " + pm25 + "μg/m³ ";
                 }
               }
 
               if (data.containsKey("pm10")) {
                 property++;
                 int pm10int = data["pm10"];
-                char pm10[3];
-                itoa(pm10int, pm10, 10);
+                String pm10 = intToString(pm10int);
                 if ((data.containsKey("pm25"))) {
-                  properties[property] = "/ 10: " + (String)pm10 + "μg/m³ ";
+                  properties[property] = "/ 10: " + pm10 + "μg/m³ ";
 
                 } else {
-                  properties[property] = "pm10: " + (String)pm10 + "μg/m³ ";
+                  properties[property] = "pm10: " + pm10 + "μg/m³ ";
                 }
               }
 
               if (data.containsKey("for")) {
                 property++;
                 int formint = data["for"];
-                char form[3];
-                itoa(formint, form, 10);
-                properties[property] = "CH₂O: " + (String)form + "mg/m³ ";
+                properties[property] = "CH₂O: " + intToString(formint) + "mg/m³ ";
               }
 
               if (data.containsKey("co2")) {
                 property++;
                 int co2int = data["co2"];
-                char co2[4];
-                itoa(co2int, co2, 10);
-                properties[property] = "co2: " + (String)co2 + "ppm ";
+                properties[property] = "co2: " + intToString(co2int) + "ppm ";
               }
 
               if (data.containsKey("moi")) {
                 property++;
                 int moiint = data["moi"];
-                char moi[4];
-                itoa(moiint, moi, 10);
-                properties[property] = "moi: " + (String)moi + "% ";
+                properties[property] = "moi: " + intToString(moiint) + "% ";
               }
 
               if (data.containsKey("lux")) {
                 property++;
                 int luxint = data["lux"];
-                char lux[5];
-                itoa(luxint, lux, 10);
-                properties[property] = "lux: " + (String)lux + "lx ";
+                properties[property] = "lux: " + intToString(luxint) + "lx ";
               }
 
               if (data.containsKey("fer")) {
                 property++;
                 int ferint = data["fer"];
-                char fer[7];
-                itoa(ferint, fer, 10);
-                properties[property] = "fer: " + (String)fer + "µS/cm ";
+                properties[property] = "fer: " + intToString(ferint) + "µS/cm ";
               }
 
               if (data.containsKey("pres")) {
                 property++;
                 int presint = data["pres"];
-                char pres[4];
-                itoa(presint, pres, 10);
-                properties[property] = "pres: " + (String)pres + "hPa ";
+                properties[property] = "pres: " + intToString(presint) + "hPa ";
               }
 
               if (data.containsKey("batt")) {
                 property++;
                 int battery = data["batt"];
-                char batt[5];
-                itoa(battery, batt, 10);
-                properties[property] = "batt: " + (String)batt + "% ";
+                properties[property] = "batt: " + intToString(battery) + "% ";
               }
 
               if (data.containsKey("shake")) {
                 property++;
                 int shakeint = data["shake"];
-                char shake[3];
-                itoa(shakeint, shake, 10);
-                properties[property] = "shake: " + (String)shake + " ";
+                properties[property] = "shake: " + intToString(shakeint) + " ";
               }
 
               if (data.containsKey("volt")) {
                 property++;
                 float voltf = data["volt"];
-                char volt[5];
-                dtostrf(voltf, 3, 1, volt);
-                properties[property] = "volt: " + (String)volt + "V ";
+                properties[property] = "volt: " + doubleToString(voltf, 3, 1) + "V ";
               }
 
               if (data.containsKey("wake")) {
@@ -2148,6 +2348,13 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
                 properties[property] = "wake: " + wakestr + " ";
               }
 
+              if (data.containsKey("gravity")) {
+                property++;
+                property++;
+                float gravityf = data["gravity"];
+                properties[property] = "SG: " + doubleToString(gravityf, 5, 3) + " ";
+              }
+
             } else if (data["type"] == "BBQ") {
               String tempcstr = "";
               int j = 7;
@@ -2174,10 +2381,8 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
                 }
 
                 if (data.containsKey(tempcstr)) {
-                  char temp[5];
                   float temperature = data[tempcstr];
-                  dtostrf(temperature, 3, 1, temp);
-                  properties[i - 1] = "tp" + (String)i + ": " + (String)temp;
+                  properties[i - 1] = "tp" + (String)i + ": " + doubleToString(temperature, 3, 1);
                   if (displayMetric) {
                     properties[i - 1] += "°C ";
                   } else {
@@ -2191,9 +2396,7 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
               if (data.containsKey("steps")) {
                 property++;
                 int stepsint = data["steps"];
-                char steps[5];
-                itoa(stepsint, steps, 10);
-                properties[property] = "steps: " + (String)steps + " ";
+                properties[property] = "steps: " + intToString(stepsint) + " ";
                 // next line
                 property++;
               }
@@ -2201,17 +2404,13 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
               if (data.containsKey("act_bpm")) {
                 property++;
                 int actbpmint = data["act_bpm"];
-                char actbpm[3];
-                itoa(actbpmint, actbpm, 10);
-                properties[property] = "activity bpm: " + (String)actbpm + " ";
+                properties[property] = "activity bpm: " + intToString(actbpmint) + " ";
               }
 
               if (data.containsKey("bpm")) {
                 property++;
                 int bpmint = data["bpm"];
-                char bpm[3];
-                itoa(bpmint, bpm, 10);
-                properties[property] = "bpm: " + (String)bpm + " ";
+                properties[property] = "bpm: " + intToString(bpmint) + " ";
               }
             } else if (data["type"] == "SCALE") {
               if (data.containsKey("weighing_mode")) {
@@ -2225,13 +2424,11 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
               if (data.containsKey("weight")) {
                 property++;
                 float weightf = data["weight"];
-                char weight[7];
-                dtostrf(weightf, 3, 1, weight);
                 if (data.containsKey("unit")) {
                   String unit = data["unit"];
-                  properties[property] = "weight: " + (String)weight + unit + " ";
+                  properties[property] = "weight: " + doubleToString(weightf, 3, 1) + unit + " ";
                 } else {
-                  properties[property] = "weight: " + (String)weight;
+                  properties[property] = "weight: " + doubleToString(weightf, 3, 1);
                 }
                 // next line
                 property++;
@@ -2240,40 +2437,31 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
               if (data.containsKey("impedance")) {
                 property++;
                 int impint = data["impedance"];
-                char imp[3];
-                itoa(impint, imp, 10);
-                properties[property] = "impedance: " + (String)imp + "ohm ";
+                properties[property] = "impedance: " + intToString(impint) + "ohm ";
               }
             } else if (data["type"] == "UNIQ") {
-              if (data["model_id"] == "M1017") {
+              if (data["model_id"] == "M1017" || data["model_id"] == "HOBOMX2001") {
                 if (data.containsKey("lvl_cm")) {
                   property++;
-                  char lvl[5];
                   if (displayMetric) {
                     float lvlf = data["lvl_cm"];
-                    dtostrf(lvlf, 3, 1, lvl);
-                    properties[property] = "level: " + (String)lvl + "cm ";
+                    properties[property] = "level: " + doubleToString(lvlf, 3, 1) + "cm ";
                   } else {
                     float lvlf = data["lvl_in"];
-                    dtostrf(lvlf, 3, 1, lvl);
-                    properties[property] = "level: " + (String)lvl + "\" ";
+                    properties[property] = "level: " + doubleToString(lvlf, 3, 1) + "\" ";
                   }
                 }
 
                 if (data.containsKey("quality")) {
                   property++;
                   int qualint = data["quality"];
-                  char qual[3];
-                  itoa(qualint, qual, 10);
-                  properties[property] = "qy: " + (String)qual + " ";
+                  properties[property] = "qy: " + intToString(qualint) + " ";
                 }
 
                 if (data.containsKey("batt")) {
                   property++;
                   int battery = data["batt"];
-                  char batt[5];
-                  itoa(battery, batt, 10);
-                  properties[property] = "batt: " + (String)batt + "% ";
+                  properties[property] = "batt: " + intToString(battery) + "% ";
                 }
               }
             }
@@ -2298,10 +2486,10 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
               line4.toCharArray(message->line4, WEBUI_TEXT_WIDTH);
 
               if (xQueueSend(webUIQueue, (void*)&message, 0) != pdTRUE) {
-                Log.error(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
+                THEENGS_LOG_WARNING(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
                 free(message);
               } else {
-                // Log.notice(F("[ WebUI ] Queued %s" CR), message->title);
+                // THEENGS_LOG_NOTICE(F("[ WebUI ] Queued %s" CR), message->title);
               }
             } else {
               WEBUI_TRACE_LOG(F("[ WebUI ] incomplete messaage %s" CR), topicori);
@@ -2324,10 +2512,8 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
 
           String line1 = "";
           if (data.containsKey("volt")) {
-            char volt[5];
             float voltage = data["volt"];
-            dtostrf(voltage, 3, 1, volt);
-            line1 = "volt: " + (String)volt;
+            line1 = "volt: " + doubleToString(voltage, 3, 1);
           }
           line1.toCharArray(message->line1, WEBUI_TEXT_WIDTH);
 
@@ -2335,10 +2521,8 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
 
           String line2 = "";
           if (data.containsKey("current")) {
-            char curr[5];
             float current = data["current"];
-            dtostrf(current, 3, 1, curr);
-            line2 = "current: " + (String)curr + " A";
+            line2 = "current: " + doubleToString(current, 3, 1) + " A";
           }
           line2.toCharArray(message->line2, WEBUI_TEXT_WIDTH);
 
@@ -2346,20 +2530,18 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
 
           String line3 = "";
           if (data.containsKey("power")) {
-            char pow[5];
             float power = data["power"];
-            dtostrf(power, 3, 1, pow);
-            line3 = "power: " + (String)pow + " W";
+            line3 = "power: " + doubleToString(power, 3, 1) + " W";
           }
           line3.toCharArray(message->line3, WEBUI_TEXT_WIDTH);
 
           // Queue completed message
 
           if (xQueueSend(webUIQueue, (void*)&message, 0) != pdTRUE) {
-            Log.error(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
+            THEENGS_LOG_WARNING(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
             free(message);
           } else {
-            // Log.notice(F("[ WebUI ] Queued %s" CR), message->title);
+            // THEENGS_LOG_NOTICE(F("[ WebUI ] Queued %s" CR), message->title);
           }
           break;
         }
@@ -2370,15 +2552,12 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
 
           String line1 = "";
           if (data.containsKey("tempc")) {
-            char temp[5];
             float temperature_C = data["tempc"];
 
             if (displayMetric) {
-              dtostrf(temperature_C, 3, 1, temp);
-              line1 = "temp: " + (String)temp + "°C ";
+              line1 = "temp: " + doubleToString(temperature_C, 3, 1) + "°C ";
             } else {
-              dtostrf(convertTemp_CtoF(temperature_C), 3, 1, temp);
-              line1 = "temp: " + (String)temp + "°F ";
+              line1 = "temp: " + doubleToString(convertTemp_CtoF(temperature_C), 3, 1) + "°F ";
             }
           }
           line1.toCharArray(message->line1, WEBUI_TEXT_WIDTH);
@@ -2388,9 +2567,7 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
           String line2 = "";
           float humidity = data["hum"];
           if (data.containsKey("hum") && humidity <= 100 && humidity >= 0) {
-            char hum[5];
-            dtostrf(humidity, 3, 1, hum);
-            line2 += "hum: " + (String)hum + "% ";
+            line2 += "hum: " + doubleToString(humidity, 3, 1) + "% ";
           }
           line2.toCharArray(message->line2, WEBUI_TEXT_WIDTH);
 
@@ -2399,32 +2576,30 @@ void webUIPubPrint(const char* topicori, JsonObject& data) {
           String line3 = "";
           float adc = data["adc"];
           if (data.containsKey("adc") && adc <= 100 && adc >= 0) {
-            char cAdc[5];
-            dtostrf(adc, 3, 1, cAdc);
-            line3 += "adc: " + (String)cAdc + "µS/cm ";
+            line3 += "adc: " + doubleToString(adc, 3, 1) + "µS/cm ";
           }
           line3.toCharArray(message->line2, WEBUI_TEXT_WIDTH);
 
           // Queue completed message
 
           if (xQueueSend(webUIQueue, (void*)&message, 0) != pdTRUE) {
-            Log.error(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
+            THEENGS_LOG_WARNING(F("[ WebUI ] webUIQueue full, discarding signal %s" CR), message->title);
             free(message);
           } else {
-            // Log.notice(F("[ WebUI ] Queued %s" CR), message->title);
+            // THEENGS_LOG_NOTICE(F("[ WebUI ] Queued %s" CR), message->title);
           }
           break;
         }
 #  endif
         default:
-          Log.verbose(F("[ WebUI ] unhandled topic %s" CR), message->title);
+          THEENGS_LOG_VERBOSE(F("[ WebUI ] unhandled topic %s" CR), message->title);
           free(message);
       }
     } else {
-      Log.error(F("[ WebUI ] insufficent memory " CR));
+      THEENGS_LOG_ERROR(F("[ WebUI ] insufficent memory " CR));
     }
   } else {
-    Log.error(F("[ WebUI ] not initalized " CR));
+    THEENGS_LOG_ERROR(F("[ WebUI ] not initalized " CR));
   }
 }
 
@@ -2476,11 +2651,17 @@ size_t SerialWeb::write(const uint8_t* buffer, size_t size) {
   return Serial.write(buffer, size);
 }
 
-char line[ROW_LENGTH];
-int lineIndex = 0;
 void addLog(const uint8_t* buffer, size_t size) {
+  if (!log_buffer) {
+    return; // Skip logging when console buffer is not allocated
+  }
+  if (!line) {
+    line = (char*)malloc(ROW_LENGTH);
+    if (!line) return;
+    lineIndex = 0;
+  }
   for (int i = 0; i < size; i++) {
-    if (char(buffer[i]) == 10 | lineIndex > ROW_LENGTH - 2) {
+    if (char(buffer[i]) == 10 | lineIndex >= ROW_LENGTH - 2) {
       if (char(buffer[i]) != 10) {
         line[lineIndex++] = char(buffer[i]);
       }
@@ -2493,4 +2674,4 @@ void addLog(const uint8_t* buffer, size_t size) {
   }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/main/zzHTTPUpdate.cpp b/main/zzHTTPUpdate.cpp
deleted file mode 100644
index c2394cc..0000000
--- a/main/zzHTTPUpdate.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/**
- *
- * @file HTTPUpdate.cpp based om ESP8266HTTPUpdate.cpp
- * @date 16.10.2018
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the ESP32 Http Updater.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifdef ESP32
-#  include "zzHTTPUpdate.h"
-
-#  include <StreamString.h>
-#  include <esp_ota_ops.h> // get running partition
-#  include <esp_partition.h>
-
-// To do extern "C" uint32_t _SPIFFS_start;
-// To do extern "C" uint32_t _SPIFFS_end;
-
-HTTPUpdate::HTTPUpdate(void)
-    : _httpClientTimeout(8000), _ledPin(-1) {
-  _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
-}
-
-HTTPUpdate::HTTPUpdate(int httpClientTimeout)
-    : _httpClientTimeout(httpClientTimeout), _ledPin(-1) {
-  _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
-}
-
-HTTPUpdate::~HTTPUpdate(void) {
-}
-
-HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const String& currentVersion) {
-  HTTPClient http;
-  if (!http.begin(client, url)) {
-    return HTTP_UPDATE_FAILED;
-  }
-  return handleUpdate(http, currentVersion, false);
-}
-
-HTTPUpdateResult HTTPUpdate::updateSpiffs(HTTPClient& httpClient, const String& currentVersion) {
-  return handleUpdate(httpClient, currentVersion, true);
-}
-
-HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion) {
-  HTTPClient http;
-  if (!http.begin(client, url)) {
-    return HTTP_UPDATE_FAILED;
-  }
-  return handleUpdate(http, currentVersion, true);
-}
-
-HTTPUpdateResult HTTPUpdate::update(HTTPClient& httpClient,
-                                    const String& currentVersion) {
-  return handleUpdate(httpClient, currentVersion, false);
-}
-
-HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& host, uint16_t port, const String& uri,
-                                    const String& currentVersion) {
-  HTTPClient http;
-  if (!http.begin(client, host, port, uri)) {
-    return HTTP_UPDATE_FAILED;
-  }
-  return handleUpdate(http, currentVersion, false);
-}
-
-/**
- * return error code as int
- * @return int error code
- */
-int HTTPUpdate::getLastError(void) {
-  return _lastError;
-}
-
-/**
- * return error code as String
- * @return String error
- */
-String HTTPUpdate::getLastErrorString(void) {
-  if (_lastError == 0) {
-    return String(); // no error
-  }
-
-  // error from Update class
-  if (_lastError > 0) {
-    StreamString error;
-    Update.printError(error);
-    error.trim(); // remove line ending
-    return String("Update error: ") + error;
-  }
-
-  // error from http client
-  if (_lastError > -100) {
-    return String("HTTP error: ") + HTTPClient::errorToString(_lastError);
-  }
-
-  switch (_lastError) {
-    case HTTP_UE_TOO_LESS_SPACE:
-      return "Not Enough space";
-    case HTTP_UE_SERVER_NOT_REPORT_SIZE:
-      return "Server Did Not Report Size";
-    case HTTP_UE_SERVER_FILE_NOT_FOUND:
-      return "File Not Found (404)";
-    case HTTP_UE_SERVER_FORBIDDEN:
-      return "Forbidden (403)";
-    case HTTP_UE_SERVER_WRONG_HTTP_CODE:
-      return "Wrong HTTP Code";
-    case HTTP_UE_SERVER_FAULTY_MD5:
-      return "Wrong MD5";
-    case HTTP_UE_BIN_VERIFY_HEADER_FAILED:
-      return "Verify Bin Header Failed";
-    case HTTP_UE_BIN_FOR_WRONG_FLASH:
-      return "New Binary Does Not Fit Flash Size";
-    case HTTP_UE_NO_PARTITION:
-      return "Partition Could Not be Found";
-  }
-
-  return String();
-}
-
-String getSketchSHA256() {
-  const size_t HASH_LEN = 32; // SHA-256 digest length
-
-  uint8_t sha_256[HASH_LEN] = {0};
-
-  // get sha256 digest for running partition
-  if (esp_partition_get_sha256(esp_ota_get_running_partition(), sha_256) == 0) {
-    char buffer[2 * HASH_LEN + 1];
-
-    for (size_t index = 0; index < HASH_LEN; index++) {
-      uint8_t nibble = (sha_256[index] & 0xf0) >> 4;
-      buffer[2 * index] = nibble < 10 ? char(nibble + '0') : char(nibble - 10 + 'A');
-
-      nibble = sha_256[index] & 0x0f;
-      buffer[2 * index + 1] = nibble < 10 ? char(nibble + '0') : char(nibble - 10 + 'A');
-    }
-
-    buffer[2 * HASH_LEN] = '\0';
-
-    return String(buffer);
-  } else {
-    return String();
-  }
-}
-
-/**
- *
- * @param http HTTPClient *
- * @param currentVersion const char *
- * @return HTTPUpdateResult
- */
-HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& currentVersion, bool spiffs) {
-  HTTPUpdateResult ret = HTTP_UPDATE_FAILED;
-
-  // use HTTP/1.0 for update since the update handler not support any transfer Encoding
-  http.useHTTP10(true);
-  http.setTimeout(_httpClientTimeout);
-  http.setFollowRedirects(_followRedirects);
-  http.setUserAgent("ESP32-http-Update");
-  http.addHeader("Cache-Control", "no-cache");
-  http.addHeader("x-ESP32-STA-MAC", WiFi.macAddress());
-  http.addHeader("x-ESP32-AP-MAC", WiFi.softAPmacAddress());
-  http.addHeader("x-ESP32-free-space", String(ESP.getFreeSketchSpace()));
-  http.addHeader("x-ESP32-sketch-size", String(ESP.getSketchSize()));
-  String sketchMD5 = ESP.getSketchMD5();
-  if (sketchMD5.length() != 0) {
-    http.addHeader("x-ESP32-sketch-md5", sketchMD5);
-  }
-  // Add also a SHA256
-  String sketchSHA256 = getSketchSHA256();
-  if (sketchSHA256.length() != 0) {
-    http.addHeader("x-ESP32-sketch-sha256", sketchSHA256);
-  }
-  http.addHeader("x-ESP32-chip-size", String(ESP.getFlashChipSize()));
-  http.addHeader("x-ESP32-sdk-version", ESP.getSdkVersion());
-
-  if (spiffs) {
-    http.addHeader("x-ESP32-mode", "spiffs");
-  } else {
-    http.addHeader("x-ESP32-mode", "sketch");
-  }
-
-  if (currentVersion && currentVersion[0] != 0x00) {
-    http.addHeader("x-ESP32-version", currentVersion);
-  }
-
-  const char* headerkeys[] = {"x-MD5"};
-  size_t headerkeyssize = sizeof(headerkeys) / sizeof(char*);
-
-  // track these headers
-  http.collectHeaders(headerkeys, headerkeyssize);
-
-  int code = http.GET();
-  int len = http.getSize();
-
-  if (code <= 0) {
-    log_e("HTTP error: %s\n", http.errorToString(code).c_str());
-    _lastError = code;
-    http.end();
-    return HTTP_UPDATE_FAILED;
-  }
-
-  log_d("Header read fin.\n");
-  log_d("Server header:\n");
-  log_d(" - code: %d\n", code);
-  log_d(" - len: %d\n", len);
-
-  if (http.hasHeader("x-MD5")) {
-    log_d(" - MD5: %s\n", http.header("x-MD5").c_str());
-  }
-
-  log_d("ESP32 info:\n");
-  log_d(" - free Space: %d\n", ESP.getFreeSketchSpace());
-  log_d(" - current Sketch Size: %d\n", ESP.getSketchSize());
-
-  if (currentVersion && currentVersion[0] != 0x00) {
-    log_d(" - current version: %s\n", currentVersion.c_str());
-  }
-
-  switch (code) {
-    case HTTP_CODE_OK: ///< OK (Start Update)
-      if (len > 0) {
-        bool startUpdate = true;
-        if (spiffs) {
-          const esp_partition_t* _partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
-          if (!_partition) {
-            _lastError = HTTP_UE_NO_PARTITION;
-            return HTTP_UPDATE_FAILED;
-          }
-
-          if (len > _partition->size) {
-            log_e("spiffsSize to low (%d) needed: %d\n", _partition->size, len);
-            startUpdate = false;
-          }
-        } else {
-          int sketchFreeSpace = ESP.getFreeSketchSpace();
-          if (!sketchFreeSpace) {
-            _lastError = HTTP_UE_NO_PARTITION;
-            return HTTP_UPDATE_FAILED;
-          }
-
-          if (len > sketchFreeSpace) {
-            log_e("FreeSketchSpace to low (%d) needed: %d\n", sketchFreeSpace, len);
-            startUpdate = false;
-          }
-        }
-
-        if (!startUpdate) {
-          _lastError = HTTP_UE_TOO_LESS_SPACE;
-          ret = HTTP_UPDATE_FAILED;
-        } else {
-          WiFiClient* tcp = http.getStreamPtr();
-
-          // To do?                WiFiUDP::stopAll();
-          // To do?                WiFiClient::stopAllExcept(tcp);
-
-          delay(100);
-
-          int command;
-
-          if (spiffs) {
-            command = U_SPIFFS;
-            log_d("runUpdate spiffs...\n");
-          } else {
-            command = U_FLASH;
-            log_d("runUpdate flash...\n");
-          }
-
-          if (!spiffs) {
-            /* To do
-                    uint8_t buf[4];
-                    if(tcp->peekBytes(&buf[0], 4) != 4) {
-                        log_e("peekBytes magic header failed\n");
-                        _lastError = HTTP_UE_BIN_VERIFY_HEADER_FAILED;
-                        http.end();
-                        return HTTP_UPDATE_FAILED;
-                    }
-*/
-
-            // check for valid first magic byte
-            //                    if(buf[0] != 0xE9) {
-            if (tcp->peek() != 0xE9) {
-              log_e("Magic header does not start with 0xE9\n");
-              _lastError = HTTP_UE_BIN_VERIFY_HEADER_FAILED;
-              http.end();
-              return HTTP_UPDATE_FAILED;
-            }
-            /* To do
-                    uint32_t bin_flash_size = ESP.magicFlashChipSize((buf[3] & 0xf0) >> 4);
-
-                    // check if new bin fits to SPI flash
-                    if(bin_flash_size > ESP.getFlashChipRealSize()) {
-                        log_e("New binary does not fit SPI Flash size\n");
-                        _lastError = HTTP_UE_BIN_FOR_WRONG_FLASH;
-                        http.end();
-                        return HTTP_UPDATE_FAILED;
-                    }
-*/
-          }
-          if (runUpdate(*tcp, len, http.header("x-MD5"), command)) {
-            ret = HTTP_UPDATE_OK;
-            log_d("Update ok\n");
-            http.end();
-
-            if (_rebootOnUpdate && !spiffs) {
-              ESP.restart();
-            }
-
-          } else {
-            ret = HTTP_UPDATE_FAILED;
-            log_e("Update failed\n");
-          }
-        }
-      } else {
-        _lastError = HTTP_UE_SERVER_NOT_REPORT_SIZE;
-        ret = HTTP_UPDATE_FAILED;
-        log_e("Content-Length was 0 or wasn't set by Server?!\n");
-      }
-      break;
-    case HTTP_CODE_NOT_MODIFIED:
-      ///< Not Modified (No updates)
-      ret = HTTP_UPDATE_NO_UPDATES;
-      break;
-    case HTTP_CODE_NOT_FOUND:
-      _lastError = HTTP_UE_SERVER_FILE_NOT_FOUND;
-      ret = HTTP_UPDATE_FAILED;
-      break;
-    case HTTP_CODE_FORBIDDEN:
-      _lastError = HTTP_UE_SERVER_FORBIDDEN;
-      ret = HTTP_UPDATE_FAILED;
-      break;
-    default:
-      _lastError = HTTP_UE_SERVER_WRONG_HTTP_CODE;
-      ret = HTTP_UPDATE_FAILED;
-      log_e("HTTP Code is (%d)\n", code);
-      break;
-  }
-
-  http.end();
-  return ret;
-}
-
-/**
- * write Update to flash
- * @param in Stream&
- * @param size uint32_t
- * @param md5 String
- * @return true if Update ok
- */
-bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) {
-  StreamString error;
-
-  if (!Update.begin(size, command, _ledPin, _ledOn)) {
-    _lastError = Update.getError();
-    Update.printError(error);
-    error.trim(); // remove line ending
-    log_e("Update.begin failed! (%s)\n", error.c_str());
-    return false;
-  }
-
-  if (md5.length()) {
-    if (!Update.setMD5(md5.c_str())) {
-      _lastError = HTTP_UE_SERVER_FAULTY_MD5;
-      log_e("Update.setMD5 failed! (%s)\n", md5.c_str());
-      return false;
-    }
-  }
-
-  // To do: the SHA256 could be checked if the server sends it
-
-  if (Update.writeStream(in) != size) {
-    _lastError = Update.getError();
-    Update.printError(error);
-    error.trim(); // remove line ending
-    log_e("Update.writeStream failed! (%s)\n", error.c_str());
-    return false;
-  }
-
-  if (!Update.end()) {
-    _lastError = Update.getError();
-    Update.printError(error);
-    error.trim(); // remove line ending
-    log_e("Update.end failed! (%s)\n", error.c_str());
-    return false;
-  }
-
-  return true;
-}
-
-#  if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_HTTPUPDATE)
-HTTPUpdate httpUpdate;
-#  endif
-#endif
\ No newline at end of file
diff --git a/main/zzHTTPUpdate.h b/main/zzHTTPUpdate.h
deleted file mode 100644
index 2ae6823..0000000
--- a/main/zzHTTPUpdate.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- *
- * @file HTTPUpdate.h based on ESP8266HTTPUpdate.h
- * @date 16.10.2018
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the ESP32 Http Updater.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifdef ESP32
-#  ifndef ___zzHTTP_UPDATE_H___
-#    define ___zzHTTP_UPDATE_H___
-
-#    include <Arduino.h>
-#    include <HTTPClient.h>
-#    include <Update.h>
-#    include <WiFi.h>
-#    include <WiFiClient.h>
-#    include <WiFiUdp.h>
-
-/// note we use HTTP client errors too so we start at 100
-#    define HTTP_UE_TOO_LESS_SPACE           (-100)
-#    define HTTP_UE_SERVER_NOT_REPORT_SIZE   (-101)
-#    define HTTP_UE_SERVER_FILE_NOT_FOUND    (-102)
-#    define HTTP_UE_SERVER_FORBIDDEN         (-103)
-#    define HTTP_UE_SERVER_WRONG_HTTP_CODE   (-104)
-#    define HTTP_UE_SERVER_FAULTY_MD5        (-105)
-#    define HTTP_UE_BIN_VERIFY_HEADER_FAILED (-106)
-#    define HTTP_UE_BIN_FOR_WRONG_FLASH      (-107)
-#    define HTTP_UE_NO_PARTITION             (-108)
-
-enum HTTPUpdateResult {
-  HTTP_UPDATE_FAILED,
-  HTTP_UPDATE_NO_UPDATES,
-  HTTP_UPDATE_OK
-};
-
-typedef HTTPUpdateResult t_httpUpdate_return; // backward compatibility
-
-class HTTPUpdate {
-public:
-  HTTPUpdate(void);
-  HTTPUpdate(int httpClientTimeout);
-  ~HTTPUpdate(void);
-
-  void rebootOnUpdate(bool reboot) {
-    _rebootOnUpdate = reboot;
-  }
-
-  /**
-      * set redirect follow mode. See `followRedirects_t` enum for avaliable modes.
-      * @param follow
-      */
-  void setFollowRedirects(followRedirects_t follow) {
-    _followRedirects = follow;
-  }
-
-  void setLedPin(int ledPin = -1, uint8_t ledOn = HIGH) {
-    _ledPin = ledPin;
-    _ledOn = ledOn;
-  }
-
-  t_httpUpdate_return update(WiFiClient& client, const String& url, const String& currentVersion = "");
-
-  t_httpUpdate_return update(WiFiClient& client, const String& host, uint16_t port, const String& uri = "/",
-                             const String& currentVersion = "");
-
-  t_httpUpdate_return updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion = "");
-
-  t_httpUpdate_return update(HTTPClient& httpClient,
-                             const String& currentVersion = "");
-
-  t_httpUpdate_return updateSpiffs(HTTPClient& httpClient, const String& currentVersion = "");
-
-  int getLastError(void);
-  String getLastErrorString(void);
-
-protected:
-  t_httpUpdate_return handleUpdate(HTTPClient& http, const String& currentVersion, bool spiffs = false);
-  bool runUpdate(Stream& in, uint32_t size, String md5, int command = U_FLASH);
-
-  int _lastError;
-  bool _rebootOnUpdate = true;
-
-private:
-  int _httpClientTimeout;
-  followRedirects_t _followRedirects;
-
-  int _ledPin;
-  uint8_t _ledOn;
-};
-
-#    if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_HTTPUPDATE)
-extern HTTPUpdate httpUpdate;
-#    endif
-
-#  endif /* ___HTTP_UPDATE_H___ */
-#endif
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index b77a9b1..ef70e82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,430 +5,285 @@
   "packages": {
     "": {
       "dependencies": {
-        "vuepress-plugin-sitemap": "^2.3.1"
+        "ini": "^4.1.1",
+        "markdown-table": "^3.0.3",
+        "mime-types": "^2.1.35"
       },
       "devDependencies": {
-        "vuepress": "^1.9.10"
+        "medium-zoom": "^1.1.0",
+        "vitepress": "^1.6.4",
+        "vue": "^3.5.44"
       }
     },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+    "node_modules/@algolia/abtesting": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.16.0.tgz",
+      "integrity": "sha512-alHFZ68/i9qLC/muEB07VQ9r7cB8AvCcGX6dVQi2PNHhc/ZQRmmFAv8KK1ay4UiseGSFr7f0nXBKsZ/jRg7e4g==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+    "node_modules/@algolia/autocomplete-core": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
+      "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
+        "@algolia/autocomplete-shared": "1.17.7"
       }
     },
-    "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
-      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
+    "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
+      "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
       "dev": true,
       "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.7",
-        "@babel/parser": "^7.23.6",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz",
-      "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@algolia/autocomplete-shared": "1.17.7"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "search-insights": ">= 1 < 3"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+    "node_modules/@algolia/autocomplete-preset-algolia": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
+      "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@algolia/autocomplete-shared": "1.17.7"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
-      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
+    "node_modules/@algolia/autocomplete-shared": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
+      "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      },
       "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+    "node_modules/@algolia/client-abtesting": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.50.0.tgz",
+      "integrity": "sha512-mfgUdLQNxOAvCZUGzPQxjahEWEPuQkKlV0ZtGmePOa9ZxIQZlk31vRBNbM6ScU8jTH41SCYE77G/lCifDr1SVw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+    "node_modules/@algolia/client-analytics": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.50.0.tgz",
+      "integrity": "sha512-5mjokeKYyPaP3Q8IYJEnutI+O4dW/Ixxx5IgsSxT04pCfGqPXxTOH311hTQxyNpcGGEOGrMv8n8Z+UMTPamioQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+    "node_modules/@algolia/client-common": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.50.0.tgz",
+      "integrity": "sha512-emtOvR6dl3rX3sBJXXbofMNHU1qMQqQSWu319RMrNL5BWoBqyiq7y0Zn6cjJm7aGHV/Qbf+KCCYeWNKEMPI3BQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-insights": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.50.0.tgz",
+      "integrity": "sha512-IerGH2/hcj/6bwkpQg/HHRqmlGN1XwygQWythAk0gZFBrghs9danJaYuSS3ShzLSVoIVth4jY5GDPX9Lbw5cgg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+    "node_modules/@algolia/client-personalization": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.50.0.tgz",
+      "integrity": "sha512-3idPJeXn5L0MmgP9jk9JJqblrQ/SguN93dNK9z9gfgyupBhHnJMOEjrRYcVgTIfvG13Y04wO+Q0FxE2Ut8PVbA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+    "node_modules/@algolia/client-query-suggestions": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.50.0.tgz",
+      "integrity": "sha512-q7qRoWrQK1a8m5EFQEmPlo7+pg9mVQ8X5jsChtChERre0uS2pdYEDixBBl0ydBSGkdGbLUDufcACIhH/077E4g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+    "node_modules/@algolia/client-search": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.50.0.tgz",
+      "integrity": "sha512-Jc360x4yqb3eEg4OY4KEIdGePBxZogivKI+OGIU8aLXgAYPTECvzeOBc90312yHA1hr3AeRlAFl0rIc8lQaIrQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+    "node_modules/@algolia/ingestion": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.50.0.tgz",
+      "integrity": "sha512-OS3/Viao+NPpyBbEY3tf6hLewppG+UclD+9i0ju56mq2DrdMJFCkEky6Sk9S5VPcbLzxzg3BqBX6u9Q35w19aQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+    "node_modules/@algolia/monitoring": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.50.0.tgz",
+      "integrity": "sha512-/znwgSiGufpbJVIoDmeQaHtTq+OMdDawFRbMSJVv+12n79hW+qdQXS8/Uu3BD3yn0BzgVFJEvrsHrCsInZKdhw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+    "node_modules/@algolia/recommend": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.50.0.tgz",
+      "integrity": "sha512-dHjUfu4jfjdQiKDpCpAnM7LP5yfG0oNShtfpF5rMCel6/4HIoqJ4DC4h5GKDzgrvJYtgAhblo0AYBmOM00T+lQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+    "node_modules/@algolia/requester-browser-xhr": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.50.0.tgz",
+      "integrity": "sha512-bffIbUljAWnh/Ctu5uScORajuUavqmZ0ACYd1fQQeSSYA9NNN83ynO26pSc2dZRXpSK0fkc1//qSSFXMKGu+aw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@algolia/client-common": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+    "node_modules/@algolia/requester-fetch": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.50.0.tgz",
+      "integrity": "sha512-y0EwNvPGvkM+yTAqqO6Gpt9wVGm3CLDtpLvNEiB3VGvN3WzfkjZGtLUsG/ru2kVJIIU7QcV0puuYgEpBeFxcJg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@algolia/client-common": "5.50.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-node-http": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.50.0.tgz",
+      "integrity": "sha512-xpwefe4fCOWnZgXCbkGpqQY6jgBSCf2hmgnySbyzZIccrv3SoashHKGPE4x6vVG+gdHrGciMTAcDo9HOZwH22Q==",
+      "dev": true,
+      "dependencies": {
+        "@algolia/client-common": "5.50.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz",
-      "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "version": "7.29.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz",
+      "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.8"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -436,1928 +291,1678 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
-      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
+    "node_modules/@babel/types": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
-      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.7.tgz",
-      "integrity": "sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.23.7",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-decorators": "^7.23.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0-placeholder-for-preset-env.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz",
-      "integrity": "sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
-      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
-      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
-      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
-      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
-      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
-      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
-      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
-      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
-      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
-      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
-      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
-      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
-      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
-      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
-      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
-      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
-      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
-      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
-      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
-      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
-      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
-      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
-      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
-      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
-      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
-      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
-      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
-      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
-      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.23.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
-      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
-      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
-      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
-      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
-      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
-      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
-      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
-      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
-      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz",
-      "integrity": "sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.7",
-        "babel-plugin-polyfill-corejs3": "^0.8.7",
-        "babel-plugin-polyfill-regenerator": "^0.5.4",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
-      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
-      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
-      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
-      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
-      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
-      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
-      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
-      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
-      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
-      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
-        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.5",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
-        "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.7",
-        "babel-plugin-polyfill-corejs3": "^0.8.7",
-        "babel-plugin-polyfill-regenerator": "^0.5.4",
-        "core-js-compat": "^3.31.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.6-no-external-plugins",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+    "node_modules/@docsearch/css": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
+      "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
       "dev": true
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.7.tgz",
-      "integrity": "sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==",
+    "node_modules/@docsearch/js": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
+      "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@docsearch/react": "3.8.2",
+        "preact": "^10.0.0"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+    "node_modules/@docsearch/react": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
+      "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@algolia/autocomplete-core": "1.17.7",
+        "@algolia/autocomplete-preset-algolia": "1.17.7",
+        "@docsearch/css": "3.8.2",
+        "algoliasearch": "^5.14.2"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@types/react": ">= 16.8.0 < 19.0.0",
+        "react": ">= 16.8.0 < 19.0.0",
+        "react-dom": ">= 16.8.0 < 19.0.0",
+        "search-insights": ">= 1 < 3"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        },
+        "search-insights": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/traverse": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@iconify-json/simple-icons": {
+      "version": "1.2.75",
+      "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.75.tgz",
+      "integrity": "sha512-KvcCUbvcBWb0sbqLIxHoY8z5/piXY08wcY9gfMhF+ph3AfzGMaSmZFkUY71HSXAljQngXkgs4bdKdekO0HQWvg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.23.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@iconify/types": "*"
       }
     },
-    "node_modules/@babel/types": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
+    "node_modules/@iconify/types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+      "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+      "dev": true
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.0.tgz",
+      "integrity": "sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.0.tgz",
+      "integrity": "sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.0.tgz",
+      "integrity": "sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.0.tgz",
+      "integrity": "sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.0.tgz",
+      "integrity": "sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.0.tgz",
+      "integrity": "sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.0.tgz",
+      "integrity": "sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.0.tgz",
+      "integrity": "sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.0.tgz",
+      "integrity": "sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.0.tgz",
+      "integrity": "sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.0.tgz",
+      "integrity": "sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.0.tgz",
+      "integrity": "sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.0.tgz",
+      "integrity": "sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.0.tgz",
+      "integrity": "sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.0.tgz",
+      "integrity": "sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.0.tgz",
+      "integrity": "sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.0.tgz",
+      "integrity": "sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.0.tgz",
+      "integrity": "sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.0.tgz",
+      "integrity": "sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.0.tgz",
+      "integrity": "sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.0.tgz",
+      "integrity": "sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.0.tgz",
+      "integrity": "sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.0.tgz",
+      "integrity": "sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.0.tgz",
+      "integrity": "sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.0.tgz",
+      "integrity": "sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@shikijs/core": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
+      "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/engine-javascript": "2.5.0",
+        "@shikijs/engine-oniguruma": "2.5.0",
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4",
+        "hast-util-to-html": "^9.0.4"
+      }
+    },
+    "node_modules/@shikijs/engine-javascript": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
+      "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "oniguruma-to-es": "^3.1.0"
+      }
+    },
+    "node_modules/@shikijs/engine-oniguruma": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
+      "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2"
+      }
+    },
+    "node_modules/@shikijs/langs": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
+      "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "node_modules/@shikijs/themes": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
+      "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "node_modules/@shikijs/transformers": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
+      "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/core": "2.5.0",
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "node_modules/@shikijs/types": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
+      "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/vscode-textmate": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
       "dev": true
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@mrmlnc/readdir-enhanced": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-      "dev": true,
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
-      "dev": true,
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
-      "dev": true,
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.41",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz",
-      "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/highlight.js": {
-      "version": "9.12.4",
-      "resolved": "https://registry.npmjs.org/@types/highlight.js/-/highlight.js-9.12.4.tgz",
-      "integrity": "sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==",
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true
     },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
-      "dev": true
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+    "node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "@types/unist": "*"
       }
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
-    },
     "node_modules/@types/linkify-it": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
-      "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
       "dev": true
     },
     "node_modules/@types/markdown-it": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-10.0.3.tgz",
-      "integrity": "sha512-daHJk22isOUvNssVGF2zDnnSyxHhFYhtjeX4oQaKD6QzL3ZR1QSgiD1g+Q6/WSWYVogNXYDXODtbgW/WiFCtyw==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
       "dependencies": {
-        "@types/highlight.js": "^9.7.0",
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*",
-        "highlight.js": "^9.7.0"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "*"
       }
     },
     "node_modules/@types/mdurl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
-      "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
-      "dev": true
-    },
-    "node_modules/@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "20.10.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.7.tgz",
-      "integrity": "sha512-fRbIKb8C/Y2lXxB5eVMj4IU7xpdox0Lh8bUPEdtLysaylsml1hOOx1+STloRs/B9nf7C6kPRmmg/V7aQW7usNg==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.8",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz",
-      "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==",
-      "dev": true
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.11",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz",
-      "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==",
-      "dev": true
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true
-    },
-    "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "dev": true,
-      "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
-      "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-errors": "*",
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/source-list-map": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.6.tgz",
-      "integrity": "sha512-5JcVt1u5HDmlXkwOD2nslZVllBBc7HDuOICfiZah2Z0is8M8g+ddAEawbmd3VjedfDHBzxCaXLs07QEmb7y54g==",
-      "dev": true
-    },
-    "node_modules/@types/tapable": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.12.tgz",
-      "integrity": "sha512-bTHG8fcxEqv1M9+TD14P8ok8hjxoOCkfKc8XXLaaD05kI7ohpeI956jtDOD3XHKBQrlyPughUtzm1jtVhHpA5Q==",
-      "dev": true
-    },
-    "node_modules/@types/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@types/uglify-js/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@types/webpack": {
-      "version": "4.41.38",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz",
-      "integrity": "sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/tapable": "^1",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "anymatch": "^3.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/@types/webpack-dev-server": {
-      "version": "3.11.6",
-      "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz",
-      "integrity": "sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/connect-history-api-fallback": "*",
-        "@types/express": "*",
-        "@types/serve-static": "*",
-        "@types/webpack": "^4",
-        "http-proxy-middleware": "^1.0.0"
-      }
-    },
-    "node_modules/@types/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-4nZOdMwSPHZ4pTEZzSp0AsTM4K7Qmu40UKW4tJDiOVs20UzYF9l+qUe4s0ftfN0pin06n+5cWWDJXH+sbhAiDw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.7.3"
-      }
-    },
-    "node_modules/@types/webpack-sources/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@types/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
-      "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
-      "dev": true
-    },
-    "node_modules/@vue/babel-helper-vue-transform-on": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.1.5.tgz",
-      "integrity": "sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==",
-      "dev": true
-    },
-    "node_modules/@vue/babel-plugin-jsx": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.5.tgz",
-      "integrity": "sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5",
-        "@vue/babel-helper-vue-transform-on": "^1.1.5",
-        "camelcase": "^6.3.0",
-        "html-tags": "^3.3.1",
-        "svg-tags": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-plugin-transform-vue-jsx": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
-      "integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-        "html-tags": "^2.0.0",
-        "lodash.kebabcase": "^4.1.1",
-        "svg-tags": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-plugin-transform-vue-jsx/node_modules/html-tags": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-      "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true
+    },
+    "node_modules/@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+      "dev": true
+    },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+      "dev": true
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true
+    },
+    "node_modules/@vitejs/plugin-vue": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
+      "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
       "dev": true,
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vue/babel-preset-app": {
-      "version": "4.5.19",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.5.19.tgz",
-      "integrity": "sha512-VCNRiAt2P/bLo09rYt3DLe6xXUMlhJwrvU18Ddd/lYJgC7s8+wvhgYs+MTx4OiAXdu58drGwSBO9SPx7C6J82Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.0",
-        "@babel/helper-compilation-targets": "^7.9.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/plugin-proposal-class-properties": "^7.8.3",
-        "@babel/plugin-proposal-decorators": "^7.8.3",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-jsx": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.11.0",
-        "@babel/preset-env": "^7.11.0",
-        "@babel/runtime": "^7.11.0",
-        "@vue/babel-plugin-jsx": "^1.0.3",
-        "@vue/babel-preset-jsx": "^1.2.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3",
-        "core-js": "^3.6.5",
-        "core-js-compat": "^3.6.5",
-        "semver": "^6.1.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "*",
-        "core-js": "^3",
-        "vue": "^2 || ^3.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "core-js": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
+        "vite": "^5.0.0 || ^6.0.0",
+        "vue": "^3.2.25"
       }
     },
-    "node_modules/@vue/babel-preset-jsx": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
-      "integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
+    "node_modules/@vue/compiler-core": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.44.tgz",
+      "integrity": "sha512-k34nCytbK8PQ1gR2mGROYOw6Pnv/mumqIdrZ3x2tbyXZDWm7ViKGLTfdB+DRrWqEQsLgGJvn0WN9jBif5zCTLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-        "@vue/babel-sugar-composition-api-inject-h": "^1.4.0",
-        "@vue/babel-sugar-composition-api-render-instance": "^1.4.0",
-        "@vue/babel-sugar-functional-vue": "^1.4.0",
-        "@vue/babel-sugar-inject-h": "^1.4.0",
-        "@vue/babel-sugar-v-model": "^1.4.0",
-        "@vue/babel-sugar-v-on": "^1.4.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0",
-        "vue": "*"
-      },
-      "peerDependenciesMeta": {
-        "vue": {
-          "optional": true
-        }
+        "@babel/parser": "^7.29.9",
+        "@vue/shared": "3.5.44",
+        "entities": "^7.0.1",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.2"
       }
     },
-    "node_modules/@vue/babel-sugar-composition-api-inject-h": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
-      "integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.44.tgz",
+      "integrity": "sha512-W5AoBFWdw1lQAKiHowkfgFKFab82oSRT6sGsPfw/q1GRjsy/ZJFLHGhJyBRIFN9APLTUduDH9U2JAiPOIyKuYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-sugar-composition-api-render-instance": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
-      "integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-sugar-functional-vue": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
-      "integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-sugar-inject-h": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
-      "integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-sugar-v-model": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
-      "integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-        "camelcase": "^5.0.0",
-        "html-tags": "^2.0.0",
-        "svg-tags": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-sugar-v-model/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@vue/babel-sugar-v-model/node_modules/html-tags": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-      "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vue/babel-sugar-v-on": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
-      "integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-        "camelcase": "^5.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@vue/babel-sugar-v-on/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+        "@vue/compiler-core": "3.5.44",
+        "@vue/shared": "3.5.44"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.44.tgz",
+      "integrity": "sha512-dzHmQ4jXTpdr5FjIQUeykVakN/uzqFbUo9/C5ikBFg3a3PeM6uRxeczx1ZbXBML0/zJstEh3ygYipzR5Z7b2Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.23.5",
-        "postcss": "^8.4.14",
-        "source-map": "^0.6.1"
-      },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
+        "@babel/parser": "^7.29.9",
+        "@vue/compiler-core": "3.5.44",
+        "@vue/compiler-dom": "3.5.44",
+        "@vue/compiler-ssr": "3.5.44",
+        "@vue/shared": "3.5.44",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.29",
+        "source-map-js": "^1.2.2"
       }
     },
-    "node_modules/@vue/compiler-sfc/node_modules/postcss": {
-      "version": "8.4.33",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.44.tgz",
+      "integrity": "sha512-xr5gb1JVHlfXJwSlRz1FeP6uxoazdzHuMTVLE7up+4Vrqxk219CvxLPxD9NXBt47yvZW7+p4DXfyp4O1fkByIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "node_modules/@vue/devtools-api": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+      "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+      "dev": true,
+      "dependencies": {
+        "@vue/devtools-kit": "^7.7.9"
+      }
+    },
+    "node_modules/@vue/devtools-kit": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+      "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+      "dev": true,
+      "dependencies": {
+        "@vue/devtools-shared": "^7.7.9",
+        "birpc": "^2.3.0",
+        "hookable": "^5.5.3",
+        "mitt": "^3.0.1",
+        "perfect-debounce": "^1.0.0",
+        "speakingurl": "^14.0.1",
+        "superjson": "^2.2.2"
+      }
+    },
+    "node_modules/@vue/devtools-shared": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+      "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+      "dev": true,
+      "dependencies": {
+        "rfdc": "^1.4.1"
+      }
+    },
+    "node_modules/@vue/reactivity": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.44.tgz",
+      "integrity": "sha512-u+QJdKeBBEADkPdevsL+6E12QlYVfBD8Zcw5qjDQKtamI6l14KyqazJMobhCKelhWN5zpyKUiEDoTyHE93cqWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "node_modules/@vue/runtime-core": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.44.tgz",
+      "integrity": "sha512-uEa/ndwjhrrhnOfb2p+sZy6zeoamJOISqaLSJGk/8R6nABT1ZldpzcJoPzKj+zHVomVBPcmQYyC2r4LtvDV6CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/reactivity": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.44.tgz",
+      "integrity": "sha512-3fc4ARcXVhVBaJ3ujWiNZJARD6pkyRcwG+ZYhMzjKtKUp7MAY0HLwr7r3Smep3Li6ZaWT6ewdmx8XqdaD5oNZg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/reactivity": "3.5.44",
+        "@vue/runtime-core": "3.5.44",
+        "@vue/shared": "3.5.44",
+        "csstype": "^3.2.3"
+      }
+    },
+    "node_modules/@vue/server-renderer": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.44.tgz",
+      "integrity": "sha512-R4S1UoH4h5Frrauv8Z5XE5TxV9oBiUSgWIC4TyVK1FK+RocRnOLwFA5Xcmo2011RlgJp+AbZCnw6afrhlgRuUQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-ssr": "3.5.44",
+        "@vue/runtime-dom": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.44.tgz",
+      "integrity": "sha512-H82XLH0DjmSOdbEwO15x3QTo1f5PWEtv237eLpYKc0mqLu+B8hnq16lFWmuBmNurkeiG3wr+oM1FhOll/YVFRg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vueuse/core": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
+      "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "12.8.2",
+        "@vueuse/shared": "12.8.2",
+        "vue": "^3.5.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/integrations": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
+      "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
+      "dev": true,
+      "dependencies": {
+        "@vueuse/core": "12.8.2",
+        "@vueuse/shared": "12.8.2",
+        "vue": "^3.5.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "async-validator": "^4",
+        "axios": "^1",
+        "change-case": "^5",
+        "drauu": "^0.4",
+        "focus-trap": "^7",
+        "fuse.js": "^7",
+        "idb-keyval": "^6",
+        "jwt-decode": "^4",
+        "nprogress": "^0.2",
+        "qrcode": "^1.5",
+        "sortablejs": "^1",
+        "universal-cookie": "^7"
+      },
+      "peerDependenciesMeta": {
+        "async-validator": {
+          "optional": true
+        },
+        "axios": {
+          "optional": true
+        },
+        "change-case": {
+          "optional": true
+        },
+        "drauu": {
+          "optional": true
+        },
+        "focus-trap": {
+          "optional": true
+        },
+        "fuse.js": {
+          "optional": true
+        },
+        "idb-keyval": {
+          "optional": true
+        },
+        "jwt-decode": {
+          "optional": true
+        },
+        "nprogress": {
+          "optional": true
+        },
+        "qrcode": {
+          "optional": true
+        },
+        "sortablejs": {
+          "optional": true
+        },
+        "universal-cookie": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
+      "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
+      "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+      "dev": true,
+      "dependencies": {
+        "vue": "^3.5.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/algoliasearch": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.50.0.tgz",
+      "integrity": "sha512-yE5I83Q2s8euVou8Y3feXK08wyZInJWLYXgWO6Xti9jBUEZAGUahyeQ7wSZWkifLWVnQVKEz5RAmBlXG5nqxog==",
+      "dev": true,
+      "dependencies": {
+        "@algolia/abtesting": "1.16.0",
+        "@algolia/client-abtesting": "5.50.0",
+        "@algolia/client-analytics": "5.50.0",
+        "@algolia/client-common": "5.50.0",
+        "@algolia/client-insights": "5.50.0",
+        "@algolia/client-personalization": "5.50.0",
+        "@algolia/client-query-suggestions": "5.50.0",
+        "@algolia/client-search": "5.50.0",
+        "@algolia/ingestion": "1.50.0",
+        "@algolia/monitoring": "1.50.0",
+        "@algolia/recommend": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/birpc": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
+      "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/comma-separated-tokens": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/copy-anything": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+      "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+      "dev": true,
+      "dependencies": {
+        "is-what": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/emoji-regex-xs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+      "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+      "dev": true
+    },
+    "node_modules/entities": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/focus-trap": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.8.0.tgz",
+      "integrity": "sha512-/yNdlIkpWbM0ptxno3ONTuf+2g318kh2ez3KSeZN5dZ8YC6AAmgeWz+GasYYiBJPFaYcSAPeu4GfhUaChzIJXA==",
+      "dev": true,
+      "dependencies": {
+        "tabbable": "^6.4.0"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/hast-util-to-html": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
+      "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-whitespace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hookable": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+      "dev": true
+    },
+    "node_modules/html-void-elements": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/ini": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+      "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
+    "node_modules/mark.js": {
+      "version": "8.11.1",
+      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+      "dev": true
+    },
+    "node_modules/markdown-table": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz",
+      "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/mdast-util-to-hast": {
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
+      "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/medium-zoom": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-1.1.0.tgz",
+      "integrity": "sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==",
+      "dev": true
+    },
+    "node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minisearch": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+      "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
+      "dev": true
+    },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/oniguruma-to-es": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
+      "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex-xs": "^1.0.0",
+        "regex": "^6.0.1",
+        "regex-recursion": "^6.0.2"
+      }
+    },
+    "node_modules/perfect-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true
+    },
+    "node_modules/postcss": {
+      "version": "8.5.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.30.tgz",
+      "integrity": "sha512-zkd+e9S1AQHhmaBKye9zlFHWjOwVgqXl1q3ECYy8561K7qxR2cREf/STLskulBFd78k6AOFeA+ff1TtEzk9bAA==",
       "dev": true,
       "funding": [
         {
@@ -2373,25275 +1978,1974 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.3.20",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/@vue/compiler-sfc/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/preact": {
+      "version": "10.29.0",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.29.0.tgz",
+      "integrity": "sha512-wSAGyk2bYR1c7t3SZ3jHcM6xy0lcBcDel6lODcs9ME6Th++Dx2KU+6D3HD8wMMKGA8Wpw7OMd3/4RGzYRpzwRg==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-      "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
-      "dev": true,
-      "dependencies": {
-        "consolidate": "^0.15.1",
-        "hash-sum": "^1.0.2",
-        "lru-cache": "^4.1.2",
-        "merge-source-map": "^1.1.0",
-        "postcss": "^7.0.36",
-        "postcss-selector-parser": "^6.0.2",
-        "source-map": "~0.6.1",
-        "vue-template-es2015-compiler": "^1.9.0"
-      },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
-    },
-    "node_modules/@vuepress/core": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.9.10.tgz",
-      "integrity": "sha512-H9ddo5fSinPb8QYl8OJFbZikMpOW84bm/U3Drzz8CnCXNtpda7CU2wX/XzOhe98G8jp45xhtZRkxOrqzBBAShA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.8.4",
-        "@vue/babel-preset-app": "^4.1.2",
-        "@vuepress/markdown": "1.9.10",
-        "@vuepress/markdown-loader": "1.9.10",
-        "@vuepress/plugin-last-updated": "1.9.10",
-        "@vuepress/plugin-register-components": "1.9.10",
-        "@vuepress/shared-utils": "1.9.10",
-        "@vuepress/types": "1.9.10",
-        "autoprefixer": "^9.5.1",
-        "babel-loader": "^8.0.4",
-        "bundle-require": "2.1.8",
-        "cache-loader": "^3.0.0",
-        "chokidar": "^2.0.3",
-        "connect-history-api-fallback": "^1.5.0",
-        "copy-webpack-plugin": "^5.0.2",
-        "core-js": "^3.6.4",
-        "cross-spawn": "^6.0.5",
-        "css-loader": "^2.1.1",
-        "esbuild": "0.14.7",
-        "file-loader": "^3.0.1",
-        "js-yaml": "^3.13.1",
-        "lru-cache": "^5.1.1",
-        "mini-css-extract-plugin": "0.6.0",
-        "optimize-css-assets-webpack-plugin": "^5.0.1",
-        "portfinder": "^1.0.13",
-        "postcss-loader": "^3.0.0",
-        "postcss-safe-parser": "^4.0.1",
-        "toml": "^3.0.0",
-        "url-loader": "^1.0.1",
-        "vue": "^2.6.10",
-        "vue-loader": "^15.7.1",
-        "vue-router": "^3.4.5",
-        "vue-server-renderer": "^2.6.10",
-        "vue-template-compiler": "^2.6.10",
-        "vuepress-html-webpack-plugin": "^3.2.0",
-        "vuepress-plugin-container": "^2.0.2",
-        "webpack": "^4.8.1",
-        "webpack-chain": "^6.0.0",
-        "webpack-dev-server": "^3.5.1",
-        "webpack-merge": "^4.1.2",
-        "webpackbar": "3.2.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/@vuepress/markdown": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.9.10.tgz",
-      "integrity": "sha512-sXTLjeZzH8SQuAL5AEH0hhsMljjNJbzWbBvzaj5yQCCdf+3sp/dJ0kwnBSnQjFPPnzPg5t3tLKGUYHyW0KiKzA==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/shared-utils": "1.9.10",
-        "markdown-it": "^8.4.1",
-        "markdown-it-anchor": "^5.0.2",
-        "markdown-it-chain": "^1.3.0",
-        "markdown-it-emoji": "^1.4.0",
-        "markdown-it-table-of-contents": "^0.4.0",
-        "prismjs": "^1.13.0"
-      }
-    },
-    "node_modules/@vuepress/markdown-loader": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.9.10.tgz",
-      "integrity": "sha512-94BlwKc+lOaN/A5DkyA9KWHvMlMC1sWunAXE3Tv0WYzgYLDs9QqCsx7L5kLkpcOOVVm/8kBJumnXvVBwhqJddw==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/markdown": "1.9.10",
-        "loader-utils": "^1.1.0",
-        "lru-cache": "^5.1.1"
-      }
-    },
-    "node_modules/@vuepress/plugin-active-header-links": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.9.10.tgz",
-      "integrity": "sha512-2dRr3DE2UBFXhyMtLR3sGTdRyDM8YStuY6AOoQmoSgwy1IHt7PO7ypOuf1akF+1Nv8Q2aISU06q6TExZouu3Mw==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/types": "1.9.10",
-        "lodash.debounce": "^4.0.8"
-      }
-    },
-    "node_modules/@vuepress/plugin-last-updated": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.10.tgz",
-      "integrity": "sha512-YxzWGF/OfU6WsHSynZFn74NGGp7dY27Bjy9JyyFo8wF5+2V1gpyDjveHKHGKugS/pMXlxfjzhv9E2Wmy9R7Iog==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/types": "1.9.10",
-        "cross-spawn": "^6.0.5"
-      }
-    },
-    "node_modules/@vuepress/plugin-nprogress": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.9.10.tgz",
-      "integrity": "sha512-I1kkm6yWUQd7vwiV3lEDVpVP0Lr04K0zlczU502lDUa1RufSZ7vt+mlF5fOM28GqT+pKTEToWmm+VNT/R3qvMQ==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/types": "1.9.10",
-        "nprogress": "^0.2.0"
-      }
-    },
-    "node_modules/@vuepress/plugin-register-components": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.9.10.tgz",
-      "integrity": "sha512-sgdJ5OydTPZAoTkselpvVP3Xsd6bfZ0FpaxOTinal0gJ99h49lvLu9bvzMx13rdGRFO/kRXn0qQQpwKTAfTPqA==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/shared-utils": "1.9.10",
-        "@vuepress/types": "1.9.10"
-      }
-    },
-    "node_modules/@vuepress/plugin-search": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.9.10.tgz",
-      "integrity": "sha512-bn2XJikaRgQZXvu8upCjOWrxbLHIRTqnJ3w7G0mo6jCYWGVsHNo6XhVpqylpLR2PWnHT/ImO2bGo38/5Bag/tQ==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/types": "1.9.10"
-      }
-    },
-    "node_modules/@vuepress/shared-utils": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.9.10.tgz",
-      "integrity": "sha512-M9A3DocPih+V8dKK2Zg9FJQ/f3JZrYsdaM/vQ9F48l8bPlzxw5NvqXIYMK4kKcGEyerQNTWCudoCpLL5uiU0hg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.3.2",
-        "escape-html": "^1.0.3",
-        "fs-extra": "^7.0.1",
-        "globby": "^9.2.0",
-        "gray-matter": "^4.0.1",
-        "hash-sum": "^1.0.2",
-        "semver": "^6.0.0",
-        "toml": "^3.0.0",
-        "upath": "^1.1.0"
-      }
-    },
-    "node_modules/@vuepress/theme-default": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.9.10.tgz",
-      "integrity": "sha512-XnXn9t+pYCIhWi3cZXJlighuy93FFm5yXdISAAlFlcNkshuGtqamkjacHV8q/QZMfOhSIs6wX7Hj88u2IsT5mw==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/plugin-active-header-links": "1.9.10",
-        "@vuepress/plugin-nprogress": "1.9.10",
-        "@vuepress/plugin-search": "1.9.10",
-        "@vuepress/types": "1.9.10",
-        "docsearch.js": "^2.5.2",
-        "lodash": "^4.17.15",
-        "stylus": "^0.54.8",
-        "stylus-loader": "^3.0.2",
-        "vuepress-plugin-container": "^2.0.2",
-        "vuepress-plugin-smooth-scroll": "^0.0.3"
-      }
-    },
-    "node_modules/@vuepress/types": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.10.tgz",
-      "integrity": "sha512-TDNQn4og85onmBpLTTXXmncW3rUnYGr2MkuI8OIFJZetDNM49t1WbjNVlrT+kx7C6qXi6okDQgrHGYXajHZWfg==",
-      "dev": true,
-      "dependencies": {
-        "@types/markdown-it": "^10.0.0",
-        "@types/webpack-dev-server": "^3",
-        "webpack-chain": "^6.0.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agentkeepalive": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz",
-      "integrity": "sha512-TnB6ziK363p7lR8QpeLC8aMr8EGYBKZTpgzQLfqTs3bR0Oo5VbKdwKf8h0dSzsYrB7lSCgfJnMZKqShvlq5Oyg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": ">=5.0.0"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/algoliasearch": {
-      "version": "3.35.1",
-      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-3.35.1.tgz",
-      "integrity": "sha512-K4yKVhaHkXfJ/xcUnil04xiSrB8B8yHZoFEhWNpXg23eiCnqvTZw1tn/SqvdsANlYHLJlKl0qi3I/Q2Sqo7LwQ==",
-      "dev": true,
-      "dependencies": {
-        "agentkeepalive": "^2.2.0",
-        "debug": "^2.6.9",
-        "envify": "^4.0.0",
-        "es6-promise": "^4.1.0",
-        "events": "^1.1.0",
-        "foreach": "^2.0.5",
-        "global": "^4.3.2",
-        "inherits": "^2.0.1",
-        "isarray": "^2.0.1",
-        "load-script": "^1.0.0",
-        "object-keys": "^1.0.11",
-        "querystring-es3": "^0.2.1",
-        "reduce": "^1.0.1",
-        "semver": "^5.1.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/algoliasearch/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/algoliasearch/node_modules/events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/algoliasearch/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/algoliasearch/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/algoliasearch/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
-      "dev": true
-    },
-    "node_modules/ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.1.0"
-      }
-    },
-    "node_modules/ansi-align/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-align/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-align/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-align/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.reduce": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
-      "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
-      "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.4",
-        "util": "^0.10.4"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
-      "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
-    },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/autocomplete.js": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.36.0.tgz",
-      "integrity": "sha512-jEwUXnVMeCHHutUt10i/8ZiRaCb0Wo+ZyKxeGsYwBDtw6EJHqEeDrq4UwZRD8YBSvp3g6klP678il2eeiVXN2Q==",
-      "dev": true,
-      "dependencies": {
-        "immediate": "^3.2.3"
-      }
-    },
-    "node_modules/autoprefixer": {
-      "version": "9.8.8",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
-      "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "picocolors": "^0.2.1",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-      "dev": true
-    },
-    "node_modules/babel-loader": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
-      "dev": true,
-      "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 8.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-loader/node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz",
-      "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.4",
-        "semver": "^6.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
-      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.4",
-        "core-js-compat": "^3.33.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz",
-      "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-      "dev": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==",
-      "dev": true,
-      "dependencies": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "node_modules/boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/boxen/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/boxen/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/boxen/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/boxen/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/boxen/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/boxen/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.22.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001565",
-        "electron-to-chromium": "^1.4.601",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
-    "node_modules/buffer-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
-      "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-      "dev": true
-    },
-    "node_modules/bundle-require": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-2.1.8.tgz",
-      "integrity": "sha512-oOEg3A0hy/YzvNWNowtKD0pmhZKseOFweCbgyMqTIih4gRY1nJWsvrOCT27L9NbIyL5jMjTFrAUpGxxpW68Puw==",
-      "dev": true,
-      "peerDependencies": {
-        "esbuild": ">=0.13"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cache-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-3.0.1.tgz",
-      "integrity": "sha512-HzJIvGiGqYsFUrMjAJNDbVZoG7qQA+vy9AIoKs7s9DscNfki0I589mf2w6/tW+kkFH3zyiknoWV5Jdynu6b/zw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-json": "^2.0.0",
-        "find-cache-dir": "^2.1.0",
-        "loader-utils": "^1.2.3",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/cache-loader/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cache-loader/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cache-loader/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cache-loader/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cache-loader/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cache-loader/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cache-loader/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cache-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/cache-loader/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
-      "dev": true
-    },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
-      "dev": true,
-      "dependencies": {
-        "caller-callsite": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001576",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz",
-      "integrity": "sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/chokidar/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/chokidar/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.3",
-        "color-string": "^1.6.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/color-string": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
-      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/consola": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-      "dev": true
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-      "dev": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "node_modules/copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz",
-      "integrity": "sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^12.0.3",
-        "find-cache-dir": "^2.1.0",
-        "glob-parent": "^3.1.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "minimatch": "^3.0.4",
-        "normalize-path": "^3.0.0",
-        "p-limit": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "webpack-log": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "url": "https://opencollective.com/preact"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-      "integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/globby/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-      "dev": true
-    },
-    "node_modules/copy-webpack-plugin/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.0.tgz",
-      "integrity": "sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz",
-      "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.22.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dev": true,
-      "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      },
-      "engines": {
-        "node": ">4"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
-      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.2.0",
-        "icss-utils": "^4.1.0",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.14",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^2.0.6",
-        "postcss-modules-scope": "^2.1.0",
-        "postcss-modules-values": "^2.0.0",
-        "postcss-value-parser": "^3.3.0",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/css-loader/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/css-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha512-UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA==",
-      "dev": true,
-      "dependencies": {
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.8",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-      "dev": true,
-      "dependencies": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.3",
-        "postcss-unique-selectors": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "dev": true
-    },
-    "node_modules/cyclist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
-      "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==",
-      "dev": true
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-      "dev": true
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/deep-equal": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
-      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
-      "dev": true,
-      "dependencies": {
-        "is-arguments": "^1.1.1",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.5.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
-      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
-    },
-    "node_modules/dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
-      "dev": true,
-      "dependencies": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==",
-      "dev": true,
-      "dependencies": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
-    "node_modules/docsearch.js": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/docsearch.js/-/docsearch.js-2.6.3.tgz",
-      "integrity": "sha512-GN+MBozuyz664ycpZY0ecdQE0ND/LSgJKhTLA0/v3arIS3S1Rpf2OJz6A35ReMsm91V5apcmzr5/kM84cvUg+A==",
-      "deprecated": "This package has been deprecated and is no longer maintained. Please use @docsearch/js.",
-      "dev": true,
-      "dependencies": {
-        "algoliasearch": "^3.24.5",
-        "autocomplete.js": "0.36.0",
-        "hogan.js": "^3.0.2",
-        "request": "^2.87.0",
-        "stack-utils": "^1.0.1",
-        "to-factory": "^1.0.0",
-        "zepto": "^1.2.0"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/dom-walk": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
-      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
-      "dev": true
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domhandler/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
-      "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
-      "dev": true
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.623",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.623.tgz",
-      "integrity": "sha512-lKoz10iCYlP1WtRYdh5MvocQPWVRoI7ysp6qf18bmeBgR8abE6+I2CsfyNKztRDZvhdWc+krKT6wS7Neg8sw3A==",
-      "dev": true
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "node_modules/envify": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/envify/-/envify-4.1.0.tgz",
-      "integrity": "sha512-IKRVVoAYr4pIx4yIWNsz9mOsboxlNXiu7TNBnem/K/uTHdkyzXWDzHCK7UTolqBbgaBz0tQHsD3YNls0uIIjiw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.0",
-        "through": "~2.3.4"
-      },
-      "bin": {
-        "envify": "bin/envify"
-      }
-    },
-    "node_modules/envinfo": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz",
-      "integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
-    "node_modules/esbuild": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.7.tgz",
-      "integrity": "sha512-+u/msd6iu+HvfysUPkZ9VHm83LImmSNnecYPfFI01pQ7TTcsFR+V0BkybZX7mPtIaI7LCrse6YRj+v3eraJSgw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "optionalDependencies": {
-        "esbuild-android-arm64": "0.14.7",
-        "esbuild-darwin-64": "0.14.7",
-        "esbuild-darwin-arm64": "0.14.7",
-        "esbuild-freebsd-64": "0.14.7",
-        "esbuild-freebsd-arm64": "0.14.7",
-        "esbuild-linux-32": "0.14.7",
-        "esbuild-linux-64": "0.14.7",
-        "esbuild-linux-arm": "0.14.7",
-        "esbuild-linux-arm64": "0.14.7",
-        "esbuild-linux-mips64le": "0.14.7",
-        "esbuild-linux-ppc64le": "0.14.7",
-        "esbuild-netbsd-64": "0.14.7",
-        "esbuild-openbsd-64": "0.14.7",
-        "esbuild-sunos-64": "0.14.7",
-        "esbuild-windows-32": "0.14.7",
-        "esbuild-windows-64": "0.14.7",
-        "esbuild-windows-arm64": "0.14.7"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.7.tgz",
-      "integrity": "sha512-9/Q1NC4JErvsXzJKti0NHt+vzKjZOgPIjX/e6kkuCzgfT/GcO3FVBcGIv4HeJG7oMznE6KyKhvLrFgt7CdU2/w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.7.tgz",
-      "integrity": "sha512-Z9X+3TT/Xj+JiZTVlwHj2P+8GoiSmUnGVz0YZTSt8WTbW3UKw5Pw2ucuJ8VzbD2FPy0jbIKJkko/6CMTQchShQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.7.tgz",
-      "integrity": "sha512-68e7COhmwIiLXBEyxUxZSSU0akgv8t3e50e2QOtKdBUE0F6KIRISzFntLe2rYlNqSsjGWsIO6CCc9tQxijjSkw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.7.tgz",
-      "integrity": "sha512-76zy5jAjPiXX/S3UvRgG85Bb0wy0zv/J2lel3KtHi4V7GUTBfhNUPt0E5bpSXJ6yMT7iThhnA5rOn+IJiUcslQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.7.tgz",
-      "integrity": "sha512-lSlYNLiqyzd7qCN5CEOmLxn7MhnGHPcu5KuUYOG1i+t5A6q7LgBmfYC9ZHJBoYyow3u4CNu79AWHbvVLpE/VQQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.7.tgz",
-      "integrity": "sha512-Vk28u409wVOXqTaT6ek0TnfQG4Ty1aWWfiysIaIRERkNLhzLhUf4i+qJBN8mMuGTYOkE40F0Wkbp6m+IidOp2A==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.7.tgz",
-      "integrity": "sha512-+Lvz6x+8OkRk3K2RtZwO+0a92jy9si9cUea5Zoru4yJ/6EQm9ENX5seZE0X9DTwk1dxJbjmLsJsd3IoowyzgVg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.7.tgz",
-      "integrity": "sha512-OzpXEBogbYdcBqE4uKynuSn5YSetCvK03Qv1HcOY1VN6HmReuatjJ21dCH+YPHSpMEF0afVCnNfffvsGEkxGJQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.7.tgz",
-      "integrity": "sha512-kJd5beWSqteSAW086qzCEsH6uwpi7QRIpzYWHzEYwKKu9DiG1TwIBegQJmLpPsLp4v5RAFjea0JAmAtpGtRpqg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.7.tgz",
-      "integrity": "sha512-mFWpnDhZJmj/h7pxqn1GGDsKwRfqtV7fx6kTF5pr4PfXe8pIaTERpwcKkoCwZUkWAOmUEjMIUAvFM72A6hMZnA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.7.tgz",
-      "integrity": "sha512-wM7f4M0bsQXfDL4JbbYD0wsr8cC8KaQ3RPWc/fV27KdErPW7YsqshZZSjDV0kbhzwpNNdhLItfbaRT8OE8OaKA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.7.tgz",
-      "integrity": "sha512-J/afS7woKyzGgAL5FlgvMyqgt5wQ597lgsT+xc2yJ9/7BIyezeXutXqfh05vszy2k3kSvhLesugsxIA71WsqBw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ]
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.7.tgz",
-      "integrity": "sha512-7CcxgdlCD+zAPyveKoznbgr3i0Wnh0L8BDGRCjE/5UGkm5P/NQko51tuIDaYof8zbmXjjl0OIt9lSo4W7I8mrw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.7.tgz",
-      "integrity": "sha512-GKCafP2j/KUljVC3nesw1wLFSZktb2FGCmoT1+730zIF5O6hNroo0bSEofm6ZK5mNPnLiSaiLyRB9YFgtkd5Xg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ]
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.7.tgz",
-      "integrity": "sha512-5I1GeL/gZoUUdTPA0ws54bpYdtyeA2t6MNISalsHpY269zK8Jia/AXB3ta/KcDHv2SvNwabpImeIPXC/k0YW6A==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.7.tgz",
-      "integrity": "sha512-CIGKCFpQOSlYsLMbxt8JjxxvVw9MlF1Rz2ABLVfFyHUF5OeqHD5fPhGrCVNaVrhO8Xrm+yFmtjcZudUGr5/WYQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.7.tgz",
-      "integrity": "sha512-eOs1eSivOqN7cFiRIukEruWhaCf75V0N8P0zP7dh44LIhLl8y6/z++vv9qQVbkBm5/D7M7LfCfCTmt1f1wHOCw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/esm": {
-      "version": "3.2.25",
-      "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
-      "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/eventsource": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
-      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-      "dev": true,
-      "dependencies": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "deprecated": "This module is no longer supported.",
-      "dev": true
-    },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/foreach": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
-      "dev": true
-    },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-      "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-      "dev": true
-    },
-    "node_modules/global": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
-      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
-      "dev": true,
-      "dependencies": {
-        "min-document": "^2.19.0",
-        "process": "^0.11.10"
-      }
-    },
-    "node_modules/global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
-      "dev": true,
-      "dependencies": {
-        "ini": "1.3.7"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globby": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-      "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^1.0.2",
-        "dir-glob": "^2.2.2",
-        "fast-glob": "^2.2.6",
-        "glob": "^7.1.3",
-        "ignore": "^4.0.3",
-        "pify": "^4.0.1",
-        "slash": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/gray-matter": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
-      "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
-      "dev": true,
-      "dependencies": {
-        "js-yaml": "^3.13.1",
-        "kind-of": "^6.0.2",
-        "section-matter": "^1.0.0",
-        "strip-bom-string": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
-      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-      "dev": true
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-      "dev": true
-    },
-    "node_modules/highlight.js": {
-      "version": "9.18.5",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
-      "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hogan.js": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz",
-      "integrity": "sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "0.3.0",
-        "nopt": "1.0.10"
-      },
-      "bin": {
-        "hulk": "bin/hulk"
-      }
-    },
-    "node_modules/hogan.js/node_modules/mkdirp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-      "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==",
-      "dev": true
-    },
-    "node_modules/hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==",
-      "dev": true
-    },
-    "node_modules/html-entities": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
-      "dev": true
-    },
-    "node_modules/html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "bin": {
-        "html-minifier": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/html-tags": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
-      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/htmlparser2/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.5",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-      "dev": true
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==",
-      "dev": true
-    },
-    "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==",
-      "dev": true
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immediate": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
-      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==",
-      "dev": true
-    },
-    "node_modules/import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg==",
-      "dev": true,
-      "dependencies": {
-        "import-from": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-      "dev": true,
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-local/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
-      "dev": true
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
-      "dev": true
-    },
-    "node_modules/internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "dev": true,
-      "dependencies": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
-      "dev": true
-    },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
-      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/is-ci/node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
-    "node_modules/is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==",
-      "dev": true,
-      "dependencies": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
-      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
-      "dev": true,
-      "dependencies": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-installed-globally/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-      "dev": true,
-      "dependencies": {
-        "which-typed-array": "^1.1.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
-    },
-    "node_modules/javascript-stringify": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz",
-      "integrity": "sha512-fnjC0up+0SjEJtgmmG+teeel68kutkvzfctO/KxE3qJlbunkJYAshgH3boU++gSBHP8z5/r0ts0qRIrHf0RTQQ==",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "node_modules/killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-      "dev": true
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/last-call-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.5",
-        "webpack-sources": "^1.1.0"
-      }
-    },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-      "dev": true,
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "node_modules/load-script": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
-      "integrity": "sha512-kPEjMFtZvwL9TaZo0uZ2ml+Ye9HUMmPwbYRJ324qF9tqMejwykJ5ggTyvzmrbBeapCAbk98BSbTeovHEEP1uCA==",
-      "dev": true
-    },
-    "node_modules/loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/loader-utils/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
-      "dev": true
-    },
-    "node_modules/lodash.chunk": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
-      "integrity": "sha512-ZzydJKfUHJwHa+hF5X66zLFCBrWn5GeF28OHEr4WVWtNDXlQ/IjWKPBiikqKo2ne0+v6JgCgJ0GzJp8k8bHC7w=="
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
-    },
-    "node_modules/lodash.kebabcase": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-      "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
-      "dev": true
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "node_modules/lodash.padstart": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz",
-      "integrity": "sha512-sW73O6S8+Tg66eY56DBk85aQzzUJDtpoXFBgELMd5P/SotAguo+1kYO6RuYgXxA4HJH3LFTFPASX6ET6bjfriw=="
-    },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
-    },
-    "node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-      "dev": true
-    },
-    "node_modules/loglevel": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
-      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/loglevel"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
-      "dev": true
-    },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/markdown-it": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
-      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~1.1.1",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/markdown-it-anchor": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz",
-      "integrity": "sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==",
-      "dev": true,
-      "peerDependencies": {
-        "markdown-it": "*"
-      }
-    },
-    "node_modules/markdown-it-chain": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-chain/-/markdown-it-chain-1.3.0.tgz",
-      "integrity": "sha512-XClV8I1TKy8L2qsT9iX3qiV+50ZtcInGXI80CA+DP62sMs7hXlyV/RM3hfwy5O3Ad0sJm9xIwQELgANfESo8mQ==",
-      "dev": true,
-      "dependencies": {
-        "webpack-chain": "^4.9.0"
-      },
-      "engines": {
-        "node": ">=6.9"
-      },
-      "peerDependencies": {
-        "markdown-it": ">=5.0.0"
-      }
-    },
-    "node_modules/markdown-it-chain/node_modules/webpack-chain": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-4.12.1.tgz",
-      "integrity": "sha512-BCfKo2YkDe2ByqkEWe1Rw+zko4LsyS75LVr29C6xIrxAg9JHJ4pl8kaIZ396SUSNp6b4815dRZPSTAS8LlURRQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dev": true,
-      "dependencies": {
-        "deepmerge": "^1.5.2",
-        "javascript-stringify": "^1.6.0"
-      }
-    },
-    "node_modules/markdown-it-container": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-2.0.0.tgz",
-      "integrity": "sha512-IxPOaq2LzrGuFGyYq80zaorXReh2ZHGFOB1/Hen429EJL1XkPI3FJTpx9TsJeua+j2qTru4h3W1TiCRdeivMmA==",
-      "dev": true
-    },
-    "node_modules/markdown-it-emoji": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz",
-      "integrity": "sha512-QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg==",
-      "dev": true
-    },
-    "node_modules/markdown-it-table-of-contents": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz",
-      "integrity": "sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">6.4.0"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
-    },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
-    "node_modules/merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/merge-source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
-      "dev": true,
-      "dependencies": {
-        "dom-walk": "^0.1.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz",
-      "integrity": "sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "^2.0.1",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "dev": true,
-      "dependencies": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==",
-      "dev": true
-    },
-    "node_modules/nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "node_modules/no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
-    },
-    "node_modules/nopt": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-      "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-      "dev": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0",
-        "query-string": "^5.0.1",
-        "sort-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/nprogress": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
-      "dev": true
-    },
-    "node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
-      "dev": true
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
-      "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
-      "dev": true,
-      "dependencies": {
-        "array.prototype.reduce": "^1.0.6",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "safe-array-concat": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/opencollective-postinstall": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true,
-      "bin": {
-        "opencollective-postinstall": "index.js"
-      }
-    },
-    "node_modules/opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-      "dev": true,
-      "dependencies": {
-        "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/optimize-css-assets-webpack-plugin": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.8.tgz",
-      "integrity": "sha512-mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q==",
-      "dev": true,
-      "dependencies": {
-        "cssnano": "^4.1.10",
-        "last-call-webpack-plugin": "^3.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-      "dev": true
-    },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-      "dev": true,
-      "dependencies": {
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "dependencies": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "node_modules/param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-type/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-      "dev": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/portfinder": {
-      "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
-      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
-      "dev": true,
-      "dependencies": {
-        "async": "^2.6.4",
-        "debug": "^3.2.7",
-        "mkdirp": "^0.5.6"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-load-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dev": true,
-      "dependencies": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dev": true,
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "dev": true,
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
-      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0",
-        "postcss-value-parser": "^3.3.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
-      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
-      "dev": true,
-      "dependencies": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "node_modules/postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dev": true,
-      "dependencies": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.26"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.15",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-      "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-svgo": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dev": true,
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
-      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^2.0.4"
-      }
-    },
-    "node_modules/pretty-time": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
-      "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prismjs": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "dev": true
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-      "dev": true
-    },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-      "dev": true,
-      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/reduce": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/reduce/-/reduce-1.0.2.tgz",
-      "integrity": "sha512-xX7Fxke/oHO5IfZSk77lvPa/7bjMh9BuCk4OOoX5XTXrM7s0Z+MkPfSDfz0q7r91BhhGSs8gii/VEN/7zhCPpQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.1.0"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-      "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-      "dev": true,
-      "dependencies": {
-        "rc": "1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-      "dev": true
-    },
-    "node_modules/renderkid": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
-      "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^3.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/renderkid/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/renderkid/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==",
-      "dev": true
-    },
-    "node_modules/rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "node_modules/safe-array-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-array-concat/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
-      "dev": true,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/section-matter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
-      "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/section-matter/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
-    },
-    "node_modules/selfsigned": {
-      "version": "1.10.14",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
-      "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
-      "dev": true,
-      "dependencies": {
-        "node-forge": "^0.10.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
-    "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "dev": true
-    },
-    "node_modules/sitemap": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-3.2.2.tgz",
-      "integrity": "sha512-TModL/WU4m2q/mQcrDgNANn0P4LwprM9MMvG4hu5zP4c6IIKs2YLTu6nXXnNr8ODW/WFtxKggiJ1EGn2W0GNmg==",
-      "dependencies": {
-        "lodash.chunk": "^4.2.0",
-        "lodash.padstart": "^4.6.1",
-        "whatwg-url": "^7.0.0",
-        "xmlbuilder": "^13.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0",
-        "npm": ">=4.0.0"
-      }
-    },
-    "node_modules/slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/smoothscroll-polyfill": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz",
-      "integrity": "sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==",
-      "dev": true
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/sockjs-client": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz",
-      "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "eventsource": "^2.0.2",
-        "faye-websocket": "^0.11.4",
-        "inherits": "^2.0.4",
-        "url-parse": "^1.5.10"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://tidelift.com/funding/github/npm/sockjs-client"
-      }
-    },
-    "node_modules/sockjs-client/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/sockjs/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/sort-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sort-keys/node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
-      "dev": true
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/sshpk": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-      "dev": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
-      "dev": true
-    },
-    "node_modules/stack-utils": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
-      "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/std-env": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.3.1.tgz",
-      "integrity": "sha512-eOsoKTWnr6C8aWrqJJ2KAReXoa7Vn5Ywyw6uCXgA/xDhxPoaIsBa5aNJmISY04dLwXPBnDHW4diGM7Sn5K4R/g==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^3.1.1"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "node_modules/strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
-      "dev": true,
-      "dependencies": {
-        "css-parse": "~2.0.0",
-        "debug": "~3.1.0",
-        "glob": "^7.1.6",
-        "mkdirp": "~1.0.4",
-        "safer-buffer": "^2.1.2",
-        "sax": "~1.2.4",
-        "semver": "^6.3.0",
-        "source-map": "^0.7.3"
-      },
-      "bin": {
-        "stylus": "bin/stylus"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
-      },
-      "peerDependencies": {
-        "stylus": ">=0.52.4"
-      }
-    },
-    "node_modules/stylus/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/stylus/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stylus/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/stylus/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-      "dev": true
-    },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
-      "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
-      "dev": true
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
-      "dev": true
-    },
-    "node_modules/to-factory": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-factory/-/to-factory-1.0.0.tgz",
-      "integrity": "sha512-JVYrY42wMG7ddf+wBUQR/uHGbjUHZbLisJ8N62AMm0iTZ0p8YTcZLzdtomU0+H+wa99VbkyvQGB3zxB7NDzgIQ==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/toml": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
-      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==",
-      "dev": true
-    },
-    "node_modules/toposort": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg==",
-      "dev": true
-    },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
-      "dev": true
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "dev": true
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
-    },
-    "node_modules/uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "~2.19.0",
-        "source-map": "~0.6.1"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/uglify-js/node_modules/commander": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-      "dev": true
-    },
-    "node_modules/uglify-js/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
-      "dev": true
-    },
-    "node_modules/uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
-      "dev": true
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
-      "dev": true
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
-      "dev": true,
-      "dependencies": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/update-notifier/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
-      "dev": true
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/url": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^1.4.1",
-        "qs": "^6.11.2"
-      }
-    },
-    "node_modules/url-loader": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
-      "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "mime": "^2.0.3",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "node_modules/url-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-      "dev": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+    "node_modules/property-information": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
       "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+    "node_modules/regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz",
+      "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "regex-utilities": "^2.3.0"
       }
     },
-    "node_modules/verror/node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/vue": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
-      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+    "node_modules/regex-recursion": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-sfc": "2.7.16",
-        "csstype": "^3.1.0"
+        "regex-utilities": "^2.3.0"
       }
     },
-    "node_modules/vue-hot-reload-api": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
+    "node_modules/regex-utilities": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
       "dev": true
     },
-    "node_modules/vue-loader": {
-      "version": "15.11.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true
+    },
+    "node_modules/rollup": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.0.tgz",
+      "integrity": "sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==",
       "dev": true,
       "dependencies": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
+        "@types/estree": "1.0.8"
       },
-      "peerDependencies": {
-        "css-loader": "*",
-        "webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "cache-loader": {
-          "optional": true
-        },
-        "prettier": {
-          "optional": true
-        },
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-router": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
-      "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==",
-      "dev": true
-    },
-    "node_modules/vue-server-renderer": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.7.16.tgz",
-      "integrity": "sha512-U7GgR4rYmHmbs3Z2gqsasfk7JNuTsy/xrR5EMMGRLkjN8+ryDlqQq6Uu3DcmbCATAei814YOxyl0eq2HNqgXyQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.2",
-        "hash-sum": "^2.0.0",
-        "he": "^1.2.0",
-        "lodash.template": "^4.5.0",
-        "lodash.uniq": "^4.5.0",
-        "resolve": "^1.22.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "0.5.6"
-      }
-    },
-    "node_modules/vue-server-renderer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
+      "bin": {
+        "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
       },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.60.0",
+        "@rollup/rollup-android-arm64": "4.60.0",
+        "@rollup/rollup-darwin-arm64": "4.60.0",
+        "@rollup/rollup-darwin-x64": "4.60.0",
+        "@rollup/rollup-freebsd-arm64": "4.60.0",
+        "@rollup/rollup-freebsd-x64": "4.60.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.60.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.60.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.60.0",
+        "@rollup/rollup-linux-arm64-musl": "4.60.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.60.0",
+        "@rollup/rollup-linux-loong64-musl": "4.60.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.60.0",
+        "@rollup/rollup-linux-ppc64-musl": "4.60.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.60.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.60.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.60.0",
+        "@rollup/rollup-linux-x64-gnu": "4.60.0",
+        "@rollup/rollup-linux-x64-musl": "4.60.0",
+        "@rollup/rollup-openbsd-x64": "4.60.0",
+        "@rollup/rollup-openharmony-arm64": "4.60.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.60.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.60.0",
+        "@rollup/rollup-win32-x64-gnu": "4.60.0",
+        "@rollup/rollup-win32-x64-msvc": "4.60.0",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/search-insights": {
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/shiki": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
+      "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/core": "2.5.0",
+        "@shikijs/engine-javascript": "2.5.0",
+        "@shikijs/engine-oniguruma": "2.5.0",
+        "@shikijs/langs": "2.5.0",
+        "@shikijs/themes": "2.5.0",
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/space-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true,
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/vue-server-renderer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/vue-server-renderer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/vue-server-renderer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/vue-server-renderer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/vue-server-renderer/node_modules/hash-sum": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-      "dev": true
-    },
-    "node_modules/vue-server-renderer/node_modules/serialize-javascript": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/vue-server-renderer/node_modules/source-map": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
+    "node_modules/speakingurl": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+      "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/vue-server-renderer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/superjson": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz",
+      "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==",
+      "dev": true,
+      "dependencies": {
+        "copy-anything": "^4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
       }
     },
-    "node_modules/vue-style-loader": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-      "dev": true,
-      "dependencies": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "node_modules/vue-template-compiler": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
-      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
-      "dev": true,
-      "dependencies": {
-        "de-indent": "^1.0.2",
-        "he": "^1.2.0"
-      }
-    },
-    "node_modules/vue-template-es2015-compiler": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
+    "node_modules/tabbable": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
+      "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
       "dev": true
     },
-    "node_modules/vuepress": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.9.10.tgz",
-      "integrity": "sha512-UnGm9vjQvG918SZVNvgiUlNimLqawdYPq0aPRXDpEB1VksvqegVFy/GKdA8ShXJaEpOMPSt7YD4uK21jaMs3kA==",
+    "node_modules/trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/unist-util-is": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
+      "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
-        "@vuepress/core": "1.9.10",
-        "@vuepress/theme-default": "1.9.10",
-        "@vuepress/types": "1.9.10",
-        "cac": "^6.5.6",
-        "envinfo": "^7.2.0",
-        "opencollective-postinstall": "^2.0.2",
-        "update-notifier": "^4.0.0"
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz",
+      "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit-parents": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
+      "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-message": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+      "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
-        "vuepress": "cli.js"
+        "vite": "bin/vite.js"
       },
       "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/vuepress-html-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vuepress-html-webpack-plugin/-/vuepress-html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha512-BebAEl1BmWlro3+VyDhIOCY6Gef2MCBllEVAP3NUAtMguiyOwo/dClbwJ167WYmcxHJKLl7b0Chr9H7fpn1d0A==",
-      "dev": true,
-      "dependencies": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
-        "util.promisify": "1.0.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
-      "engines": {
-        "node": ">=6.9"
-      },
-      "peerDependencies": {
-        "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0"
-      }
-    },
-    "node_modules/vuepress-html-webpack-plugin/node_modules/big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/vuepress-html-webpack-plugin/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vuepress-html-webpack-plugin/node_modules/json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/vuepress-html-webpack-plugin/node_modules/loader-utils": {
-      "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-      "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0",
-        "object-assign": "^4.0.1"
-      }
-    },
-    "node_modules/vuepress-html-webpack-plugin/node_modules/util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "node_modules/vuepress-plugin-container": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/vuepress-plugin-container/-/vuepress-plugin-container-2.1.5.tgz",
-      "integrity": "sha512-TQrDX/v+WHOihj3jpilVnjXu9RcTm6m8tzljNJwYhxnJUW0WWQ0hFLcDTqTBwgKIFdEiSxVOmYE+bJX/sq46MA==",
-      "dev": true,
-      "dependencies": {
-        "@vuepress/shared-utils": "^1.2.0",
-        "markdown-it-container": "^2.0.0"
-      }
-    },
-    "node_modules/vuepress-plugin-sitemap": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/vuepress-plugin-sitemap/-/vuepress-plugin-sitemap-2.3.1.tgz",
-      "integrity": "sha512-n+8lbukhrKrsI9H/EX0EBgkE1pn85LAQFvQ5dIvrZP4Kz6JxPOPPNTQmZMhahQV1tXbLZQCEN7A1WZH4x+arJQ==",
-      "dependencies": {
-        "sitemap": "^3.0.0"
-      },
-      "bin": {
-        "vuepress-sitemap": "cli.js"
-      },
-      "peerDependencies": {
-        "chalk": "^2.0.0",
-        "commander": "^2.0.0",
-        "esm": "^3.0.0"
-      }
-    },
-    "node_modules/vuepress-plugin-smooth-scroll": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/vuepress-plugin-smooth-scroll/-/vuepress-plugin-smooth-scroll-0.0.3.tgz",
-      "integrity": "sha512-qsQkDftLVFLe8BiviIHaLV0Ea38YLZKKonDGsNQy1IE0wllFpFIEldWD8frWZtDFdx6b/O3KDMgVQ0qp5NjJCg==",
-      "dev": true,
-      "dependencies": {
-        "smoothscroll-polyfill": "^0.4.3"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
       },
       "optionalDependencies": {
-        "chokidar": "^3.4.1",
-        "watchpack-chokidar2": "^2.0.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chokidar": "^2.1.8"
-      }
-    },
-    "node_modules/watchpack/node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/watchpack/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
+        "fsevents": "~2.3.3"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/watchpack/node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
         }
-      ],
-      "optional": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/watchpack/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/vitepress": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+      "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "@docsearch/css": "3.8.2",
+        "@docsearch/js": "3.8.2",
+        "@iconify-json/simple-icons": "^1.2.21",
+        "@shikijs/core": "^2.1.0",
+        "@shikijs/transformers": "^2.1.0",
+        "@shikijs/types": "^2.1.0",
+        "@types/markdown-it": "^14.1.2",
+        "@vitejs/plugin-vue": "^5.2.1",
+        "@vue/devtools-api": "^7.7.0",
+        "@vue/shared": "^3.5.13",
+        "@vueuse/core": "^12.4.0",
+        "@vueuse/integrations": "^12.4.0",
+        "focus-trap": "^7.6.4",
+        "mark.js": "8.11.1",
+        "minisearch": "^7.1.1",
+        "shiki": "^2.1.0",
+        "vite": "^5.4.14",
+        "vue": "^3.5.13"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "vitepress": "bin/vitepress.js"
+      },
+      "peerDependencies": {
+        "markdown-it-mathjax3": "^4",
+        "postcss": "^8"
+      },
+      "peerDependenciesMeta": {
+        "markdown-it-mathjax3": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        }
       }
     },
-    "node_modules/watchpack/node_modules/fsevents": {
+    "node_modules/vue": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.44.tgz",
+      "integrity": "sha512-dvvmaOCG7lAMkJTPqPwWeGMsPS6DIsFsfZDUgBp9V6mHf9b3+/wyVwYR4Es+WV6uJC0FKRxp81Obcq0ZwUcGFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.44",
+        "@vue/compiler-sfc": "3.5.44",
+        "@vue/runtime-dom": "3.5.44",
+        "@vue/server-renderer": "3.5.44",
+        "@vue/shared": "3.5.44"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    }
+  },
+  "dependencies": {
+    "@algolia/abtesting": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.16.0.tgz",
+      "integrity": "sha512-alHFZ68/i9qLC/muEB07VQ9r7cB8AvCcGX6dVQi2PNHhc/ZQRmmFAv8KK1ay4UiseGSFr7f0nXBKsZ/jRg7e4g==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/autocomplete-core": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
+      "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
+      "dev": true,
+      "requires": {
+        "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
+        "@algolia/autocomplete-shared": "1.17.7"
+      }
+    },
+    "@algolia/autocomplete-plugin-algolia-insights": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
+      "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
+      "dev": true,
+      "requires": {
+        "@algolia/autocomplete-shared": "1.17.7"
+      }
+    },
+    "@algolia/autocomplete-preset-algolia": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
+      "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
+      "dev": true,
+      "requires": {
+        "@algolia/autocomplete-shared": "1.17.7"
+      }
+    },
+    "@algolia/autocomplete-shared": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
+      "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
+      "dev": true,
+      "requires": {}
+    },
+    "@algolia/client-abtesting": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.50.0.tgz",
+      "integrity": "sha512-mfgUdLQNxOAvCZUGzPQxjahEWEPuQkKlV0ZtGmePOa9ZxIQZlk31vRBNbM6ScU8jTH41SCYE77G/lCifDr1SVw==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/client-analytics": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.50.0.tgz",
+      "integrity": "sha512-5mjokeKYyPaP3Q8IYJEnutI+O4dW/Ixxx5IgsSxT04pCfGqPXxTOH311hTQxyNpcGGEOGrMv8n8Z+UMTPamioQ==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/client-common": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.50.0.tgz",
+      "integrity": "sha512-emtOvR6dl3rX3sBJXXbofMNHU1qMQqQSWu319RMrNL5BWoBqyiq7y0Zn6cjJm7aGHV/Qbf+KCCYeWNKEMPI3BQ==",
+      "dev": true
+    },
+    "@algolia/client-insights": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.50.0.tgz",
+      "integrity": "sha512-IerGH2/hcj/6bwkpQg/HHRqmlGN1XwygQWythAk0gZFBrghs9danJaYuSS3ShzLSVoIVth4jY5GDPX9Lbw5cgg==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/client-personalization": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.50.0.tgz",
+      "integrity": "sha512-3idPJeXn5L0MmgP9jk9JJqblrQ/SguN93dNK9z9gfgyupBhHnJMOEjrRYcVgTIfvG13Y04wO+Q0FxE2Ut8PVbA==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/client-query-suggestions": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.50.0.tgz",
+      "integrity": "sha512-q7qRoWrQK1a8m5EFQEmPlo7+pg9mVQ8X5jsChtChERre0uS2pdYEDixBBl0ydBSGkdGbLUDufcACIhH/077E4g==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/client-search": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.50.0.tgz",
+      "integrity": "sha512-Jc360x4yqb3eEg4OY4KEIdGePBxZogivKI+OGIU8aLXgAYPTECvzeOBc90312yHA1hr3AeRlAFl0rIc8lQaIrQ==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/ingestion": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.50.0.tgz",
+      "integrity": "sha512-OS3/Viao+NPpyBbEY3tf6hLewppG+UclD+9i0ju56mq2DrdMJFCkEky6Sk9S5VPcbLzxzg3BqBX6u9Q35w19aQ==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/monitoring": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.50.0.tgz",
+      "integrity": "sha512-/znwgSiGufpbJVIoDmeQaHtTq+OMdDawFRbMSJVv+12n79hW+qdQXS8/Uu3BD3yn0BzgVFJEvrsHrCsInZKdhw==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/recommend": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.50.0.tgz",
+      "integrity": "sha512-dHjUfu4jfjdQiKDpCpAnM7LP5yfG0oNShtfpF5rMCel6/4HIoqJ4DC4h5GKDzgrvJYtgAhblo0AYBmOM00T+lQ==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "@algolia/requester-browser-xhr": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.50.0.tgz",
+      "integrity": "sha512-bffIbUljAWnh/Ctu5uScORajuUavqmZ0ACYd1fQQeSSYA9NNN83ynO26pSc2dZRXpSK0fkc1//qSSFXMKGu+aw==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0"
+      }
+    },
+    "@algolia/requester-fetch": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.50.0.tgz",
+      "integrity": "sha512-y0EwNvPGvkM+yTAqqO6Gpt9wVGm3CLDtpLvNEiB3VGvN3WzfkjZGtLUsG/ru2kVJIIU7QcV0puuYgEpBeFxcJg==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0"
+      }
+    },
+    "@algolia/requester-node-http": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.50.0.tgz",
+      "integrity": "sha512-xpwefe4fCOWnZgXCbkGpqQY6jgBSCf2hmgnySbyzZIccrv3SoashHKGPE4x6vVG+gdHrGciMTAcDo9HOZwH22Q==",
+      "dev": true,
+      "requires": {
+        "@algolia/client-common": "5.50.0"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+      "dev": true
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "dev": true
+    },
+    "@babel/parser": {
+      "version": "7.29.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz",
+      "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.29.8"
+      }
+    },
+    "@babel/types": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
+      }
+    },
+    "@docsearch/css": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
+      "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
+      "dev": true
+    },
+    "@docsearch/js": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
+      "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
+      "dev": true,
+      "requires": {
+        "@docsearch/react": "3.8.2",
+        "preact": "^10.0.0"
+      }
+    },
+    "@docsearch/react": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
+      "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
+      "dev": true,
+      "requires": {
+        "@algolia/autocomplete-core": "1.17.7",
+        "@algolia/autocomplete-preset-algolia": "1.17.7",
+        "@docsearch/css": "3.8.2",
+        "algoliasearch": "^5.14.2"
+      }
+    },
+    "@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "dev": true,
+      "optional": true
+    },
+    "@iconify-json/simple-icons": {
+      "version": "1.2.75",
+      "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.75.tgz",
+      "integrity": "sha512-KvcCUbvcBWb0sbqLIxHoY8z5/piXY08wcY9gfMhF+ph3AfzGMaSmZFkUY71HSXAljQngXkgs4bdKdekO0HQWvg==",
+      "dev": true,
+      "requires": {
+        "@iconify/types": "*"
+      }
+    },
+    "@iconify/types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+      "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
+      "dev": true
+    },
+    "@rollup/rollup-android-arm-eabi": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.0.tgz",
+      "integrity": "sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-android-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.0.tgz",
+      "integrity": "sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.0.tgz",
+      "integrity": "sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.0.tgz",
+      "integrity": "sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-freebsd-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.0.tgz",
+      "integrity": "sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-freebsd-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.0.tgz",
+      "integrity": "sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.0.tgz",
+      "integrity": "sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.0.tgz",
+      "integrity": "sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.0.tgz",
+      "integrity": "sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.0.tgz",
+      "integrity": "sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.0.tgz",
+      "integrity": "sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.0.tgz",
+      "integrity": "sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.0.tgz",
+      "integrity": "sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.0.tgz",
+      "integrity": "sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.0.tgz",
+      "integrity": "sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.0.tgz",
+      "integrity": "sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.0.tgz",
+      "integrity": "sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.0.tgz",
+      "integrity": "sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.0.tgz",
+      "integrity": "sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-openbsd-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.0.tgz",
+      "integrity": "sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-openharmony-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.0.tgz",
+      "integrity": "sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.0.tgz",
+      "integrity": "sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.0.tgz",
+      "integrity": "sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-x64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.0.tgz",
+      "integrity": "sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-x64-msvc": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.0.tgz",
+      "integrity": "sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==",
+      "dev": true,
+      "optional": true
+    },
+    "@shikijs/core": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
+      "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
+      "dev": true,
+      "requires": {
+        "@shikijs/engine-javascript": "2.5.0",
+        "@shikijs/engine-oniguruma": "2.5.0",
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4",
+        "hast-util-to-html": "^9.0.4"
+      }
+    },
+    "@shikijs/engine-javascript": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
+      "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
+      "dev": true,
+      "requires": {
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "oniguruma-to-es": "^3.1.0"
+      }
+    },
+    "@shikijs/engine-oniguruma": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
+      "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
+      "dev": true,
+      "requires": {
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2"
+      }
+    },
+    "@shikijs/langs": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
+      "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
+      "dev": true,
+      "requires": {
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "@shikijs/themes": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
+      "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
+      "dev": true,
+      "requires": {
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "@shikijs/transformers": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
+      "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
+      "dev": true,
+      "requires": {
+        "@shikijs/core": "2.5.0",
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "@shikijs/types": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
+      "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
+      "dev": true,
+      "requires": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "@shikijs/vscode-textmate": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+      "dev": true
+    },
+    "@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true
+    },
+    "@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
+    "@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true
+    },
+    "@types/markdown-it": {
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "dev": true,
+      "requires": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
+    "@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true
+    },
+    "@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+      "dev": true
+    },
+    "@types/web-bluetooth": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+      "dev": true
+    },
+    "@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true
+    },
+    "@vitejs/plugin-vue": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
+      "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
+      "dev": true,
+      "requires": {}
+    },
+    "@vue/compiler-core": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.44.tgz",
+      "integrity": "sha512-k34nCytbK8PQ1gR2mGROYOw6Pnv/mumqIdrZ3x2tbyXZDWm7ViKGLTfdB+DRrWqEQsLgGJvn0WN9jBif5zCTLQ==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.29.9",
+        "@vue/shared": "3.5.44",
+        "entities": "^7.0.1",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.2"
+      }
+    },
+    "@vue/compiler-dom": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.44.tgz",
+      "integrity": "sha512-W5AoBFWdw1lQAKiHowkfgFKFab82oSRT6sGsPfw/q1GRjsy/ZJFLHGhJyBRIFN9APLTUduDH9U2JAiPOIyKuYg==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-core": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "@vue/compiler-sfc": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.44.tgz",
+      "integrity": "sha512-dzHmQ4jXTpdr5FjIQUeykVakN/uzqFbUo9/C5ikBFg3a3PeM6uRxeczx1ZbXBML0/zJstEh3ygYipzR5Z7b2Pw==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.29.9",
+        "@vue/compiler-core": "3.5.44",
+        "@vue/compiler-dom": "3.5.44",
+        "@vue/compiler-ssr": "3.5.44",
+        "@vue/shared": "3.5.44",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.29",
+        "source-map-js": "^1.2.2"
+      }
+    },
+    "@vue/compiler-ssr": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.44.tgz",
+      "integrity": "sha512-xr5gb1JVHlfXJwSlRz1FeP6uxoazdzHuMTVLE7up+4Vrqxk219CvxLPxD9NXBt47yvZW7+p4DXfyp4O1fkByIA==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-dom": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "@vue/devtools-api": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+      "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+      "dev": true,
+      "requires": {
+        "@vue/devtools-kit": "^7.7.9"
+      }
+    },
+    "@vue/devtools-kit": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+      "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+      "dev": true,
+      "requires": {
+        "@vue/devtools-shared": "^7.7.9",
+        "birpc": "^2.3.0",
+        "hookable": "^5.5.3",
+        "mitt": "^3.0.1",
+        "perfect-debounce": "^1.0.0",
+        "speakingurl": "^14.0.1",
+        "superjson": "^2.2.2"
+      }
+    },
+    "@vue/devtools-shared": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+      "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+      "dev": true,
+      "requires": {
+        "rfdc": "^1.4.1"
+      }
+    },
+    "@vue/reactivity": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.44.tgz",
+      "integrity": "sha512-u+QJdKeBBEADkPdevsL+6E12QlYVfBD8Zcw5qjDQKtamI6l14KyqazJMobhCKelhWN5zpyKUiEDoTyHE93cqWw==",
+      "dev": true,
+      "requires": {
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "@vue/runtime-core": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.44.tgz",
+      "integrity": "sha512-uEa/ndwjhrrhnOfb2p+sZy6zeoamJOISqaLSJGk/8R6nABT1ZldpzcJoPzKj+zHVomVBPcmQYyC2r4LtvDV6CQ==",
+      "dev": true,
+      "requires": {
+        "@vue/reactivity": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "@vue/runtime-dom": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.44.tgz",
+      "integrity": "sha512-3fc4ARcXVhVBaJ3ujWiNZJARD6pkyRcwG+ZYhMzjKtKUp7MAY0HLwr7r3Smep3Li6ZaWT6ewdmx8XqdaD5oNZg==",
+      "dev": true,
+      "requires": {
+        "@vue/reactivity": "3.5.44",
+        "@vue/runtime-core": "3.5.44",
+        "@vue/shared": "3.5.44",
+        "csstype": "^3.2.3"
+      }
+    },
+    "@vue/server-renderer": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.44.tgz",
+      "integrity": "sha512-R4S1UoH4h5Frrauv8Z5XE5TxV9oBiUSgWIC4TyVK1FK+RocRnOLwFA5Xcmo2011RlgJp+AbZCnw6afrhlgRuUQ==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-ssr": "3.5.44",
+        "@vue/runtime-dom": "3.5.44",
+        "@vue/shared": "3.5.44"
+      }
+    },
+    "@vue/shared": {
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.44.tgz",
+      "integrity": "sha512-H82XLH0DjmSOdbEwO15x3QTo1f5PWEtv237eLpYKc0mqLu+B8hnq16lFWmuBmNurkeiG3wr+oM1FhOll/YVFRg==",
+      "dev": true
+    },
+    "@vueuse/core": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
+      "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
+      "dev": true,
+      "requires": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "12.8.2",
+        "@vueuse/shared": "12.8.2",
+        "vue": "^3.5.13"
+      }
+    },
+    "@vueuse/integrations": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
+      "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
+      "dev": true,
+      "requires": {
+        "@vueuse/core": "12.8.2",
+        "@vueuse/shared": "12.8.2",
+        "vue": "^3.5.13"
+      }
+    },
+    "@vueuse/metadata": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
+      "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
+      "dev": true
+    },
+    "@vueuse/shared": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
+      "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+      "dev": true,
+      "requires": {
+        "vue": "^3.5.13"
+      }
+    },
+    "algoliasearch": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.50.0.tgz",
+      "integrity": "sha512-yE5I83Q2s8euVou8Y3feXK08wyZInJWLYXgWO6Xti9jBUEZAGUahyeQ7wSZWkifLWVnQVKEz5RAmBlXG5nqxog==",
+      "dev": true,
+      "requires": {
+        "@algolia/abtesting": "1.16.0",
+        "@algolia/client-abtesting": "5.50.0",
+        "@algolia/client-analytics": "5.50.0",
+        "@algolia/client-common": "5.50.0",
+        "@algolia/client-insights": "5.50.0",
+        "@algolia/client-personalization": "5.50.0",
+        "@algolia/client-query-suggestions": "5.50.0",
+        "@algolia/client-search": "5.50.0",
+        "@algolia/ingestion": "1.50.0",
+        "@algolia/monitoring": "1.50.0",
+        "@algolia/recommend": "5.50.0",
+        "@algolia/requester-browser-xhr": "5.50.0",
+        "@algolia/requester-fetch": "5.50.0",
+        "@algolia/requester-node-http": "5.50.0"
+      }
+    },
+    "birpc": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
+      "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
+      "dev": true
+    },
+    "ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true
+    },
+    "character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true
+    },
+    "character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true
+    },
+    "comma-separated-tokens": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+      "dev": true
+    },
+    "copy-anything": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+      "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+      "dev": true,
+      "requires": {
+        "is-what": "^5.2.0"
+      }
+    },
+    "csstype": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true
+    },
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true
+    },
+    "devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "requires": {
+        "dequal": "^2.0.0"
+      }
+    },
+    "emoji-regex-xs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+      "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+      "dev": true
+    },
+    "entities": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+      "dev": true
+    },
+    "esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "requires": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
+    "focus-trap": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.8.0.tgz",
+      "integrity": "sha512-/yNdlIkpWbM0ptxno3ONTuf+2g318kh2ez3KSeZN5dZ8YC6AAmgeWz+GasYYiBJPFaYcSAPeu4GfhUaChzIJXA==",
+      "dev": true,
+      "requires": {
+        "tabbable": "^6.4.0"
+      }
+    },
+    "fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
+      "optional": true
     },
-    "node_modules/watchpack/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "hast-util-to-html": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
+      "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
       "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+      "requires": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
       }
     },
-    "node_modules/watchpack/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/watchpack/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/watchpack/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/watchpack/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/webpack": {
-      "version": "4.47.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
-      "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.5.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
-        "webpack-sources": "^1.4.1"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        },
-        "webpack-command": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-chain": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
-      "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dev": true,
-      "dependencies": {
-        "deepmerge": "^1.5.2",
-        "javascript-stringify": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-chain/node_modules/javascript-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
-      "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
-      "integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
-      "dev": true,
-      "dependencies": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
-      "integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-html-community": "0.0.8",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.1.8",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "debug": "^4.1.1",
-        "del": "^4.1.1",
-        "express": "^4.17.1",
-        "html-entities": "^1.3.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.3.0",
-        "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "loglevel": "^1.6.8",
-        "opn": "^5.5.0",
-        "p-retry": "^3.0.1",
-        "portfinder": "^1.0.26",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.8",
-        "semver": "^6.3.0",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "sockjs-client": "^1.5.0",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^3.0.1",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.2",
-        "webpack-log": "^2.0.0",
-        "ws": "^6.2.1",
-        "yargs": "^13.3.2"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 6.11.5"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-      "dev": true,
-      "dependencies": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/webpackbar": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-3.2.0.tgz",
-      "integrity": "sha512-PC4o+1c8gWWileUfwabe0gqptlXUDJd5E0zbpr2xHP1VSOVlZVPBZ8j6NCR8zM5zbKdxPhctHXahgpNK1qFDPw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.1.0",
-        "chalk": "^2.4.1",
-        "consola": "^2.6.0",
-        "figures": "^3.0.0",
-        "pretty-time": "^1.1.0",
-        "std-env": "^2.2.1",
-        "text-table": "^0.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/when": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha512-d1VUP9F96w664lKINMGeElWdhhb5sC+thXM+ydZGU3ZnaE09Wv6FaS+mpM9570kcDs/xMfcXJBTLsMdHEFYY9Q==",
-      "dev": true
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
+    "hast-util-whitespace": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@types/hast": "^3.0.0"
       }
     },
-    "node_modules/widest-line/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "dependencies": {
-        "errno": "~0.1.7"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+    "hookable": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
       "dev": true
     },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dev": true,
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/xmlbuilder": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
-      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs-parser/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/find-up": {
+    "html-void-elements": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/zepto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zepto/-/zepto-1.2.0.tgz",
-      "integrity": "sha512-C1x6lfvBICFTQIMgbt3JqMOno3VOtkWat/xEakLTOurskYIHPmzJrzd1e8BnmtdDVJlGuk5D+FxyCA8MPmkIyA==",
-      "dev": true
-    }
-  },
-  "dependencies": {
-    "@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
-      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
-      "dev": true,
-      "requires": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.7",
-        "@babel/parser": "^7.23.6",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz",
-      "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
-      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
-    },
-    "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-      "dev": true
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
-      "dev": true
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "dev": true
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz",
-      "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
-      "dev": true
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
-      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3"
-      }
-    },
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
-      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.7.tgz",
-      "integrity": "sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.23.7",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-decorators": "^7.23.3"
-      }
-    },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0-placeholder-for-preset-env.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
-      "requires": {}
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz",
-      "integrity": "sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-import-assertions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
-      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-syntax-import-attributes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
-      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-unicode-sets-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
-      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
-      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
-      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
-      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-class-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
-      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-class-static-block": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
-      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
-      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
-      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.15"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
-      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
-      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
-      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
-      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
-      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
-      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
-      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
-      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-json-strings": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
-      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
-      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
-      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
-      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
-      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
-      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
-      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
-      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
-      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
-      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-object-rest-spread": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
-      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.23.3"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
-      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20"
-      }
-    },
-    "@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
-      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
-      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
-      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-private-methods": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
-      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
-      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
-      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
-      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.2"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
-      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz",
-      "integrity": "sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.7",
-        "babel-plugin-polyfill-corejs3": "^0.8.7",
-        "babel-plugin-polyfill-regenerator": "^0.5.4",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
-      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
-      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
-      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
-      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
-      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
-      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
-      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
-      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
-      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
-      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
-        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.5",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
-        "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.7",
-        "babel-plugin-polyfill-corejs3": "^0.8.7",
-        "babel-plugin-polyfill-regenerator": "^0.5.4",
-        "core-js-compat": "^3.31.0",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.6-no-external-plugins",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
-    "@babel/runtime": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.7.tgz",
-      "integrity": "sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.14.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.23.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-      "dev": true
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "@mrmlnc/readdir-enhanced": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-      "dev": true,
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-      "dev": true
-    },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true
-    },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "requires": {
-        "defer-to-connect": "^1.0.1"
-      }
-    },
-    "@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
-      "dev": true,
-      "requires": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
-      "dev": true,
-      "requires": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "dev": true,
-      "requires": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.17.41",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz",
-      "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
-    "@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "requires": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/highlight.js": {
-      "version": "9.12.4",
-      "resolved": "https://registry.npmjs.org/@types/highlight.js/-/highlight.js-9.12.4.tgz",
-      "integrity": "sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==",
-      "dev": true
-    },
-    "@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
-      "dev": true
-    },
-    "@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
-    },
-    "@types/linkify-it": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
-      "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
-      "dev": true
-    },
-    "@types/markdown-it": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-10.0.3.tgz",
-      "integrity": "sha512-daHJk22isOUvNssVGF2zDnnSyxHhFYhtjeX4oQaKD6QzL3ZR1QSgiD1g+Q6/WSWYVogNXYDXODtbgW/WiFCtyw==",
-      "dev": true,
-      "requires": {
-        "@types/highlight.js": "^9.7.0",
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*",
-        "highlight.js": "^9.7.0"
-      }
-    },
-    "@types/mdurl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
-      "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
-      "dev": true
-    },
-    "@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true
-    },
-    "@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "20.10.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.7.tgz",
-      "integrity": "sha512-fRbIKb8C/Y2lXxB5eVMj4IU7xpdox0Lh8bUPEdtLysaylsml1hOOx1+STloRs/B9nf7C6kPRmmg/V7aQW7usNg==",
-      "dev": true,
-      "requires": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "@types/q": {
-      "version": "1.5.8",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz",
-      "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==",
-      "dev": true
-    },
-    "@types/qs": {
-      "version": "6.9.11",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz",
-      "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==",
-      "dev": true
-    },
-    "@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true
-    },
-    "@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "dev": true,
-      "requires": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "@types/serve-static": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
-      "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
-      "dev": true,
-      "requires": {
-        "@types/http-errors": "*",
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/source-list-map": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.6.tgz",
-      "integrity": "sha512-5JcVt1u5HDmlXkwOD2nslZVllBBc7HDuOICfiZah2Z0is8M8g+ddAEawbmd3VjedfDHBzxCaXLs07QEmb7y54g==",
-      "dev": true
-    },
-    "@types/tapable": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.12.tgz",
-      "integrity": "sha512-bTHG8fcxEqv1M9+TD14P8ok8hjxoOCkfKc8XXLaaD05kI7ohpeI956jtDOD3XHKBQrlyPughUtzm1jtVhHpA5Q==",
-      "dev": true
-    },
-    "@types/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@types/webpack": {
-      "version": "4.41.38",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz",
-      "integrity": "sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/tapable": "^1",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "anymatch": "^3.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@types/webpack-dev-server": {
-      "version": "3.11.6",
-      "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz",
-      "integrity": "sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ==",
-      "dev": true,
-      "requires": {
-        "@types/connect-history-api-fallback": "*",
-        "@types/express": "*",
-        "@types/serve-static": "*",
-        "@types/webpack": "^4",
-        "http-proxy-middleware": "^1.0.0"
-      }
-    },
-    "@types/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-4nZOdMwSPHZ4pTEZzSp0AsTM4K7Qmu40UKW4tJDiOVs20UzYF9l+qUe4s0ftfN0pin06n+5cWWDJXH+sbhAiDw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-          "dev": true
-        }
-      }
-    },
-    "@vue/babel-helper-vue-jsx-merge-props": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
-      "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
-      "dev": true
-    },
-    "@vue/babel-helper-vue-transform-on": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.1.5.tgz",
-      "integrity": "sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==",
-      "dev": true
-    },
-    "@vue/babel-plugin-jsx": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.5.tgz",
-      "integrity": "sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5",
-        "@vue/babel-helper-vue-transform-on": "^1.1.5",
-        "camelcase": "^6.3.0",
-        "html-tags": "^3.3.1",
-        "svg-tags": "^1.0.0"
-      }
-    },
-    "@vue/babel-plugin-transform-vue-jsx": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
-      "integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-        "html-tags": "^2.0.0",
-        "lodash.kebabcase": "^4.1.1",
-        "svg-tags": "^1.0.0"
-      },
-      "dependencies": {
-        "html-tags": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-          "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
-          "dev": true
-        }
-      }
-    },
-    "@vue/babel-preset-app": {
-      "version": "4.5.19",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.5.19.tgz",
-      "integrity": "sha512-VCNRiAt2P/bLo09rYt3DLe6xXUMlhJwrvU18Ddd/lYJgC7s8+wvhgYs+MTx4OiAXdu58drGwSBO9SPx7C6J82Q==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.11.0",
-        "@babel/helper-compilation-targets": "^7.9.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/plugin-proposal-class-properties": "^7.8.3",
-        "@babel/plugin-proposal-decorators": "^7.8.3",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-jsx": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.11.0",
-        "@babel/preset-env": "^7.11.0",
-        "@babel/runtime": "^7.11.0",
-        "@vue/babel-plugin-jsx": "^1.0.3",
-        "@vue/babel-preset-jsx": "^1.2.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3",
-        "core-js": "^3.6.5",
-        "core-js-compat": "^3.6.5",
-        "semver": "^6.1.0"
-      }
-    },
-    "@vue/babel-preset-jsx": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
-      "integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
-      "dev": true,
-      "requires": {
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-        "@vue/babel-sugar-composition-api-inject-h": "^1.4.0",
-        "@vue/babel-sugar-composition-api-render-instance": "^1.4.0",
-        "@vue/babel-sugar-functional-vue": "^1.4.0",
-        "@vue/babel-sugar-inject-h": "^1.4.0",
-        "@vue/babel-sugar-v-model": "^1.4.0",
-        "@vue/babel-sugar-v-on": "^1.4.0"
-      }
-    },
-    "@vue/babel-sugar-composition-api-inject-h": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
-      "integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@vue/babel-sugar-composition-api-render-instance": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
-      "integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@vue/babel-sugar-functional-vue": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
-      "integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@vue/babel-sugar-inject-h": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
-      "integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@vue/babel-sugar-v-model": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
-      "integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-        "camelcase": "^5.0.0",
-        "html-tags": "^2.0.0",
-        "svg-tags": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "html-tags": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-          "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
-          "dev": true
-        }
-      }
-    },
-    "@vue/babel-sugar-v-on": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
-      "integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-        "camelcase": "^5.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
-      }
-    },
-    "@vue/compiler-sfc": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.23.5",
-        "postcss": "^8.4.14",
-        "prettier": "^1.18.2 || ^2.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "8.4.33",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-          "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
-          "dev": true,
-          "requires": {
-            "nanoid": "^3.3.7",
-            "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@vue/component-compiler-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-      "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
-      "dev": true,
-      "requires": {
-        "consolidate": "^0.15.1",
-        "hash-sum": "^1.0.2",
-        "lru-cache": "^4.1.2",
-        "merge-source-map": "^1.1.0",
-        "postcss": "^7.0.36",
-        "postcss-selector-parser": "^6.0.2",
-        "prettier": "^1.18.2 || ^2.0.0",
-        "source-map": "~0.6.1",
-        "vue-template-es2015-compiler": "^1.9.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
-        }
-      }
-    },
-    "@vuepress/core": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.9.10.tgz",
-      "integrity": "sha512-H9ddo5fSinPb8QYl8OJFbZikMpOW84bm/U3Drzz8CnCXNtpda7CU2wX/XzOhe98G8jp45xhtZRkxOrqzBBAShA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.8.4",
-        "@vue/babel-preset-app": "^4.1.2",
-        "@vuepress/markdown": "1.9.10",
-        "@vuepress/markdown-loader": "1.9.10",
-        "@vuepress/plugin-last-updated": "1.9.10",
-        "@vuepress/plugin-register-components": "1.9.10",
-        "@vuepress/shared-utils": "1.9.10",
-        "@vuepress/types": "1.9.10",
-        "autoprefixer": "^9.5.1",
-        "babel-loader": "^8.0.4",
-        "bundle-require": "2.1.8",
-        "cache-loader": "^3.0.0",
-        "chokidar": "^2.0.3",
-        "connect-history-api-fallback": "^1.5.0",
-        "copy-webpack-plugin": "^5.0.2",
-        "core-js": "^3.6.4",
-        "cross-spawn": "^6.0.5",
-        "css-loader": "^2.1.1",
-        "esbuild": "0.14.7",
-        "file-loader": "^3.0.1",
-        "js-yaml": "^3.13.1",
-        "lru-cache": "^5.1.1",
-        "mini-css-extract-plugin": "0.6.0",
-        "optimize-css-assets-webpack-plugin": "^5.0.1",
-        "portfinder": "^1.0.13",
-        "postcss-loader": "^3.0.0",
-        "postcss-safe-parser": "^4.0.1",
-        "toml": "^3.0.0",
-        "url-loader": "^1.0.1",
-        "vue": "^2.6.10",
-        "vue-loader": "^15.7.1",
-        "vue-router": "^3.4.5",
-        "vue-server-renderer": "^2.6.10",
-        "vue-template-compiler": "^2.6.10",
-        "vuepress-html-webpack-plugin": "^3.2.0",
-        "vuepress-plugin-container": "^2.0.2",
-        "webpack": "^4.8.1",
-        "webpack-chain": "^6.0.0",
-        "webpack-dev-server": "^3.5.1",
-        "webpack-merge": "^4.1.2",
-        "webpackbar": "3.2.0"
-      }
-    },
-    "@vuepress/markdown": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.9.10.tgz",
-      "integrity": "sha512-sXTLjeZzH8SQuAL5AEH0hhsMljjNJbzWbBvzaj5yQCCdf+3sp/dJ0kwnBSnQjFPPnzPg5t3tLKGUYHyW0KiKzA==",
-      "dev": true,
-      "requires": {
-        "@vuepress/shared-utils": "1.9.10",
-        "markdown-it": "^8.4.1",
-        "markdown-it-anchor": "^5.0.2",
-        "markdown-it-chain": "^1.3.0",
-        "markdown-it-emoji": "^1.4.0",
-        "markdown-it-table-of-contents": "^0.4.0",
-        "prismjs": "^1.13.0"
-      }
-    },
-    "@vuepress/markdown-loader": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.9.10.tgz",
-      "integrity": "sha512-94BlwKc+lOaN/A5DkyA9KWHvMlMC1sWunAXE3Tv0WYzgYLDs9QqCsx7L5kLkpcOOVVm/8kBJumnXvVBwhqJddw==",
-      "dev": true,
-      "requires": {
-        "@vuepress/markdown": "1.9.10",
-        "loader-utils": "^1.1.0",
-        "lru-cache": "^5.1.1"
-      }
-    },
-    "@vuepress/plugin-active-header-links": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.9.10.tgz",
-      "integrity": "sha512-2dRr3DE2UBFXhyMtLR3sGTdRyDM8YStuY6AOoQmoSgwy1IHt7PO7ypOuf1akF+1Nv8Q2aISU06q6TExZouu3Mw==",
-      "dev": true,
-      "requires": {
-        "@vuepress/types": "1.9.10",
-        "lodash.debounce": "^4.0.8"
-      }
-    },
-    "@vuepress/plugin-last-updated": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.10.tgz",
-      "integrity": "sha512-YxzWGF/OfU6WsHSynZFn74NGGp7dY27Bjy9JyyFo8wF5+2V1gpyDjveHKHGKugS/pMXlxfjzhv9E2Wmy9R7Iog==",
-      "dev": true,
-      "requires": {
-        "@vuepress/types": "1.9.10",
-        "cross-spawn": "^6.0.5"
-      }
-    },
-    "@vuepress/plugin-nprogress": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.9.10.tgz",
-      "integrity": "sha512-I1kkm6yWUQd7vwiV3lEDVpVP0Lr04K0zlczU502lDUa1RufSZ7vt+mlF5fOM28GqT+pKTEToWmm+VNT/R3qvMQ==",
-      "dev": true,
-      "requires": {
-        "@vuepress/types": "1.9.10",
-        "nprogress": "^0.2.0"
-      }
-    },
-    "@vuepress/plugin-register-components": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.9.10.tgz",
-      "integrity": "sha512-sgdJ5OydTPZAoTkselpvVP3Xsd6bfZ0FpaxOTinal0gJ99h49lvLu9bvzMx13rdGRFO/kRXn0qQQpwKTAfTPqA==",
-      "dev": true,
-      "requires": {
-        "@vuepress/shared-utils": "1.9.10",
-        "@vuepress/types": "1.9.10"
-      }
-    },
-    "@vuepress/plugin-search": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.9.10.tgz",
-      "integrity": "sha512-bn2XJikaRgQZXvu8upCjOWrxbLHIRTqnJ3w7G0mo6jCYWGVsHNo6XhVpqylpLR2PWnHT/ImO2bGo38/5Bag/tQ==",
-      "dev": true,
-      "requires": {
-        "@vuepress/types": "1.9.10"
-      }
-    },
-    "@vuepress/shared-utils": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.9.10.tgz",
-      "integrity": "sha512-M9A3DocPih+V8dKK2Zg9FJQ/f3JZrYsdaM/vQ9F48l8bPlzxw5NvqXIYMK4kKcGEyerQNTWCudoCpLL5uiU0hg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.2",
-        "escape-html": "^1.0.3",
-        "fs-extra": "^7.0.1",
-        "globby": "^9.2.0",
-        "gray-matter": "^4.0.1",
-        "hash-sum": "^1.0.2",
-        "semver": "^6.0.0",
-        "toml": "^3.0.0",
-        "upath": "^1.1.0"
-      }
-    },
-    "@vuepress/theme-default": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.9.10.tgz",
-      "integrity": "sha512-XnXn9t+pYCIhWi3cZXJlighuy93FFm5yXdISAAlFlcNkshuGtqamkjacHV8q/QZMfOhSIs6wX7Hj88u2IsT5mw==",
-      "dev": true,
-      "requires": {
-        "@vuepress/plugin-active-header-links": "1.9.10",
-        "@vuepress/plugin-nprogress": "1.9.10",
-        "@vuepress/plugin-search": "1.9.10",
-        "@vuepress/types": "1.9.10",
-        "docsearch.js": "^2.5.2",
-        "lodash": "^4.17.15",
-        "stylus": "^0.54.8",
-        "stylus-loader": "^3.0.2",
-        "vuepress-plugin-container": "^2.0.2",
-        "vuepress-plugin-smooth-scroll": "^0.0.3"
-      }
-    },
-    "@vuepress/types": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.10.tgz",
-      "integrity": "sha512-TDNQn4og85onmBpLTTXXmncW3rUnYGr2MkuI8OIFJZetDNM49t1WbjNVlrT+kx7C6qXi6okDQgrHGYXajHZWfg==",
-      "dev": true,
-      "requires": {
-        "@types/markdown-it": "^10.0.0",
-        "@types/webpack-dev-server": "^3",
-        "webpack-chain": "^6.0.0"
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true
-    },
-    "agentkeepalive": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz",
-      "integrity": "sha512-TnB6ziK363p7lR8QpeLC8aMr8EGYBKZTpgzQLfqTs3bR0Oo5VbKdwKf8h0dSzsYrB7lSCgfJnMZKqShvlq5Oyg==",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "algoliasearch": {
-      "version": "3.35.1",
-      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-3.35.1.tgz",
-      "integrity": "sha512-K4yKVhaHkXfJ/xcUnil04xiSrB8B8yHZoFEhWNpXg23eiCnqvTZw1tn/SqvdsANlYHLJlKl0qi3I/Q2Sqo7LwQ==",
-      "dev": true,
-      "requires": {
-        "agentkeepalive": "^2.2.0",
-        "debug": "^2.6.9",
-        "envify": "^4.0.0",
-        "es6-promise": "^4.1.0",
-        "events": "^1.1.0",
-        "foreach": "^2.0.5",
-        "global": "^4.3.2",
-        "inherits": "^2.0.1",
-        "isarray": "^2.0.1",
-        "load-script": "^1.0.0",
-        "object-keys": "^1.0.11",
-        "querystring-es3": "^0.2.1",
-        "reduce": "^1.0.1",
-        "semver": "^5.1.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "events": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
-          "dev": true
-        },
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        }
-      }
-    },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
-      "dev": true
-    },
-    "ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
-    "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.21.3"
-      }
-    },
-    "ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true
-    },
-    "array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      }
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true
-    },
-    "array.prototype.reduce": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
-      "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      }
-    },
-    "arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
-      }
-    },
-    "asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "assert": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
-      "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
-      "dev": true,
-      "requires": {
-        "object.assign": "^4.1.4",
-        "util": "^0.10.4"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        }
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-each": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
-      "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "autocomplete.js": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.36.0.tgz",
-      "integrity": "sha512-jEwUXnVMeCHHutUt10i/8ZiRaCb0Wo+ZyKxeGsYwBDtw6EJHqEeDrq4UwZRD8YBSvp3g6klP678il2eeiVXN2Q==",
-      "dev": true,
-      "requires": {
-        "immediate": "^3.2.3"
-      }
-    },
-    "autoprefixer": {
-      "version": "9.8.8",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
-      "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "picocolors": "^0.2.1",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-          "dev": true
-        }
-      }
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-      "dev": true
-    },
-    "babel-loader": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
-      }
-    },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz",
-      "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.4",
-        "semver": "^6.3.1"
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
-      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.4.4",
-        "core-js-compat": "^3.33.1"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz",
-      "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.4.4"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "dev": true,
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "dev": true,
-      "requires": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
-        }
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "browserslist": {
-      "version": "4.22.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001565",
-        "electron-to-chromium": "^1.4.601",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
-      }
-    },
-    "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
-    "buffer-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
-      "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-      "dev": true
-    },
-    "bundle-require": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-2.1.8.tgz",
-      "integrity": "sha512-oOEg3A0hy/YzvNWNowtKD0pmhZKseOFweCbgyMqTIih4gRY1nJWsvrOCT27L9NbIyL5jMjTFrAUpGxxpW68Puw==",
-      "dev": true,
-      "requires": {}
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true
-    },
-    "cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true
-    },
-    "cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "cache-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-3.0.1.tgz",
-      "integrity": "sha512-HzJIvGiGqYsFUrMjAJNDbVZoG7qQA+vy9AIoKs7s9DscNfki0I589mf2w6/tW+kkFH3zyiknoWV5Jdynu6b/zw==",
-      "dev": true,
-      "requires": {
-        "buffer-json": "^2.0.0",
-        "find-cache-dir": "^2.1.0",
-        "loader-utils": "^1.2.3",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        }
-      }
-    },
-    "cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-          "dev": true
-        },
-        "normalize-url": {
-          "version": "4.5.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-          "dev": true
-        }
-      }
-    },
-    "call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
-      }
-    },
-    "call-me-maybe": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
-      "dev": true
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
-      "dev": true,
-      "requires": {
-        "callsites": "^2.0.0"
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
-      "dev": true,
-      "requires": {
-        "caller-callsite": "^2.0.0"
-      }
-    },
-    "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
-      "dev": true
-    },
-    "camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001576",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz",
-      "integrity": "sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        }
-      }
-    },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
-    },
-    "ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.3",
-        "color-string": "^1.6.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "color-string": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
-      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
-      "dev": true
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true
-    },
-    "consola": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-      "dev": true
-    },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.1.1"
-      }
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.2.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true
-    },
-    "copy-webpack-plugin": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz",
-      "integrity": "sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==",
-      "dev": true,
-      "requires": {
-        "cacache": "^12.0.3",
-        "find-cache-dir": "^2.1.0",
-        "glob-parent": "^3.1.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "minimatch": "^3.0.4",
-        "normalize-path": "^3.0.0",
-        "p-limit": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "globby": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-          "integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "dir-glob": "^2.0.0",
-            "glob": "^7.1.2",
-            "ignore": "^3.3.5",
-            "pify": "^3.0.0",
-            "slash": "^1.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-              "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-              "dev": true
-            }
-          }
-        },
-        "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        },
-        "slash": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-          "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
-          "dev": true
-        }
-      }
-    },
-    "core-js": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.0.tgz",
-      "integrity": "sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==",
-      "dev": true
-    },
-    "core-js-compat": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz",
-      "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.22.2"
-      }
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dev": true,
-      "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        }
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true
-    },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
-      "dev": true
-    },
-    "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      }
-    },
-    "css-loader": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
-      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.2.0",
-        "icss-utils": "^4.1.0",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.14",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^2.0.6",
-        "postcss-modules-scope": "^2.1.0",
-        "postcss-modules-values": "^2.0.0",
-        "postcss-value-parser": "^3.3.0",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha512-UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA==",
-      "dev": true,
-      "requires": {
-        "css": "^2.0.0"
-      }
-    },
-    "css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.8",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-      "dev": true,
-      "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.3",
-        "postcss-unique-selectors": "^4.0.1"
-      }
-    },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==",
-      "dev": true
-    },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==",
-      "dev": true
-    },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "dev": true
-    },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "requires": {
-        "css-tree": "^1.1.2"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-          "dev": true,
-          "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "dev": true
-    },
-    "cyclist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
-      "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==",
-      "dev": true
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "deep-equal": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
-      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
-      "dev": true,
-      "requires": {
-        "is-arguments": "^1.1.1",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.5.1"
-      }
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
-    },
-    "deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
-      "dev": true
-    },
-    "default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
-      }
-    },
-    "defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
-    "define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      }
-    },
-    "define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        }
-      }
-    },
-    "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
-      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true
-    },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
-      "requires": {
-        "path-type": "^3.0.0"
-      }
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
-      "dev": true,
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==",
-      "dev": true,
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
-    "docsearch.js": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/docsearch.js/-/docsearch.js-2.6.3.tgz",
-      "integrity": "sha512-GN+MBozuyz664ycpZY0ecdQE0ND/LSgJKhTLA0/v3arIS3S1Rpf2OJz6A35ReMsm91V5apcmzr5/kM84cvUg+A==",
-      "dev": true,
-      "requires": {
-        "algoliasearch": "^3.24.5",
-        "autocomplete.js": "0.36.0",
-        "hogan.js": "^3.0.2",
-        "request": "^2.87.0",
-        "stack-utils": "^1.0.1",
-        "to-factory": "^1.0.0",
-        "zepto": "^1.2.0"
-      }
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "dom-walk": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
-      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
-      "dev": true
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.2.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        }
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
-      "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.4.623",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.623.tgz",
-      "integrity": "sha512-lKoz10iCYlP1WtRYdh5MvocQPWVRoI7ysp6qf18bmeBgR8abE6+I2CsfyNKztRDZvhdWc+krKT6wS7Neg8sw3A==",
-      "dev": true
-    },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "memory-fs": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        }
-      }
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "envify": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/envify/-/envify-4.1.0.tgz",
-      "integrity": "sha512-IKRVVoAYr4pIx4yIWNsz9mOsboxlNXiu7TNBnem/K/uTHdkyzXWDzHCK7UTolqBbgaBz0tQHsD3YNls0uIIjiw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.0",
-        "through": "~2.3.4"
-      }
-    },
-    "envinfo": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz",
-      "integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
-      }
-    },
-    "es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
-    "esbuild": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.7.tgz",
-      "integrity": "sha512-+u/msd6iu+HvfysUPkZ9VHm83LImmSNnecYPfFI01pQ7TTcsFR+V0BkybZX7mPtIaI7LCrse6YRj+v3eraJSgw==",
-      "dev": true,
-      "requires": {
-        "esbuild-android-arm64": "0.14.7",
-        "esbuild-darwin-64": "0.14.7",
-        "esbuild-darwin-arm64": "0.14.7",
-        "esbuild-freebsd-64": "0.14.7",
-        "esbuild-freebsd-arm64": "0.14.7",
-        "esbuild-linux-32": "0.14.7",
-        "esbuild-linux-64": "0.14.7",
-        "esbuild-linux-arm": "0.14.7",
-        "esbuild-linux-arm64": "0.14.7",
-        "esbuild-linux-mips64le": "0.14.7",
-        "esbuild-linux-ppc64le": "0.14.7",
-        "esbuild-netbsd-64": "0.14.7",
-        "esbuild-openbsd-64": "0.14.7",
-        "esbuild-sunos-64": "0.14.7",
-        "esbuild-windows-32": "0.14.7",
-        "esbuild-windows-64": "0.14.7",
-        "esbuild-windows-arm64": "0.14.7"
-      }
-    },
-    "esbuild-android-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.7.tgz",
-      "integrity": "sha512-9/Q1NC4JErvsXzJKti0NHt+vzKjZOgPIjX/e6kkuCzgfT/GcO3FVBcGIv4HeJG7oMznE6KyKhvLrFgt7CdU2/w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.7.tgz",
-      "integrity": "sha512-Z9X+3TT/Xj+JiZTVlwHj2P+8GoiSmUnGVz0YZTSt8WTbW3UKw5Pw2ucuJ8VzbD2FPy0jbIKJkko/6CMTQchShQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.7.tgz",
-      "integrity": "sha512-68e7COhmwIiLXBEyxUxZSSU0akgv8t3e50e2QOtKdBUE0F6KIRISzFntLe2rYlNqSsjGWsIO6CCc9tQxijjSkw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.7.tgz",
-      "integrity": "sha512-76zy5jAjPiXX/S3UvRgG85Bb0wy0zv/J2lel3KtHi4V7GUTBfhNUPt0E5bpSXJ6yMT7iThhnA5rOn+IJiUcslQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.7.tgz",
-      "integrity": "sha512-lSlYNLiqyzd7qCN5CEOmLxn7MhnGHPcu5KuUYOG1i+t5A6q7LgBmfYC9ZHJBoYyow3u4CNu79AWHbvVLpE/VQQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.7.tgz",
-      "integrity": "sha512-Vk28u409wVOXqTaT6ek0TnfQG4Ty1aWWfiysIaIRERkNLhzLhUf4i+qJBN8mMuGTYOkE40F0Wkbp6m+IidOp2A==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.7.tgz",
-      "integrity": "sha512-+Lvz6x+8OkRk3K2RtZwO+0a92jy9si9cUea5Zoru4yJ/6EQm9ENX5seZE0X9DTwk1dxJbjmLsJsd3IoowyzgVg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.7.tgz",
-      "integrity": "sha512-OzpXEBogbYdcBqE4uKynuSn5YSetCvK03Qv1HcOY1VN6HmReuatjJ21dCH+YPHSpMEF0afVCnNfffvsGEkxGJQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.7.tgz",
-      "integrity": "sha512-kJd5beWSqteSAW086qzCEsH6uwpi7QRIpzYWHzEYwKKu9DiG1TwIBegQJmLpPsLp4v5RAFjea0JAmAtpGtRpqg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.7.tgz",
-      "integrity": "sha512-mFWpnDhZJmj/h7pxqn1GGDsKwRfqtV7fx6kTF5pr4PfXe8pIaTERpwcKkoCwZUkWAOmUEjMIUAvFM72A6hMZnA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.7.tgz",
-      "integrity": "sha512-wM7f4M0bsQXfDL4JbbYD0wsr8cC8KaQ3RPWc/fV27KdErPW7YsqshZZSjDV0kbhzwpNNdhLItfbaRT8OE8OaKA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.7.tgz",
-      "integrity": "sha512-J/afS7woKyzGgAL5FlgvMyqgt5wQ597lgsT+xc2yJ9/7BIyezeXutXqfh05vszy2k3kSvhLesugsxIA71WsqBw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.7.tgz",
-      "integrity": "sha512-7CcxgdlCD+zAPyveKoznbgr3i0Wnh0L8BDGRCjE/5UGkm5P/NQko51tuIDaYof8zbmXjjl0OIt9lSo4W7I8mrw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.7.tgz",
-      "integrity": "sha512-GKCafP2j/KUljVC3nesw1wLFSZktb2FGCmoT1+730zIF5O6hNroo0bSEofm6ZK5mNPnLiSaiLyRB9YFgtkd5Xg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.7.tgz",
-      "integrity": "sha512-5I1GeL/gZoUUdTPA0ws54bpYdtyeA2t6MNISalsHpY269zK8Jia/AXB3ta/KcDHv2SvNwabpImeIPXC/k0YW6A==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.7.tgz",
-      "integrity": "sha512-CIGKCFpQOSlYsLMbxt8JjxxvVw9MlF1Rz2ABLVfFyHUF5OeqHD5fPhGrCVNaVrhO8Xrm+yFmtjcZudUGr5/WYQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-arm64": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.7.tgz",
-      "integrity": "sha512-eOs1eSivOqN7cFiRIukEruWhaCf75V0N8P0zP7dh44LIhLl8y6/z++vv9qQVbkBm5/D7M7LfCfCTmt1f1wHOCw==",
-      "dev": true,
-      "optional": true
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
-    },
-    "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-    },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "esm": {
-      "version": "3.2.25",
-      "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
-      "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
-      "peer": true
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true
-    },
-    "eventsource": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
-      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "dev": true,
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-      "dev": true,
-      "requires": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      }
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true
-    },
-    "foreach": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      }
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true
-    },
-    "function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      }
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-      "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-      "dev": true
-    },
-    "global": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
-      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
-      "dev": true,
-      "requires": {
-        "min-document": "^2.19.0",
-        "process": "^0.11.10"
-      }
-    },
-    "global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
-      "dev": true,
-      "requires": {
-        "ini": "1.3.7"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "globby": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-      "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^1.0.2",
-        "dir-glob": "^2.2.2",
-        "fast-glob": "^2.2.6",
-        "glob": "^7.1.3",
-        "ignore": "^4.0.3",
-        "pify": "^4.0.1",
-        "slash": "^2.0.0"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "gray-matter": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
-      "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
-      "dev": true,
-      "requires": {
-        "js-yaml": "^3.13.1",
-        "kind-of": "^6.0.2",
-        "section-matter": "^1.0.0",
-        "strip-bom-string": "^1.0.0"
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
-      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
-      "dev": true
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.2"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true
-    },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-      "dev": true
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.2"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-      "dev": true
-    },
-    "highlight.js": {
-      "version": "9.18.5",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
-      "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "dev": true
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hogan.js": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz",
-      "integrity": "sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "0.3.0",
-        "nopt": "1.0.10"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-          "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
-          "dev": true
-        }
-      }
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==",
-      "dev": true
-    },
-    "hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==",
-      "dev": true
-    },
-    "html-entities": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
-      "dev": true
-    },
-    "html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dev": true,
-      "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      }
-    },
-    "html-tags": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
-      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
-      "dev": true
-    },
-    "htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "dom-serializer": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        },
-        "domutils": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
-      "dev": true,
-      "requires": {
-        "@types/http-proxy": "^1.17.5",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.5",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-          "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.2",
-            "picomatch": "^2.3.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==",
-      "dev": true
-    },
-    "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.14"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "immediate": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
-      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==",
-      "dev": true
-    },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg==",
-      "dev": true,
-      "requires": {
-        "import-from": "^2.1.0"
-      }
-    },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-      "dev": true,
-      "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w==",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
-      "dev": true
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
       "dev": true
     },
     "ini": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg=="
+    },
+    "is-what": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+      "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
       "dev": true
     },
-    "internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+    "magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
       "requires": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
-    "internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.2",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+    "mark.js": {
+      "version": "8.11.1",
+      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
       "dev": true
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
-      "dev": true
+    "markdown-table": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz",
+      "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw=="
     },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
-      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+    "mdast-util-to-hast": {
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
+      "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
       "dev": true,
       "requires": {
-        "hasown": "^2.0.0"
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
       }
     },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true
-    },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^2.0.0"
-      },
-      "dependencies": {
-        "ci-info": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-          "dev": true
-        }
-      }
-    },
-    "is-color-stop": {
+    "medium-zoom": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==",
-      "dev": true,
-      "requires": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
-    "is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dev": true,
-      "requires": {
-        "hasown": "^2.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
-      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
-      "dev": true,
-      "requires": {
-        "hasown": "^2.0.0"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      }
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
+      "resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-1.1.0.tgz",
+      "integrity": "sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==",
       "dev": true
     },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true
-    },
-    "is-extglob": {
+    "micromark-util-character": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
       }
     },
-    "is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+    "micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true
+    },
+    "micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
       "dev": true,
       "requires": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
-      },
-      "dependencies": {
-        "is-path-inside": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-          "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-          "dev": true
-        }
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
       }
     },
-    "is-negative-zero": {
+    "micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true
+    },
+    "micromark-util-types": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true
-    },
-    "is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^2.1.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.2"
-      }
-    },
-    "is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-      "dev": true,
-      "requires": {
-        "which-typed-array": "^1.1.11"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true
-    },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
-    },
-    "javascript-stringify": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz",
-      "integrity": "sha512-fnjC0up+0SjEJtgmmG+teeel68kutkvzfctO/KxE3qJlbunkJYAshgH3boU++gSBHP8z5/r0ts0qRIrHf0RTQQ==",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      }
-    },
-    "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "last-call-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.5",
-        "webpack-sources": "^1.1.0"
-      }
-    },
-    "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
-    "linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-      "dev": true,
-      "requires": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "load-script": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
-      "integrity": "sha512-kPEjMFtZvwL9TaZo0uZ2ml+Ye9HUMmPwbYRJ324qF9tqMejwykJ5ggTyvzmrbBeapCAbk98BSbTeovHEEP1uCA==",
-      "dev": true
-    },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        }
-      }
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
-      "dev": true
-    },
-    "lodash.chunk": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
-      "integrity": "sha512-ZzydJKfUHJwHa+hF5X66zLFCBrWn5GeF28OHEr4WVWtNDXlQ/IjWKPBiikqKo2ne0+v6JgCgJ0GzJp8k8bHC7w=="
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "dev": true
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
-    },
-    "lodash.kebabcase": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-      "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "lodash.padstart": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz",
-      "integrity": "sha512-sW73O6S8+Tg66eY56DBk85aQzzUJDtpoXFBgELMd5P/SotAguo+1kYO6RuYgXxA4HJH3LFTFPASX6ET6bjfriw=="
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-      "dev": true
-    },
-    "loglevel": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
-      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
-      "dev": true
-    },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
-      "dev": true
-    },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "markdown-it": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
-      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "entities": "~1.1.1",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      }
-    },
-    "markdown-it-anchor": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz",
-      "integrity": "sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==",
-      "dev": true,
-      "requires": {}
-    },
-    "markdown-it-chain": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-chain/-/markdown-it-chain-1.3.0.tgz",
-      "integrity": "sha512-XClV8I1TKy8L2qsT9iX3qiV+50ZtcInGXI80CA+DP62sMs7hXlyV/RM3hfwy5O3Ad0sJm9xIwQELgANfESo8mQ==",
-      "dev": true,
-      "requires": {
-        "webpack-chain": "^4.9.0"
-      },
-      "dependencies": {
-        "webpack-chain": {
-          "version": "4.12.1",
-          "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-4.12.1.tgz",
-          "integrity": "sha512-BCfKo2YkDe2ByqkEWe1Rw+zko4LsyS75LVr29C6xIrxAg9JHJ4pl8kaIZ396SUSNp6b4815dRZPSTAS8LlURRQ==",
-          "dev": true,
-          "requires": {
-            "deepmerge": "^1.5.2",
-            "javascript-stringify": "^1.6.0"
-          }
-        }
-      }
-    },
-    "markdown-it-container": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-2.0.0.tgz",
-      "integrity": "sha512-IxPOaq2LzrGuFGyYq80zaorXReh2ZHGFOB1/Hen429EJL1XkPI3FJTpx9TsJeua+j2qTru4h3W1TiCRdeivMmA==",
-      "dev": true
-    },
-    "markdown-it-emoji": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz",
-      "integrity": "sha512-QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg==",
-      "dev": true
-    },
-    "markdown-it-table-of-contents": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz",
-      "integrity": "sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw==",
-      "dev": true
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
-    "merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
       "dev": true
     },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "requires": {
         "mime-db": "1.52.0"
       }
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+    "minisearch": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+      "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
       "dev": true
     },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
-      "dev": true,
-      "requires": {
-        "dom-walk": "^0.1.0"
-      }
-    },
-    "mini-css-extract-plugin": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz",
-      "integrity": "sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "^2.0.1",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+    "mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
       "dev": true
     },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
-    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.6"
-      }
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
-      "dev": true,
-      "optional": true
-    },
     "nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
       "dev": true
     },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "oniguruma-to-es": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
+      "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "emoji-regex-xs": "^1.0.0",
+        "regex": "^6.0.1",
+        "regex-recursion": "^6.0.2"
       }
     },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
-      "dev": true
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-          "dev": true
-        }
-      }
-    },
-    "node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
-    },
-    "nopt": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-      "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "dev": true
-    },
-    "normalize-url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^2.0.0",
-        "query-string": "^5.0.1",
-        "sort-keys": "^2.0.0"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-      "dev": true,
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "nprogress": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
-      "dev": true
-    },
-    "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
-      "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
-      "dev": true,
-      "requires": {
-        "array.prototype.reduce": "^1.0.6",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "safe-array-concat": "^1.0.0"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "opencollective-postinstall": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true
-    },
-    "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "optimize-css-assets-webpack-plugin": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.8.tgz",
-      "integrity": "sha512-mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q==",
-      "dev": true,
-      "requires": {
-        "cssnano": "^4.1.10",
-        "last-call-webpack-plugin": "^3.0.0"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-      "dev": true
-    },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true
-    },
-    "p-finally": {
+    "perfect-debounce": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true
-    },
-    "p-retry": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-      "dev": true,
-      "requires": {
-        "retry": "^0.12.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      }
-    },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "requires": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
-    },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-          "dev": true
-        }
-      }
-    },
-    "pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
       "dev": true
     },
     "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
-    },
-    "portfinder": {
-      "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
-      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.4",
-        "debug": "^3.2.7",
-        "mkdirp": "^0.5.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true
     },
     "postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "version": "8.5.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.30.tgz",
+      "integrity": "sha512-zkd+e9S1AQHhmaBKye9zlFHWjOwVgqXl1q3ECYy8561K7qxR2cREf/STLskulBFd78k6AOFeA+ff1TtEzk9bAA==",
       "dev": true,
       "requires": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "nanoid": "^3.3.20",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.2"
       }
     },
-    "postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-load-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
-      }
-    },
-    "postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dev": true,
-      "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
-      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0",
-        "postcss-value-parser": "^3.3.1"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
-      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
-      "dev": true,
-      "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dev": true,
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "normalize-url": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-          "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.15",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-      "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-svgo": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+    "preact": {
+      "version": "10.29.0",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.29.0.tgz",
+      "integrity": "sha512-wSAGyk2bYR1c7t3SZ3jHcM6xy0lcBcDel6lODcs9ME6Th++Dx2KU+6D3HD8wMMKGA8Wpw7OMd3/4RGzYRpzwRg==",
       "dev": true
     },
-    "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
+    "property-information": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
       "dev": true
     },
-    "prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "dev": true,
-      "optional": true
-    },
-    "pretty-error": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
-      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
+    "regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz",
+      "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.20",
-        "renderkid": "^2.0.4"
+        "regex-utilities": "^2.3.0"
       }
     },
-    "pretty-time": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
-      "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
+    "regex-recursion": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
+      "dev": true,
+      "requires": {
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "regex-utilities": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
       "dev": true
     },
-    "prismjs": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+    "rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "dev": true
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+    "rollup": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.0.tgz",
+      "integrity": "sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==",
       "dev": true,
       "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
+        "@rollup/rollup-android-arm-eabi": "4.60.0",
+        "@rollup/rollup-android-arm64": "4.60.0",
+        "@rollup/rollup-darwin-arm64": "4.60.0",
+        "@rollup/rollup-darwin-x64": "4.60.0",
+        "@rollup/rollup-freebsd-arm64": "4.60.0",
+        "@rollup/rollup-freebsd-x64": "4.60.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.60.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.60.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.60.0",
+        "@rollup/rollup-linux-arm64-musl": "4.60.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.60.0",
+        "@rollup/rollup-linux-loong64-musl": "4.60.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.60.0",
+        "@rollup/rollup-linux-ppc64-musl": "4.60.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.60.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.60.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.60.0",
+        "@rollup/rollup-linux-x64-gnu": "4.60.0",
+        "@rollup/rollup-linux-x64-musl": "4.60.0",
+        "@rollup/rollup-openbsd-x64": "4.60.0",
+        "@rollup/rollup-openharmony-arm64": "4.60.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.60.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.60.0",
+        "@rollup/rollup-win32-x64-gnu": "4.60.0",
+        "@rollup/rollup-win32-x64-msvc": "4.60.0",
+        "@types/estree": "1.0.8",
+        "fsevents": "~2.3.2"
       }
     },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-      "dev": true
+    "search-insights": {
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+      "dev": true,
+      "peer": true
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+    "shiki": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
+      "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
+        "@shikijs/core": "2.5.0",
+        "@shikijs/engine-javascript": "2.5.0",
+        "@shikijs/engine-oniguruma": "2.5.0",
+        "@shikijs/langs": "2.5.0",
+        "@shikijs/themes": "2.5.0",
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
       }
     },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
-    },
-    "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
-    "query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-      "dev": true,
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      }
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "dev": true
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
-        }
-      }
-    },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "reduce": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/reduce/-/reduce-1.0.2.tgz",
-      "integrity": "sha512-xX7Fxke/oHO5IfZSk77lvPa/7bjMh9BuCk4OOoX5XTXrM7s0Z+MkPfSDfz0q7r91BhhGSs8gii/VEN/7zhCPpQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.1.0"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
-    },
-    "regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
-      }
-    },
-    "regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-      "dev": true,
-      "requires": {
-        "@babel/regjsgen": "^0.8.0",
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.1.0"
-      }
-    },
-    "registry-auth-token": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-      "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-      "dev": true,
-      "requires": {
-        "rc": "1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-          "dev": true
-        }
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-      "dev": true
-    },
-    "renderkid": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
-      "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
-      "dev": true,
-      "requires": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^3.0.1"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-          "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^6.0.1",
-            "domhandler": "^4.3.1",
-            "domutils": "^2.8.0",
-            "nth-check": "^2.0.1"
-          }
-        },
-        "css-what": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-          "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        },
-        "domutils": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        },
-        "nth-check": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-          "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0"
-          }
-        }
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.5.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-          "dev": true
-        }
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "dev": true
-    },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-      "dev": true
-    },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==",
-      "dev": true
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "safe-array-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      }
-    },
-    "section-matter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
-      "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "kind-of": "^6.0.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
-    },
-    "selfsigned": {
-      "version": "1.10.14",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
-      "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
-      "dev": true,
-      "requires": {
-        "node-forge": "^0.10.0"
-      }
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true
-    },
-    "semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      }
-    },
-    "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-              "dev": true
-            }
-          }
-        },
-        "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
-    "set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      }
-    },
-    "set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.0.1",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
-      }
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-          "dev": true
-        }
-      }
-    },
-    "sitemap": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-3.2.2.tgz",
-      "integrity": "sha512-TModL/WU4m2q/mQcrDgNANn0P4LwprM9MMvG4hu5zP4c6IIKs2YLTu6nXXnNr8ODW/WFtxKggiJ1EGn2W0GNmg==",
-      "requires": {
-        "lodash.chunk": "^4.2.0",
-        "lodash.padstart": "^4.6.1",
-        "whatwg-url": "^7.0.0",
-        "xmlbuilder": "^13.0.0"
-      }
-    },
-    "slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true
-    },
-    "smoothscroll-polyfill": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz",
-      "integrity": "sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==",
-      "dev": true
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "requires": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        }
-      }
-    },
-    "sockjs-client": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz",
-      "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "eventsource": "^2.0.2",
-        "faye-websocket": "^0.11.4",
-        "inherits": "^2.0.4",
-        "url-parse": "^1.5.10"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "sort-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
-      "dev": true,
-      "requires": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-          "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-          "dev": true
-        }
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true
-    },
     "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "dev": true
     },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
-      "dev": true,
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "stack-utils": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
-      "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
-        }
-      }
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true
-    },
-    "std-env": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.3.1.tgz",
-      "integrity": "sha512-eOsoKTWnr6C8aWrqJJ2KAReXoa7Vn5Ywyw6uCXgA/xDhxPoaIsBa5aNJmISY04dLwXPBnDHW4diGM7Sn5K4R/g==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^3.1.1"
-      }
-    },
-    "stream-browserify": {
+    "space-separated-tokens": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
       "dev": true
     },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
+    "speakingurl": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+      "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+    "stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
       }
     },
-    "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+    "superjson": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz",
+      "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==",
       "dev": true,
       "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+        "copy-anything": "^4"
       }
     },
-    "string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      }
+    "tabbable": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
+      "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
+      "dev": true
     },
-    "string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      }
-    },
-    "strip-ansi": {
+    "trim-lines": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true
+    },
+    "unist-util-is": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
+      "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "@types/unist": "^3.0.0"
       }
     },
-    "strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
-      "dev": true
+    "unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^3.0.0"
+      }
     },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
-      "dev": true
+    "unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^3.0.0"
+      }
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true
+    "unist-util-visit": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz",
+      "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      }
     },
-    "stylehacks": {
+    "unist-util-visit-parents": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
+      "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      }
+    },
+    "vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^3.0.0",
+        "vfile-message": "^4.0.0"
+      }
+    },
+    "vfile-message": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+      "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
       }
     },
-    "stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+    "vite": {
+      "version": "5.4.21",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
       "dev": true,
       "requires": {
-        "css-parse": "~2.0.0",
-        "debug": "~3.1.0",
-        "glob": "^7.1.6",
-        "mkdirp": "~1.0.4",
-        "safer-buffer": "^2.1.2",
-        "sax": "~1.2.4",
-        "semver": "^6.3.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-          "dev": true
-        }
+        "esbuild": "^0.21.3",
+        "fsevents": "~2.3.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       }
     },
-    "stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+    "vitepress": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+      "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "@docsearch/css": "3.8.2",
+        "@docsearch/js": "3.8.2",
+        "@iconify-json/simple-icons": "^1.2.21",
+        "@shikijs/core": "^2.1.0",
+        "@shikijs/transformers": "^2.1.0",
+        "@shikijs/types": "^2.1.0",
+        "@types/markdown-it": "^14.1.2",
+        "@vitejs/plugin-vue": "^5.2.1",
+        "@vue/devtools-api": "^7.7.0",
+        "@vue/shared": "^3.5.13",
+        "@vueuse/core": "^12.4.0",
+        "@vueuse/integrations": "^12.4.0",
+        "focus-trap": "^7.6.4",
+        "mark.js": "8.11.1",
+        "minisearch": "^7.1.1",
+        "shiki": "^2.1.0",
+        "vite": "^5.4.14",
+        "vue": "^3.5.13"
       }
     },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-      "dev": true
-    },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      }
-    },
-    "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true
-    },
-    "term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "dev": true
-    },
-    "terser": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
-      "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-      "dev": true,
-      "requires": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
-      "dev": true
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
-      "dev": true
-    },
-    "to-factory": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-factory/-/to-factory-1.0.0.tgz",
-      "integrity": "sha512-JVYrY42wMG7ddf+wBUQR/uHGbjUHZbLisJ8N62AMm0iTZ0p8YTcZLzdtomU0+H+wa99VbkyvQGB3zxB7NDzgIQ==",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
-    },
-    "toml": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
-      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==",
-      "dev": true
-    },
-    "toposort": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg==",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true
-    },
-    "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "dev": true
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.19.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-      "dev": true
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "dev": true
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
-      "dev": true
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
-      "dev": true
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
-    "update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
-      "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
-      "dev": true,
-      "requires": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
-      "dev": true,
-      "requires": {
-        "punycode": "^1.4.1",
-        "qs": "^6.11.2"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-          "dev": true
-        }
-      }
-    },
-    "url-loader": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
-      "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "mime": "^2.0.3",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
-    },
-    "vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      },
-      "dependencies": {
-        "core-util-is": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-          "dev": true
-        }
-      }
-    },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
     "vue": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+      "version": "3.5.44",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.44.tgz",
+      "integrity": "sha512-dvvmaOCG7lAMkJTPqPwWeGMsPS6DIsFsfZDUgBp9V6mHf9b3+/wyVwYR4Es+WV6uJC0FKRxp81Obcq0ZwUcGFQ==",
       "dev": true,
       "requires": {
-        "@vue/compiler-sfc": "2.7.16",
-        "csstype": "^3.1.0"
+        "@vue/compiler-dom": "3.5.44",
+        "@vue/compiler-sfc": "3.5.44",
+        "@vue/runtime-dom": "3.5.44",
+        "@vue/server-renderer": "3.5.44",
+        "@vue/shared": "3.5.44"
       }
     },
-    "vue-hot-reload-api": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
-      "dev": true
-    },
-    "vue-loader": {
-      "version": "15.11.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      }
-    },
-    "vue-router": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
-      "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==",
-      "dev": true
-    },
-    "vue-server-renderer": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.7.16.tgz",
-      "integrity": "sha512-U7GgR4rYmHmbs3Z2gqsasfk7JNuTsy/xrR5EMMGRLkjN8+ryDlqQq6Uu3DcmbCATAei814YOxyl0eq2HNqgXyQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.2",
-        "hash-sum": "^2.0.0",
-        "he": "^1.2.0",
-        "lodash.template": "^4.5.0",
-        "lodash.uniq": "^4.5.0",
-        "resolve": "^1.22.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "0.5.6"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "hash-sum": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-          "dev": true
-        },
-        "serialize-javascript": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-          "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "vue-style-loader": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-      "dev": true,
-      "requires": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "vue-template-compiler": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
-      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
-      "dev": true,
-      "requires": {
-        "de-indent": "^1.0.2",
-        "he": "^1.2.0"
-      }
-    },
-    "vue-template-es2015-compiler": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
-      "dev": true
-    },
-    "vuepress": {
-      "version": "1.9.10",
-      "resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.9.10.tgz",
-      "integrity": "sha512-UnGm9vjQvG918SZVNvgiUlNimLqawdYPq0aPRXDpEB1VksvqegVFy/GKdA8ShXJaEpOMPSt7YD4uK21jaMs3kA==",
-      "dev": true,
-      "requires": {
-        "@vuepress/core": "1.9.10",
-        "@vuepress/theme-default": "1.9.10",
-        "@vuepress/types": "1.9.10",
-        "cac": "^6.5.6",
-        "envinfo": "^7.2.0",
-        "opencollective-postinstall": "^2.0.2",
-        "update-notifier": "^4.0.0"
-      }
-    },
-    "vuepress-html-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vuepress-html-webpack-plugin/-/vuepress-html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha512-BebAEl1BmWlro3+VyDhIOCY6Gef2MCBllEVAP3NUAtMguiyOwo/dClbwJ167WYmcxHJKLl7b0Chr9H7fpn1d0A==",
-      "dev": true,
-      "requires": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
-        "util.promisify": "1.0.0"
-      },
-      "dependencies": {
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
-          "dev": true
-        },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
-          "dev": true,
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
-        },
-        "util.promisify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-          "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-          "dev": true,
-          "requires": {
-            "define-properties": "^1.1.2",
-            "object.getownpropertydescriptors": "^2.0.3"
-          }
-        }
-      }
-    },
-    "vuepress-plugin-container": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/vuepress-plugin-container/-/vuepress-plugin-container-2.1.5.tgz",
-      "integrity": "sha512-TQrDX/v+WHOihj3jpilVnjXu9RcTm6m8tzljNJwYhxnJUW0WWQ0hFLcDTqTBwgKIFdEiSxVOmYE+bJX/sq46MA==",
-      "dev": true,
-      "requires": {
-        "@vuepress/shared-utils": "^1.2.0",
-        "markdown-it-container": "^2.0.0"
-      }
-    },
-    "vuepress-plugin-sitemap": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/vuepress-plugin-sitemap/-/vuepress-plugin-sitemap-2.3.1.tgz",
-      "integrity": "sha512-n+8lbukhrKrsI9H/EX0EBgkE1pn85LAQFvQ5dIvrZP4Kz6JxPOPPNTQmZMhahQV1tXbLZQCEN7A1WZH4x+arJQ==",
-      "requires": {
-        "sitemap": "^3.0.0"
-      }
-    },
-    "vuepress-plugin-smooth-scroll": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/vuepress-plugin-smooth-scroll/-/vuepress-plugin-smooth-scroll-0.0.3.tgz",
-      "integrity": "sha512-qsQkDftLVFLe8BiviIHaLV0Ea38YLZKKonDGsNQy1IE0wllFpFIEldWD8frWZtDFdx6b/O3KDMgVQ0qp5NjJCg==",
-      "dev": true,
-      "requires": {
-        "smoothscroll-polyfill": "^0.4.3"
-      }
-    },
-    "watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^3.4.1",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.1"
-      },
-      "dependencies": {
-        "binary-extensions": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-          "dev": true,
-          "optional": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-          "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true,
-          "optional": true
-        },
-        "readdirp": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "picomatch": "^2.2.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
-    "watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chokidar": "^2.1.8"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "webpack": {
-      "version": "4.47.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
-      "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.5.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
-        "webpack-sources": "^1.4.1"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "webpack-chain": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
-      "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
-      "dev": true,
-      "requires": {
-        "deepmerge": "^1.5.2",
-        "javascript-stringify": "^2.0.1"
-      },
-      "dependencies": {
-        "javascript-stringify": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
-          "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
-      "integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
-      "integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
-      "dev": true,
-      "requires": {
-        "ansi-html-community": "0.0.8",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.1.8",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "debug": "^4.1.1",
-        "del": "^4.1.1",
-        "express": "^4.17.1",
-        "html-entities": "^1.3.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.3.0",
-        "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "loglevel": "^1.6.8",
-        "opn": "^5.5.0",
-        "p-retry": "^3.0.1",
-        "portfinder": "^1.0.26",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.8",
-        "semver": "^6.3.0",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "sockjs-client": "^1.5.0",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^3.0.1",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.2",
-        "webpack-log": "^2.0.0",
-        "ws": "^6.2.1",
-        "yargs": "^13.3.2"
-      },
-      "dependencies": {
-        "http-proxy-middleware": {
-          "version": "0.19.1",
-          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-          "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-          "dev": true,
-          "requires": {
-            "http-proxy": "^1.17.0",
-            "is-glob": "^4.0.0",
-            "lodash": "^4.17.11",
-            "micromatch": "^3.1.10"
-          }
-        },
-        "is-absolute-url": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "webpackbar": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-3.2.0.tgz",
-      "integrity": "sha512-PC4o+1c8gWWileUfwabe0gqptlXUDJd5E0zbpr2xHP1VSOVlZVPBZ8j6NCR8zM5zbKdxPhctHXahgpNK1qFDPw==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.1.0",
-        "chalk": "^2.4.1",
-        "consola": "^2.6.0",
-        "figures": "^3.0.0",
-        "pretty-time": "^1.1.0",
-        "std-env": "^2.2.1",
-        "text-table": "^0.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true
-    },
-    "whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "when": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha512-d1VUP9F96w664lKINMGeElWdhhb5sC+thXM+ydZGU3ZnaE09Wv6FaS+mpM9570kcDs/xMfcXJBTLsMdHEFYY9Q==",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
-    },
-    "which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-    },
-    "xmlbuilder": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
-      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-          "dev": true
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
-      }
-    },
-    "zepto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zepto/-/zepto-1.2.0.tgz",
-      "integrity": "sha512-C1x6lfvBICFTQIMgbt3JqMOno3VOtkWat/xEakLTOurskYIHPmzJrzd1e8BnmtdDVJlGuk5D+FxyCA8MPmkIyA==",
+    "zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 7298290..f9aacd2 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,21 @@
 {
   "scripts": {
-    "docs:dev": "vuepress dev docs",
-    "docs:build": "vuepress build docs"
-  },
-  "devDependencies": {
-    "vuepress": "^1.9.10"
+    "gen:ssl": "node scripts/ensure_ssl_certs.js",
+    "gen:metadata": "node docsgen/gen_wu.js",
+    "gen:commonconfig": "curl -sSf -o docs/.vitepress/public/commonConfig.js https://www.theengs.io/commonConfig.js",
+    "docs:dev": "npm run gen:commonconfig && npm run gen:metadata && vitepress dev docs",
+    "docs:build": "npm run gen:commonconfig && npm run gen:metadata && vitepress build docs",
+    "docs:preview": "vitepress preview docs",
+    "site:preview": " npm run gen:ssl && node scripts/preview_site.js"
   },
   "dependencies": {
-    "vuepress-plugin-sitemap": "^2.3.1"
+    "ini": "^4.1.1",
+    "markdown-table": "^3.0.3",
+    "mime-types": "^2.1.35"
+  },
+  "devDependencies": {
+    "medium-zoom": "^1.1.0",
+    "vitepress": "^1.6.4",
+    "vue": "^3.5.44"
   }
 }
diff --git a/partitions/alltest_large.csv b/partitions/alltest_large.csv
new file mode 100644
index 0000000..23f586e
--- /dev/null
+++ b/partitions/alltest_large.csv
@@ -0,0 +1,4 @@
+# Name,   Type, SubType, Offset,  Size,     Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+app0,     app,  ota_0,   0x10000, 0x200000,
+spiffs,   data, spiffs,  0x310000,0x4F000,
diff --git a/partitions/no_coredump.csv b/partitions/no_coredump.csv
new file mode 100644
index 0000000..3ce3c4a
--- /dev/null
+++ b/partitions/no_coredump.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x1F0000,
+app1,     app,  ota_1,   0x200000,0x1F0000,
+spiffs,   data, spiffs,  0x3F0000,0x10000,
diff --git a/platformio.ini b/platformio.ini
index 26a9a64..2ae190b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -60,6 +60,7 @@ extra_configs =
 ;default_envs = esp32s3-atomS3U
 ;default_envs = esp32doitv1-aithinker-r01-sx1278
 ;default_envs = esp32dev-rtl_433
+;default_envs = esp32dev-rtl_433-fsk
 default_envs = heltec-rtl_433
 ;default_envs = heltec-rtl_433-fsk
 ;default_envs = heltec-ble
@@ -78,13 +79,12 @@ default_envs = heltec-rtl_433
 ;default_envs = nodemcuv2-fastled-test
 ;default_envs = nodemcuv2-2g
 ;default_envs = nodemcuv2-ir
-;default_envs = nodemcuv2-rs232
+;default_envs = nodemcuv2-serial
 ;default_envs = avatto-bakeey-ir
 ;default_envs = nodemcuv2-rf
 ;default_envs = nodemcuv2-rf-cc1101
 ;default_envs = nodemcuv2-somfy-cc1101
 ;default_envs = manual-wifi-test
-;default_envs = nodemcuv2-mqtt-fw-test
 ;default_envs = rf-wifi-gateway
 ;default_envs = nodemcuv2-rf2
 ;default_envs = nodemcuv2-rf2-cc1101
@@ -104,6 +104,11 @@ default_envs = heltec-rtl_433
 ;default_envs = thingpulse-espgateway
 ;default_envs = theengs-bridge
 ;default_envs = esp32dev-ble-idf
+;default_envs = esp32s3-m5stack-stamps3
+;default_envs = esp32c3-m5stamp
+;default_envs = esp32c3u-m5stamp
+;default_envs = lilygo-t3-s3-rtl_433
+;default_envs = lilygo-t3-s3-rtl_433-fsk
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                              ENVIRONMENTS PARAMETERS                                 ;
@@ -112,58 +117,57 @@ default_envs = heltec-rtl_433
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 [libraries]
-arduinojson = ArduinoJson@6.18.3
-arduinolog = https://github.com/1technophile/Arduino-Log.git#f634509
-pubsubclient = PubSubClient@2.8
-rc-switch = https://github.com/1technophile/rc-switch.git#98537e9
-newremoteswitch = https://github.com/1technophile/NewRemoteSwitch.git#8eb980e
-ble = https://github.com/h2zero/NimBLE-Arduino.git#1.4.1
-irremoteesp = IRremoteESP8266@2.8.2
-irremote = https://github.com/z3t0/Arduino-IRremote.git#1c08a37
-lora = https://github.com/sandeepmistry/arduino-LoRa.git#f4a1d27
-esppilight = ESPiLight@0.17.0
+arduinojson = ArduinoJson@6.18.5
+arduinolog = https://github.com/1technophile/Arduino-Log/archive/6d1f14a.zip
+picomqtt = PicoMQTT@1.1.1
+rc-switch = https://github.com/1technophile/rc-switch/archive/98537e9.zip
+newremoteswitch = https://github.com/1technophile/NewRemoteSwitch/archive/8eb980e.zip
+ble = https://github.com/h2zero/NimBLE-Arduino/archive/2.5.0.zip
+irremoteesp = https://github.com/theengs/IRremoteESP8266/archive/arduinov3.zip
+lora = https://github.com/sandeepmistry/arduino-LoRa/archive/f4a1d27.zip
+esppilight = https://github.com/theengs/ESPiLight/archive/b9dd7a1.zip
 rfWeatherStation = WeatherStationDataRx@0.3.1
-rfm69 = https://github.com/LowPowerLab/RFM69.git#2e915ea
-rfm69spi = https://github.com/lowpowerlab/spiflash.git#9c0c2b9
+rfm69 = https://github.com/LowPowerLab/RFM69/archive/2e915ea.zip
+rfm69spi = https://github.com/lowpowerlab/spiflash/archive/9c0c2b9.zip
 rfm69_low-power = Low-Power@1.6
 dht = DHT sensor library@1.3.2
 unifiedsensor = Adafruit Unified Sensor@1.1.4
 tsl2561 = Adafruit TSL2561@1.0.3
 bme280 = SparkFun BME280@2.0.4
-bmp180 = BMP180#efac46bd8d
+bmp180 = https://github.com/xelarep/SFE_BMP180/archive/efac46b.zip
 htu21 = SparkFun HTU21D Humidity and Temperature Sensor Breakout@1.1.3
 ahtx0 = Adafruit AHTX0
-ina226 = https://github.com/jarzebski/Arduino-INA226.git#968a684
-a6lib = https://github.com/h2zero/A6lib
-wifimanager32 = https://github.com/tzapu/WiFiManager.git#9f5981e
-wifimanager8266 = https://github.com/tzapu/WiFiManager.git#2.0.5-beta
+ina226 = https://github.com/jarzebski/Arduino-INA226/archive/968a684.zip
+a6lib = https://github.com/h2zero/A6lib/archive/fe873c9.zip
+wifimanager32 = https://github.com/h2zero/WiFiManager/archive/1ac24f4.zip
+wifimanager8266 = https://github.com/tzapu/WiFiManager/archive/2.0.5-beta.zip
 ethernet = Ethernet
 esp8266_mdns = esp8266_mdns
 wire = Wire
-fastled = fastled/FastLED@3.5.0
+fastled = fastled/FastLED@3.9.15
 adafruit_neopixel = adafruit/Adafruit NeoPixel@^1.11.0
-onewire = paulstoffregen/OneWire@2.3.7
+onewire = https://github.com/h2zero/OneWire/archive/GPIO-fix.zip
 dallastemperature = DallasTemperature
-m5stickc = M5StickC@0.2.0
-m5stickcp = https://github.com/m5stack/M5StickC-Plus.git#0.0.2
-m5stack = M5Stack@0.3.1
-m5tough = https://github.com/m5stack/M5Tough.git#b502416
-smartrc-cc1101-driver-lib = SmartRC-CC1101-Driver-Lib@2.5.7
-stl = https://github.com/mike-matera/ArduinoSTL.git#7411816
-shtc3 = https://github.com/sparkfun/SparkFun_SHTC3_Arduino_Library
+; M5Unified + M5GFX drive all M5 boards (Core / Stick C / Stick C Plus / Tough);
+; they build on the modern Arduino core and auto-detect the board at runtime,
+; replacing the per-board M5Stack/M5StickC/M5StickC-Plus/M5Tough libraries.
+m5unified = m5stack/M5Unified@^0.2.5
+smartrc-cc1101-driver-lib = https://github.com/LSatan/SmartRC-CC1101-Driver-Lib/archive/v3.0.2.zip
+stl = https://github.com/mike-matera/ArduinoSTL/archive/7411816.zip
+shtc3 = https://github.com/sparkfun/SparkFun_SHTC3_Arduino_Library/archive/671ef7e.zip
 somfy_remote=Somfy_Remote_Lib@0.3.0
-rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP.git#v0.3.2
+rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP/archive/v0.6.2.zip
 emodbus =  miq19/eModbus@1.0.0
-gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1
-decoder = https://github.com/theengs/decoder.git#development
-ssd1306 = https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
+gfSunInverter = https://github.com/BlackSmith/GFSunInverter/archive/v1.0.1.zip
+decoder = https://github.com/theengs/decoder/archive/v2.5.0.zip
+ssd1306 = https://github.com/ThingPulse/esp8266-oled-ssd1306/archive/f96fd6a.zip
 lm75 = jeremycole/I2C Temperature Sensors derived from the LM75@^1.0.3
-rn8209 = https://github.com/theengs/RN8209C-SDK.git#arduino
+rn8209 = https://github.com/theengs/RN8209C-SDK/archive/arduino.zip
 
 [env]
 framework = arduino
 lib_deps =
-  ${libraries.pubsubclient}
+  ${libraries.picomqtt}
   ${libraries.arduinojson}
   ${libraries.arduinolog}
 build_flags =
@@ -172,11 +176,13 @@ build_flags =
 ;  -E ; generate precompiled source file (.pio/build/*/src/main.ino.cpp.o), use for precompilator debuging only (prevent compilation to succeed)
 ;  '-DLOG_LEVEL=LOG_LEVEL_TRACE'  ; Enable trace level logging
 monitor_speed = 115200
+extra_scripts = pre:scripts/add_mlongcalls.py
 
 [com]
-esp8266_platform = espressif8266@4.1.0
-esp32_platform = espressif32@6.1.0
-esp32_solo_platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.5/platform-espressif32-v.2.0.5.zip
+esp8266_platform = espressif8266@4.2.1
+esp32_platform =  https://github.com/pioarduino/platform-espressif32/releases/download/55.03.39/platform-espressif32.zip
+esp32_platform_packages = framework-arduinoespressif32-libs @ https://github.com/theengs/esp32-arduino-lib-builder/releases/download/0.1.8/esp32-arduino-libs.tar.gz
+esp32_solo_platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.02.00/platform-espressif32.zip
 atmelavr_platform = atmelavr@3.3.0
 
 [com-esp] ; Used by all ESP8266/ESP8285 based builds
@@ -191,7 +197,6 @@ build_flags =
   ;'-DCORE_DEBUG_LEVEL=4'
 
 [com-esp32] ; Used by all ESP32 based builds
-extra_scripts = pre:scripts/replace_lib.py
 lib_deps =
   ${env.lib_deps}
   ${libraries.wifimanager32}
@@ -201,6 +206,7 @@ build_flags =
   '-DZmqttDiscovery="HADiscovery"'
   '-DCONFIG_BT_NIMBLE_ROLE_PERIPHERAL_DISABLED'
   '-DCONFIG_BT_NIMBLE_ROLE_BROADCASTER_DISABLED'
+  '-DCONFIG_NIMBLE_CPP_ADDR_FMT_UPPERCASE'
   '-DMQTTsetMQTT'
   '-DMQTT_HTTPS_FW_UPDATE'
   ;'-DCORE_DEBUG_LEVEL=4'
@@ -221,4 +227,4 @@ lib_deps =
   ${libraries.ethernet}
 build_flags =
   ${env.build_flags}
-  '-DsimpleReceiving=false'
\ No newline at end of file
+  '-DsimpleReceiving=false'
diff --git a/prod_env.ini.example b/prod_env.ini.example
index 2cfefe8..62dabcc 100644
--- a/prod_env.ini.example
+++ b/prod_env.ini.example
@@ -7,6 +7,7 @@ default_envs =
 ;esp32 1
 [env:esp32dev-ble-1]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -26,6 +27,7 @@ monitor_speed = 115200
 ;esp32 2
 [env:esp32dev-ble-2]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -60,6 +62,7 @@ board_build.flash_mode = dout
 
 [env:esp32-lolin32lite-ble-lp]
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = lolin32
 board_build.partitions = min_spiffs.csv
 lib_deps =
@@ -77,7 +80,7 @@ build_flags =
   '-DMQTT_USER="lolin-esp32"'
   '-DMQTT_PASS="abcdefghi"'
   '-DMQTT_SERVER="192.168.1.17"'
-  '-DDEFAULT_LOW_POWER_MODE=2'
+  '-DDEFAULT_LOW_POWER_MODE=INTERVAL'
 
 ;hacked Sonoff RF-Bridge
 [env:sonoff-rfbridge-hacked]
@@ -201,6 +204,7 @@ custom_hardware = Pool temp sensor first version
 
 [env:wemos-d1-uno32-HM-RD-deepsleep-waterleak] ;C-37, YL-83, HM-RD leak detector powered by battery using ESP32 Deepsleep and EXT0 wake by sensor state
 platform = ${com.esp32_platform}
+platform_packages = ${com.esp32_platform_packages}
 board = wemos_d1_uno32
 board_build.partitions = min_spiffs.csv
 lib_deps =
diff --git a/scripts/CI_SCRIPTS.md b/scripts/CI_SCRIPTS.md
new file mode 100644
index 0000000..a63f2b7
--- /dev/null
+++ b/scripts/CI_SCRIPTS.md
@@ -0,0 +1,790 @@
+# CI/CD Scripts Documentation
+
+This documentation describes the CI/CD scripts used to build OpenMQTTGateway firmware and documentation. These scripts work in GitHub Actions, locally, and in any CI/CD environment.
+
+- [Overview](#cicd-scripts-documentation)
+- [Quick Reference](#quick-reference)
+  - [Script Hierarchy](#script-hierarchy)
+  - [Script Description](#script-description)
+  - [Output Structure](#output-structure)
+- [Commands](#commands)
+  - [ci.sh - Main Entry Point](#commands)
+  - [ci.sh build - Build Firmware](#cish-build---build-firmware)
+  - [ci.sh site - Build Documentation](#cish-site---build-documentation)
+  - [ci.sh qa - Code Quality Checks](#cish-qa---code-quality-checks)
+  - [ci.sh security - Security Vulnerability Scan](#cish-security---security-vulnerability-scan)
+- [Internal Scripts](#internal-scripts)
+  - [ci_list-env.sh](#ci_list-envsh)
+  - [ci_build_firmware.sh](#ci_build_firmwaresh)
+  - [ci_prepare_artifacts.sh](#ci_prepare_artifactssh)
+  - [ci_security.sh](#ci_securitysh)
+  - [ci_00_config.sh](#ci_00_configsh)
+- [Python Helper Scripts](#python-helper-scripts)
+  - [generate_board_docs.py](#generate_board_docspy)
+  - [gen_wu.py](#gen_wupy)
+- [Environment Variables](#environment-variables)
+- [Exit Codes](#exit-codes)
+- [Environment Detection](#environment-detection)
+- [GitHub Actions Workflows Integration](#github-actions-workflows-integration)
+
+
+
+## Quick Reference
+
+### Script Hierarchy
+
+```
+ci.sh (dispatcher)
+├── build → ci_build.sh → ci_build_firmware.sh
+│                       → ci_prepare_artifacts.sh (when --deploy-ready)
+├── site → ci_site.sh
+├── qa → ci_qa.sh
+├── security → ci_security.sh (vulnerability scanning with Trivy)
+├── list-env → ci_list-env.sh
+└── all → qa + build (all envs with --mode) + site sequential
+```
+
+### Script Description
+
+| Script | Purpose | Called By |
+|--------|---------|----------|
+| `ci.sh` | Main command dispatcher | User/GitHub Actions |
+| `ci_build.sh` | Build firmware orchestrator | ci.sh build |
+| `ci_site.sh` | Documentation build orchestrator | ci.sh site |
+| `ci_00_config.sh` | Shared configuration loader | ci.sh |
+| `ci_qa.sh` | Quality assurance and shellcheck | ci.sh qa |
+| `ci_security.sh` | Security vulnerability scanning with Trivy | ci.sh security |
+| `ci_list-env.sh` | List PlatformIO environments (fast JSON or full scan) | ci.sh list-env / direct |
+| `ci_build_firmware.sh` | PlatformIO build execution | ci_build.sh |
+| `ci_prepare_artifacts.sh` | Artifact packaging (when requested) | ci_build.sh |
+
+
+### Output Structure
+
+Build outputs are organized in the project root:
+
+```
+.pio/build/<environment>/     # PlatformIO build outputs
+├── firmware.bin              # Main firmware binary
+├── bootloader.bin           # ESP32 bootloader
+└── partitions.bin           # ESP32 partition table
+
+generated/
+├── artifacts/               # Packaged firmware artifacts
+├── site/                    # Built documentation (VuePress output)
+└── reports/                 # Security scan and SBOM reports
+    └── sbom/                # SBOM in CycloneDX and SPDX formats
+```
+
+## Commands
+
+`ci.sh` is the main entry point. It dispatches to the specialized scripts.
+
+**Usage:**
+```bash
+./scripts/ci.sh <command> [OPTIONS]
+```
+
+**Commands:**
+- `build` - Build firmware for a PlatformIO environment (optionally prepare artifacts)
+- `site` or `docs` - Build documentation site
+- `qa` or `lint` - Run formatting and shellcheck checks
+- `security` - Scan for security vulnerabilities using Trivy (filesystem, container images)
+- `all` or `pipeline` - Run qa → build (all environments) → site with injected mode
+- `list-env` - List available PlatformIO environments (JSON fast list or full ini scan)
+
+**Examples:**
+```bash
+# Help per command
+./scripts/ci.sh build --help
+./scripts/ci.sh site --help
+./scripts/ci.sh qa --help
+./scripts/ci.sh security --help
+./scripts/ci.sh list-env --help
+
+# Build firmware
+./scripts/ci.sh build esp32dev-all-test --mode dev
+./scripts/ci.sh build esp32dev-bt --version v1.8.0 --deploy-ready --output generated/artifacts
+
+# Build docs
+./scripts/ci.sh site --mode prod --url-prefix /
+./scripts/ci.sh site --mode dev --preview
+
+# QA (formatting + shellcheck)
+./scripts/ci.sh qa --check
+./scripts/ci.sh qa --fix --verbose
+
+# Security scanning
+./scripts/ci.sh security --scan-type fs --severity HIGH,CRITICAL
+./scripts/ci.sh security --scan-type fs --generate-sbom
+
+# Full pipeline (qa + build all envs + site)
+./scripts/ci.sh all --mode dev
+./scripts/ci.sh all --mode prod --preview
+```
+
+---
+
+### ci.sh build - Build Firmware
+
+Runs the build pipeline (tool checks → PlatformIO build → optional artifact packaging).
+
+**Usage:**
+```bash
+./scripts/ci.sh build <environment> [OPTIONS]
+```
+
+**Required Argument:**
+- `<environment>` PlatformIO environment name (e.g., esp32dev-ble)
+
+**Options:**
+- `--mode <prod|dev>` Build mode (default: prod). `dev` enables OTA flags in the PlatformIO build.
+- `--deploy-ready` Copy/rename build outputs and libs via ci_prepare_artifacts.sh.
+- `--version [TAG]` Set version used for `OMG_VERSION` and artifact folder naming. If TAG is omitted the script auto-generates (CI: BUILD_NUMBER/GIT_COMMIT, local: timestamp).
+- `--output <dir>` Output directory for packaged artifacts (only used when `--deploy-ready` is set, default `generated/artifacts`).
+- `--skip-verification` Skip the tool availability checks.
+- `--clean` Clean the PlatformIO environment before building.
+- `--verbose` Verbose PlatformIO output.
+- `--help` Show help.
+
+**Behavior:**
+- Tool check verifies python3, platformio, git (can be skipped).
+- Builds via ci_build_firmware.sh (adds `--dev-ota` when `--mode dev`).
+- Packaging runs only when `--deploy-ready` is provided; artifacts land under `generated/artifacts/firmware_build/` with env-prefixed filenames plus zipped libraries. 
+<!-- - Packaging runs only when `--deploy-ready` is provided; artifacts land under `generated/artifacts[/<version>]/firmware_build/` with env-prefixed filenames plus zipped libraries. -->
+
+**Examples:**
+```bash
+# Dev build with OTA flags
+./scripts/ci.sh build esp32dev-ble --mode dev
+
+# Prod build with auto-version and deployable artifacts
+./scripts/ci.sh build esp32dev-bt --version --deploy-ready --output generated/artifacts
+
+# Clean + verbose build
+./scripts/ci.sh build nodemcuv2-rf --clean --verbose
+```
+
+---
+
+### ci.sh site - Build Documentation
+
+Builds the VuePress documentation site.
+
+**Usage:**
+```bash
+./scripts/ci.sh site [OPTIONS]
+```
+
+**Options:**
+- `--mode <prod|dev>` Build mode (default: dev).
+- `--url-prefix <path>` Base URL path for links (e.g., '/' for root, '/dev/' for dev) (default: /dev/).
+- `--version <tag>` Version string written to meta.json (default: edge).
+- `--preview` Start the local HTTPS preview server after building (https://localhost:8443).
+- `--clean` Remove generated/site folder before building.
+- `--insecure-curl` Allow curl to skip TLS verification when downloading common config.
+- `--help` Show help.
+
+**Behavior:**
+- Checks for node, npm, openssl; installs npm deps; downloads commonConfig.js.
+- Writes docs/.vuepress/meta.json with mode/url_prefix/version; builds via `npm run docs:build`.
+- Preview mode runs `npm run site:preview`.
+
+**Examples:**
+```bash
+# Production build
+./scripts/ci.sh site --mode prod --url-prefix /
+
+# Development build with preview
+./scripts/ci.sh site --mode dev --url-prefix /dev/ --version edge --preview
+
+# Clean then build with custom version
+./scripts/ci.sh site --clean --version 1.8.0
+```
+
+---
+
+### ci.sh qa - Code Quality Checks
+
+Checks and fixes code formatting using clang-format and runs shellcheck on shell scripts.
+
+**Usage:**
+```bash
+./scripts/ci.sh qa [OPTIONS]
+```
+
+**Options:**
+- `--check` Check formatting only (default)
+- `--fix` Apply formatting in place
+- `--format` Run only format checks
+- `--shellcheck` Run shellcheck on shell scripts in scripts/ directory
+- `--all` Future hook to run all QA checks (current implementation runs formatting + shellcheck)
+- `--source <dir>` Source directory for formatting checks (default: main)
+- `--extensions <list>` File extensions for formatting (comma-separated, default: h,ino,cpp)
+- `--clang-format-version <ver>` clang-format version to use (default: 9)
+- `--verbose` Verbose output
+- `--help` Show help
+
+**Execution Flow:**
+```
+ci.sh qa --check --source main --extensions h,ino
+  │
+  ├─> ci_qa.sh (orchestrator)
+  │     ├─> check_clang_format() - Find clang-format-9 or clang-format
+  │     │     ├─> find_files() - Locate files matching extensions in source dir
+  │     │     └─> check_formatting() - Run clang-format --dry-run --Werror
+  │     │           └─> Report files with formatting issues
+  │     │
+  │     └─> shellcheck_check() - Find and scan shell scripts
+  │           ├─> find_shell_scripts() - Locate *.sh files in scripts/ directory
+  │           └─> run_shellcheck() - Run shellcheck on found scripts
+  │                 └─> Report shell script issues
+  │
+  └─> Exit code: 0 (pass) or 1 (issues found)
+```
+
+**Examples:**
+```bash
+# Check both formatting and shellcheck (default)
+./scripts/ci.sh qa --check
+
+# Fix formatting automatically
+./scripts/ci.sh qa --fix
+
+# Check only formatting for specific directory
+./scripts/ci.sh qa --check --format --source lib
+
+# Check only .h and .ino files
+./scripts/ci.sh qa --check --extensions h,ino
+
+# Check only shellcheck for shell scripts
+./scripts/ci.sh qa --check --shellcheck
+
+# Check with verbose output
+./scripts/ci.sh qa --check --verbose
+
+# Use different clang-format version
+./scripts/ci.sh qa --check --clang-format-version 11
+```
+
+**Required Tools:**
+- clang-format (version specified, default: 9)
+  - Install: `sudo apt-get install clang-format-9`
+- shellcheck (for shell script linting)
+  - Install: `sudo apt-get install shellcheck`
+
+**Output:**
+- Check mode: Lists files with formatting issues and shell script errors, shows diffs
+- Fix mode: Modifies formatting in-place and reports changes
+- Exit code 0: All checks passed (proper formatting and no shellcheck errors)
+- Exit code 1: Issues found (formatting or shellcheck violations)
+
+---
+
+### ci.sh security - Security Vulnerability Scan
+
+Scans the project for security vulnerabilities using Trivy and generates Software Bill of Materials (SBOM).
+
+**Usage:**
+```bash
+./scripts/ci.sh security [OPTIONS]
+```
+
+**Options:**
+- `--scan-type <fs|config|image>` Type of scan (default: fs)
+  - `fs` - Filesystem scan (default, scans for vulnerabilities and misconfigurations)
+  - `config` - Configuration scan only
+  - `image` - Container image scan
+- `--severity <levels>` Severity levels to report (comma-separated: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default: HIGH,CRITICAL)
+- `--scan-path <path>` Path to scan (default: current directory `.`)
+- `--generate-sbom` Generate Software Bill of Materials in CycloneDX and SPDX formats (default: true)
+- `--exit-code <0|1>` Exit code when vulnerabilities found (0=continue, 1=fail) (default: 0)
+- `--upload-to-security-tab` Upload SARIF report to GitHub Security tab (GitHub Actions only, default: true)
+- `--verbose` Verbose output
+- `--help` Show help
+
+**Behavior:**
+- Installs Trivy if not present
+- Scans filesystem or configuration for known vulnerabilities
+- Generates multiple report formats: SARIF, JSON, table summary
+- Creates SBOM in CycloneDX and SPDX formats when `--generate-sbom` is enabled
+- Reports are saved to `generated/reports/` directory
+- Summary is appended to GitHub job summary when running in GitHub Actions
+- Uploads SARIF to GitHub Security tab for dashboard visibility
+
+**Output Structure:**
+```
+generated/reports/
+├── trivy-results.sarif         # SARIF format (for GitHub Security tab)
+├── trivy-results.json          # JSON format (detailed results)
+├── security-summary.md         # Markdown summary
+└── sbom/
+    ├── sbom.cyclonedx.json     # CycloneDX format
+    └── sbom.spdx.json          # SPDX format
+```
+
+**Examples:**
+```bash
+# Scan filesystem for HIGH and CRITICAL vulnerabilities
+./scripts/ci.sh security --scan-type fs --severity HIGH,CRITICAL
+
+# Full scan with all severity levels and SBOM generation
+./scripts/ci.sh security --scan-type fs --severity UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL --generate-sbom
+
+# Scan specific path with verbose output
+./scripts/ci.sh security --scan-path ./lib --verbose
+
+# Configuration scan only
+./scripts/ci.sh security --scan-type config
+
+# Scan and fail on vulnerabilities
+./scripts/ci.sh security --exit-code 1
+```
+
+**Required Tools:**
+- Trivy (vulnerability scanner)
+  - Install: `wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -` && `echo "deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main" | sudo tee -a /etc/apt/sources.list.d/trivy.list` && `sudo apt-get update && sudo apt-get install -y trivy`
+
+**Output:**
+- Detailed SARIF and JSON reports for integration with tools
+- Human-readable Markdown summary with findings count
+- SBOM artifacts for supply chain tracking
+- GitHub Security tab integration when in GitHub Actions
+- Exit code 0: Scan completed (vulnerabilities may have been found)
+- Exit code 1: Scan failed or critical vulnerabilities found (only if `--exit-code 1`)
+
+---
+
+### ci.sh all - Complete Pipeline
+
+Runs the complete CI/CD pipeline (qa → build all environments → site) with mode injected to all steps.
+
+**Usage:**
+```bash
+./scripts/ci.sh all --mode <dev|prod> [--preview]
+```
+
+**Required Options:**
+- `--mode <dev|prod>` Build mode (required). Injected to all pipeline steps:
+  - `qa`: Always runs `--check`
+  - `build`: Passes mode to all PlatformIO environments (dev enables OTA flags)
+  - `site`: Passes mode for documentation generation
+
+**Optional Options:**
+- `--preview` Start local HTTPS preview server at https://localhost:8443 after building the site
+- `--help` Show help
+
+**Behavior:**
+- No environment argument needed; builds **all** available environments
+- All three steps (qa, build, site) receive the same `--mode` value
+- If any step fails, the pipeline aborts
+- Site build warnings do not abort the pipeline (continues with success status)
+
+**Execution Flow:**
+```
+ci.sh all --mode dev --preview
+  │
+  ├─> Step 1: ci_qa.sh --check
+  │     └─> Exit on failure
+  │
+  ├─> Step 2: ci_build.sh --mode dev (builds all environments)
+  │     └─> Exit on failure
+  │
+  └─> Step 3: ci_site.sh --mode dev --preview
+        ├─> Build documentation
+        └─> Start preview server at https://localhost:8443
+```
+
+**Examples:**
+```bash
+# Complete pipeline in dev mode
+./scripts/ci.sh all --mode dev
+
+# Complete pipeline in prod mode with site preview
+./scripts/ci.sh all --mode prod --preview
+
+# Help for this command
+./scripts/ci.sh all --help
+```
+
+**Output:**
+- Step-by-step progress messages for each pipeline phase
+- Final summary showing mode, preview status, duration, and overall status
+- Exit code 0: All steps successful
+- Exit code 1: Any step failed
+
+---
+
+### ci.sh list-env - List Environments
+
+Lists PlatformIO environments available to build.
+
+**Usage:**
+```bash
+./scripts/ci.sh list-env [--full]
+```
+
+**Options:**
+- Default: read .github/workflows/environments.json (requires jq) and show curated list.
+- `--full` Parse platformio.ini and environments.ini for an exhaustive list (skips *-test and *-all-).
+- `--help` Show help.
+
+**Examples:**
+```bash
+./scripts/ci.sh list-env
+./scripts/ci.sh list-env --full
+```
+
+---
+
+## Internal Scripts
+
+These scripts are called by the main orchestrators. They can be run directly for troubleshooting, but the preferred entrypoints are the ci.sh commands.
+
+### ci_list-env.sh
+
+Lists PlatformIO environments for OpenMQTTGateway.
+
+**Called By:** `ci.sh list-env` or direct call
+
+**Usage:**
+```bash
+./scripts/ci_list-env.sh [--full]
+```
+
+**Options:**
+- Default: read .github/workflows/environments.json for a curated list (needs jq)
+- `--full` - Parse platformio.ini and environments.ini for all envs except *-test and *-all-
+- `-h|--help` - Show help
+
+**Output:**
+- Shows sorted environments in columns and prints the total count
+
+**Examples:**
+```bash
+./scripts/ci_list-env.sh
+./scripts/ci_list-env.sh --full
+```
+
+### ci_build_firmware.sh
+
+Executes PlatformIO build for specified environment.
+
+**Called By:** `ci_build.sh`
+
+**Usage:**
+```bash
+./scripts/ci_build_firmware.sh <environment> [OPTIONS]
+```
+
+**Arguments:**
+- `<environment>` - PlatformIO environment name
+
+**Options:**
+- `--version <tag>` - Set OMG_VERSION for the build (passed through from ci_build.sh)
+- `--dev-ota` - Enable development OTA (sets PLATFORMIO_BUILD_FLAGS)
+- `--clean` - Clean before build
+- `--verbose` - Verbose PlatformIO output
+- `--no-verify` - Skip artifact verification after build
+
+**Environment Variables Set:**
+- `PYTHONIOENCODING=utf-8`
+- `PYTHONUTF8=1`
+- `PLATFORMIO_BUILD_FLAGS="-DDEVELOPMENTOTA=true"` (when --dev-ota)
+- `OMG_VERSION` (when --version is provided)
+
+**PlatformIO Command:**
+```bash
+platformio run -e <environment> [--verbose]
+```
+
+**Output Location:**
+- `.pio/build/<environment>/firmware.bin`
+- `.pio/build/<environment>/bootloader.bin` (ESP32 only)
+- `.pio/build/<environment>/partitions.bin` (ESP32 only)
+
+---
+
+### ci_prepare_artifacts.sh
+
+Packages firmware binaries and libraries from a PlatformIO build directory; can also only create source archive when no environment is provided.
+
+**Called By:** `ci_build.sh`
+
+**Usage:**
+```bash
+./scripts/ci_prepare_artifacts.sh <environment> [OPTIONS]
+```
+
+**Arguments:**
+- `<environment>` - PlatformIO environment name (optional; if omitted only source archive is created)
+
+**Options:**
+- `--output <dir>` Output directory (default: generated/artifacts)
+- `--version <tag>` Append a version subfolder inside the output directory
+- `--clean` Clean output directory before writing
+- `--help` Show help
+
+**Behavior:**
+- If `version` is provided, outputs go to `<output>/<version>/firmware_build/`; otherwise to `<output>/firmware_build/`.
+- With an environment: copies and renames firmware.bin/partitions.bin/bootloader.bin/boot_app0.bin to `<env>-*.bin`, then zips libraries for that env into `*-libraries.tgz`.
+- Without an environment: only creates `OpenMQTTGateway_sources.tgz` from `main` and `LICENSE.txt`.
+- Lists the prepared artifacts and their sizes at the end.
+
+---
+
+### ci_00_config.sh
+
+Shared configuration and helper functions for all CI scripts.
+
+**Sourced By:** All ci_*.sh scripts
+
+**Provides:**
+- Color codes for terminal output (BLUE, GREEN, RED, YELLOW, NC)
+- Logging functions: `log_info()`, `log_warn()`, `log_error()`, `log_success()`
+- Path constants: `BUILD_DIR`, `ARTIFACTS_DIR`, `SITE_DIR`
+- Common utility functions
+
+**Constants Defined:**
+- `BUILD_DIR=".pio/build"` - PlatformIO build directory
+- `ARTIFACTS_DIR="generated/artifacts"` - Artifact output directory
+- `SITE_DIR="generated/site"` - Documentation output directory
+- `REPORTS_DIR="generated/reports"` - Security scan and quality reports directory
+
+**Logging Functions:**
+```bash
+log_info "message"    # Blue [INFO] prefix
+log_warn "message"    # Yellow [WARN] prefix
+log_error "message"   # Red [ERROR] prefix
+log_success "message" # Green [SUCCESS] prefix
+```
+
+---
+
+### ci_security.sh
+
+Performs security vulnerability scanning and Software Bill of Materials (SBOM) generation using Trivy.
+
+**Called By:** `ci.sh security`
+
+**Usage:**
+```bash
+./scripts/ci_security.sh [OPTIONS]
+```
+
+**Options:**
+- `--scan-type <fs|config|image>` Type of scan (default: fs)
+  - `fs` - Filesystem scan (default)
+  - `config` - Configuration scan
+  - `image` - Container image scan
+- `--severity <levels>` Severity levels (comma-separated: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default: HIGH,CRITICAL)
+- `--scan-path <path>` Path to scan (default: .)
+- `--generate-sbom` Generate SBOM (default: true)
+- `--exit-code <0|1>` Exit code behavior (0=continue, 1=fail) (default: 0)
+- `--upload-to-security-tab` Upload SARIF to GitHub (default: true)
+- `--verbose` Verbose output
+- `--help` Show help
+
+**Behavior:**
+- Ensures Trivy is installed via package manager
+- Creates `generated/reports/` directory structure
+- Runs Trivy with specified parameters
+- Generates SARIF, JSON, and table formats
+- Creates SBOM in CycloneDX and SPDX formats (when enabled)
+- Uploads SARIF to GitHub Security tab when `GITHUB_TOKEN` and `--upload-to-security-tab` are set
+- Appends summary to GitHub job summary if in GitHub Actions
+- Validates critical vulnerabilities and exits with code 1 if found and `--exit-code 1` is set
+
+**Output Files:**
+- `generated/reports/trivy-results.sarif` - SARIF format for GitHub integration
+- `generated/reports/trivy-results.json` - Full JSON results
+- `generated/reports/security-summary.md` - Human-readable summary
+- `generated/reports/sbom/sbom.cyclonedx.json` - CycloneDX SBOM
+- `generated/reports/sbom/sbom.spdx.json` - SPDX SBOM
+
+**Exit Codes:**
+- `0` - Success (vulnerabilities may have been found)
+- `1` - Scan failed, critical vulnerabilities found (only if `--exit-code 1`), or missing dependencies
+
+**Trivy Integration:**
+- Scans for known vulnerabilities in dependencies
+- Detects misconfigurations and insecure practices
+- Generates compliant SBOM artifacts
+- Provides detailed reporting in multiple formats
+
+**Example:**
+```bash
+# Scan filesystem with severity filter
+./scripts/ci_security.sh --scan-type fs --severity HIGH,CRITICAL
+
+# Local scan with SBOM and JSON output
+./scripts/ci_security.sh --scan-type fs --generate-sbom --verbose
+
+# In GitHub Actions with security tab upload
+./scripts/ci_security.sh --scan-type fs --severity HIGH,CRITICAL --upload-to-security-tab
+```
+
+---
+
+## Python Helper Scripts
+
+Legacy helper scripts are kept for compatibility; they are not called by the current ci_site.sh flow. Below the list:
+ - `generate_board_docs.py`
+ - `gen_wu.py`
+
+### generate_board_docs.py
+
+Auto-generates board-specific documentation pages from platformio.ini.
+
+**Called By:** Not invoked by current ci_site.sh (legacy helper)
+
+**Usage:**
+```bash
+python3 ./scripts/generate_board_docs.py
+```
+
+**Input:**
+- `platformio.ini` - Board configurations
+- `environments.ini` - Additional environments
+
+**Output:**
+- Markdown files in `docs/` directory for each board configuration
+
+**Purpose:**
+- Creates documentation pages for each hardware board
+- Extracts configuration details from PlatformIO environment definitions
+- Formats technical specifications and pin mappings
+
+---
+
+### gen_wu.py
+
+Generates WebUploader manifest for OTA firmware updates.
+
+**Called By:** Not invoked by current ci_site.sh (legacy helper)
+
+**Usage:**
+```bash
+python3 ./scripts/gen_wu.py [--dev] [repository]
+```
+
+**Arguments:**
+- `--dev` - Generate development manifest
+- `repository` - GitHub repository name (e.g., 1technophile/OpenMQTTGateway)
+
+**Input:**
+- `.pio/build/<env>/firmware.bin` - Compiled firmware files
+- `scripts/latest_version.json` or `scripts/latest_version_dev.json`
+
+**Output:**
+- WebUploader manifest JSON file in `docs/.vuepress/public/`
+
+**Purpose:**
+- Creates manifest for web-based firmware updater
+- Lists available firmware files with metadata
+- Used by documentation site for OTA updates
+
+---
+
+## Environment Variables
+
+Scripts respect these environment variables:
+
+- `CI`/`BUILD_NUMBER`/`GIT_COMMIT`: Used by ci_build.sh to auto-generate version when `--version` flag has no tag
+- `PYTHONIOENCODING=utf-8`, `PYTHONUTF8=1`: Python encoding settings set by ci_build_firmware.sh
+- `PLATFORMIO_BUILD_FLAGS`: Set to include development OTA flag when `--dev-ota` is used
+- `OMG_VERSION`: Set when `--version` is passed to ci_build.sh/ci_build_firmware.sh
+
+---
+
+## Exit Codes
+
+All scripts use standard exit codes:
+
+- `0` - Success
+- `1` - General error or failure
+- `2` - Missing required tools or dependencies
+
+Scripts use `set -euo pipefail` for strict error handling:
+- `-e` - Exit on error
+- `-u` - Exit on undefined variable
+- `-o pipefail` - Exit on pipe failure
+
+---
+
+## Environment Detection
+
+Scripts automatically detect if running in CI/CD:
+
+```bash
+if [[ "${CI:-false}" == "true" ]]; then
+    # Running in CI/CD
+    # Disable interactive prompts
+    # Use different output formatting
+fi
+```
+
+CI/CD environments typically set:
+- `CI=true`
+- `GITHUB_ACTIONS=true` (GitHub Actions)
+- `BUILD_NUMBER` (build number)
+- `GIT_COMMIT` (commit hash)
+
+---
+
+## GitHub Actions Workflows Integration
+
+The CI scripts integrate with GitHub Actions workflows in `.github/workflows/`:
+
+### task-lint.yml
+- Reusable workflow that runs `ci.sh qa --check`
+- Installs clang-format and shellcheck
+- Validates code formatting and shell script quality
+- Can be called with custom source directory and file extensions
+
+### task-build.yml
+- Main build workflow orchestrator
+- Calls task-lint.yml for code quality checks
+- Calls task-security-scan.yml for vulnerability scanning
+- Builds firmware for all or specified environments
+- Prepares and uploads build artifacts
+- Supports matrix builds for multiple environments
+- Manages build artifact retention
+
+### task-security-scan.yml
+- Reusable security scanning workflow
+- Installs Trivy vulnerability scanner
+- Calls `ci_security.sh` with configurable parameters
+- Generates SARIF, JSON, and SBOM reports
+- Uploads SARIF to GitHub Security tab for code scanning dashboard
+- Fails build on critical vulnerabilities when configured
+- Uploads SBOM artifacts for supply chain tracking
+
+### security-scan.yml
+- Scheduled security scanning (runs weekly by default)
+- Triggered manually with input parameters
+- Allows filtering by severity level
+- Configurable exit behavior (fail or continue)
+- Optional SBOM generation and upload
+
+**Workflow Dependencies:**
+```
+task-build.yml
+├─> task-lint.yml (linting)
+├─> task-security-scan.yml (security scanning)
+└─> Build environment matrix (firmware compilation)
+```
+
+**Key Features:**
+- Parallel linting and security scans
+- Artifact retention policies
+- GitHub Security tab integration
+- Detailed build reports
+- SBOM generation for compliance
+- Support for custom build parameters
+
+---
+
+This documentation reflects the current implementation of CI/CD scripts. All scripts are located in `./scripts/` directory.
+
+For GitHub Actions workflow documentation, see `.github/workflows/README.md`.
diff --git a/scripts/add_c_flags.py b/scripts/add_c_flags.py
new file mode 100644
index 0000000..f9a7f21
--- /dev/null
+++ b/scripts/add_c_flags.py
@@ -0,0 +1,10 @@
+# Adds compiler flags to suppress warnings during PlatformIO build
+# Used by: PlatformIO environments (esp32dev-pilight*, esp32-m5stick-c*)
+Import("env")
+
+
+# General options that are passed to the C++ compiler
+env.Append(CXXFLAGS=["-Wno-volatile"])
+
+# General options that are passed to the C compiler (C only; not C++).
+env.Append(CFLAGS=["-Wno-implicit-function-declaration"])
diff --git a/scripts/add_mlongcalls.py b/scripts/add_mlongcalls.py
new file mode 100644
index 0000000..b63a4a1
--- /dev/null
+++ b/scripts/add_mlongcalls.py
@@ -0,0 +1,16 @@
+# Apply -mlongcalls to the whole build (project sources + lib_deps) on Xtensa
+# ESP32 targets. The precompiled esp32-arduino-libs only inject -mlongcalls into
+# the framework compile, not into lib_deps (NimBLE, ArduinoJson) or project
+# sources. For large images (OMG is ~90% of a 2 MB partition on IDF 5.5.4 libs)
+# the resulting fixed-range call8 relocations overflow and the link fails with
+#   "dangerous relocation: call8: call target out of range".
+# RISC-V targets (esp32c*/h*/p4) have no call8 and reject -mlongcalls, so this is
+# restricted to the Xtensa MCUs. Guarded so nothing is duplicated.
+Import("env")
+
+mcu = env.BoardConfig().get("build.mcu", "")
+if mcu in ("esp32", "esp32s2", "esp32s3"):
+    if "-mlongcalls" not in env.get("CCFLAGS", []):
+        env.Append(CCFLAGS=["-mlongcalls"])
+    if "-mlongcalls" not in env.get("ASFLAGS", []):
+        env.Append(ASFLAGS=["-mlongcalls"])
diff --git a/scripts/ci.sh b/scripts/ci.sh
new file mode 100755
index 0000000..698484c
--- /dev/null
+++ b/scripts/ci.sh
@@ -0,0 +1,328 @@
+#!/bin/bash
+# CI/CD Main Entry Point - Command Dispatcher
+# Routes commands to specialized scripts for build, site, qa, and all
+# Usage: ./scripts/ci.sh <command> [OPTIONS]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+readonly SCRIPT_DIR
+
+
+# Load shared configuration (colors, logging functions, paths)
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Function to print banner
+print_banner() {
+    echo "╔════════════════════════════════════════╗"
+    echo "║   OpenMQTTGateway CI/CD Pipeline       ║"
+    echo "╚════════════════════════════════════════╝"
+    echo ""
+}
+
+# Show usage
+usage() {
+    cat << EOF
+Usage: $0 <command> [OPTIONS]
+
+OpenMQTTGateway CI/CD Pipeline - Main Entry Point
+
+Commands:
+    build       Build firmware for specified environment
+    site        Build and deploy documentation/website
+    qa          Run quality assurance checks (linting, formatting)
+    security    Run security vulnerability scan using Trivy
+    all         Run complete pipeline (qa + build + site)
+    list-env    List available environments for building firmware
+
+Examples:
+    # Build firmware
+    $0 build esp32dev-all-test --mode dev
+    $0 build esp32dev-bt --version v1.8.0 --deploy-ready
+
+    # Build and deploy documentation
+    $0 site --mode prod --deploy
+    $0 site --mode dev --preview
+
+    # Run quality checks
+    $0 qa --check
+    $0 qa --fix
+
+    # Run security scan
+    $0 security
+    $0 security --scan-type config --exit-code 1
+    $0 security --severity UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+
+    # Run complete pipeline (all envs, mode required)
+    $0 all --mode dev
+    $0 all --mode prod --preview
+    $0 all --mode dev -e esp32dev-bt
+
+    # List available environments
+    $0 list-env
+
+Get help for specific commands:
+    $0 build --help
+    $0 site --help
+    $0 qa --help
+    $0 security --help
+    $0 list-env --help
+
+EOF
+    exit 0
+}
+
+
+
+# Function to get list of environments to build
+# Uses ci_list-env.sh (no parameters) and returns one env per line
+get_environments() {
+    # Run the curated list script and normalize output
+    "${SCRIPT_DIR}/ci_list-env.sh" \
+        | sed -r 's/\x1B\[[0-9;]*[mK]//g' \
+        | tr '\t ' '\n' \
+        | sed '/^\s*$/d' \
+        | grep -E '^[A-Za-z0-9._-]+$' \
+        | sort -u
+}
+
+# Function to run complete pipeline using the underlying scripts
+# Usage: run_all_pipeline --mode <dev|prod> [--preview]
+run_all_pipeline() {
+    local start_time
+    start_time=$(date +%s)
+
+    local mode=""
+    local preview=false
+    local env_override=""
+    local version=""
+    local do_clean=false
+
+    # Parse arguments
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --mode)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--mode requires an argument (dev or prod)"
+                    return 1
+                fi
+                mode="$2"
+                if [[ "$mode" != "dev" && "$mode" != "prod" ]]; then
+                    log_error "Invalid mode: $mode. Must be 'dev' or 'prod'"
+                    return 1
+                fi
+                shift 2
+                ;;
+            --clean)
+                do_clean=true
+                shift
+                ;;
+            --preview)
+                preview=true
+                shift
+                ;;
+            -e|--env)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "-e|--env requires an environment name"
+                    return 1
+                fi
+                env_override="$2"
+                shift 2
+                ;;
+            -v|--version)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "-v|--version requires a version string"
+                    return 1
+                fi
+                version="$2"
+                shift 2
+                ;;
+            --help|-h)
+                echo "Usage: $0 all --mode <dev|prod> [--preview]"
+                echo ""
+                echo "Options:"
+                echo "  --mode <dev|prod>  Build mode (required)"
+                echo "  --preview          Optional Show site in local at http://localhost:8443"
+                echo "  -e, --env <name>   Optional Build only the specified environment"
+                return 0
+                ;;
+            *)
+                log_error "Unknown option: $1"
+                return 1
+                ;;
+        esac
+    done
+
+    # Validate mode is provided
+    if [[ -z "$mode" ]]; then
+        log_error "--mode is required. Usage: $0 all --mode <dev|prod> [--preview]"
+        return 1
+    fi
+
+    log_info "Starting complete CI/CD pipeline (mode: $mode, preview: $preview)..."
+    echo ""
+
+    # Step 1: Quality Assurance
+    log_info "═══ Step 1/3: Quality Assurance ═══"
+    log_info "RUN: ---> ${SCRIPT_DIR}/ci_qa.sh --check"
+    if ! "${SCRIPT_DIR}/ci_qa.sh" --check; then
+        log_error "QA checks failed. Pipeline aborted."
+        return 1
+    fi
+    echo ""
+
+    # Step 2: Build Firmware
+    log_info "═══ Step 2/3: Build Firmware ═══"
+    
+    # Get list of environments
+    local -a environments
+    if [[ -n "$env_override" ]]; then
+        log_info "Using single environment override: $env_override"
+        environments=("$env_override")
+    else
+        mapfile -t environments < <(get_environments)
+    fi
+    
+    if [[ ${#environments[@]} -eq 0 ]]; then
+        log_error "No environments found to build"
+        return 1
+    fi
+    
+    log_info "Found ${#environments[@]} environments to build"
+    echo ""
+    
+    local build_count=0
+    local failed_builds=()
+    local build_args=()
+
+    if [[ -n "$version" ]]; then
+        build_args+=("--version" "$version")
+        log_info "Using version override: $version"
+    fi
+    build_args+=("--mode" "$mode")
+    build_args+=("--deploy-ready")
+    if [[ "$do_clean" == true ]]; then
+        build_args+=("--clean")
+    fi
+
+    for env in "${environments[@]}"; do
+        ((++build_count))
+        log_info "[$build_count/${#environments[@]}] Building: $env"
+        
+        set +e
+        log_info "RUN: ---> ${SCRIPT_DIR}/ci_build.sh" "$env" "${build_args[@]}"
+        "${SCRIPT_DIR}/ci_build.sh" "$env" "${build_args[@]}"
+        local rc=$?
+        set -e
+        if [[ $rc -ne 0 ]]; then
+            log_error "Build failed for environment: $env"
+            failed_builds+=("$env")
+        fi
+    done
+    
+    echo ""
+    if [[ ${#failed_builds[@]} -gt 0 ]]; then
+        log_error "Build failed for ${#failed_builds[@]} environment(s):"
+        printf '  - %s\n' "${failed_builds[@]}"
+        return 1
+    fi
+    
+    log_success "All environments built successfully (${#environments[@]} total)"
+    echo ""
+
+    # Step 3: Build Site
+    log_info "═══ Step 3/3: Build Documentation ═══"
+    local site_args=("--mode" "$mode")
+    if [[ "$preview" == true ]]; then
+        site_args+=("--preview")
+    fi
+    if [[ -n "$version" ]]; then
+        site_args+=("--version" "$version")
+    fi
+    if [[ "$do_clean" == true ]]; then
+        site_args+=("--clean")
+    fi
+    
+    log_info "RUN: --->${SCRIPT_DIR}/ci_site.sh" "${site_args[@]}"
+    if ! "${SCRIPT_DIR}/ci_site.sh" "${site_args[@]}"; then
+        log_warn "Site build failed, but continuing..."
+    fi
+    echo ""
+
+    local end_time
+    end_time=$(date +%s)
+    local duration=$((end_time - start_time))
+
+    echo ""
+    echo "╔════════════════════════════════════════╗"
+    echo "║     Complete Pipeline Summary          ║"
+    echo "╚════════════════════════════════════════╝"
+    echo "  Mode: $mode"
+    echo "  Preview: $preview"
+    echo "  Total Duration: ${duration}s"
+    echo "  Status: SUCCESS ✓"
+    echo "╚════════════════════════════════════════╝"
+}
+
+# Main execution
+main() {
+    # Check if no arguments provided
+    if [[ $# -eq 0 ]]; then
+        print_banner
+        usage
+    fi
+    
+    # Get command
+    local command="$1"
+    shift || true
+    
+    # Handle help flags
+    if [[ "$command" == "--help" || "$command" == "-h" ]]; then
+        print_banner
+        usage
+    fi
+    
+    print_banner
+    
+    # Route to appropriate pipeline
+    case "$command" in
+        build)
+            log_info "Executing build pipeline..."
+            "${SCRIPT_DIR}/ci_build.sh" "$@"
+            ;;
+        site|docs)
+            log_info "Executing site pipeline..."
+            "${SCRIPT_DIR}/ci_site.sh" "$@"
+            ;;
+        qa|lint)
+            log_info "Executing QA pipeline..."
+            "${SCRIPT_DIR}/ci_qa.sh" "$@"
+            ;;
+        security)
+            log_info "Executing security scan..."
+            "${SCRIPT_DIR}/ci_security.sh" "$@"
+            ;;
+        list-env)
+            log_info "Executing list-env pipeline..."
+            "${SCRIPT_DIR}/ci_list-env.sh" "$@"
+            ;;
+
+        all|pipeline)
+            run_all_pipeline "$@"
+            ;;
+        *)
+            log_error "Unknown command: $command"
+            echo ""
+            usage
+            ;;
+    esac
+}
+
+# Execute main function
+main "$@"
diff --git a/scripts/ci_00_config.sh b/scripts/ci_00_config.sh
new file mode 100755
index 0000000..a29e1cc
--- /dev/null
+++ b/scripts/ci_00_config.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# shellcheck disable=SC2034
+# Build Scripts Configuration
+# Used by: All build scripts for centralized configuration
+
+# Centralized Output Directory Structure
+# All CI/CD generated files go under generated/
+ARTIFACTS_DIR="generated/artifacts"
+SITE_DIR="generated/site"
+REPORTS_DIR="generated/reports"
+
+# PlatformIO Directory Configuration
+BUILD_DIR=".pio/build"
+
+# ============================================================================
+# Colors - ANSI color codes for terminal output
+# ============================================================================
+readonly RED='\033[0;31m'
+readonly GREEN='\033[0;32m'
+readonly YELLOW='\033[1;33m'
+readonly BLUE='\033[0;34m'
+readonly NC='\033[0m'  # No Color
+
+# ============================================================================
+# Logging Functions - Standardized logging across all build scripts
+# ============================================================================
+log_info() { echo -e "${GREEN}[INFO]${NC} $*" >&2; }
+log_warn() { echo -e "${YELLOW}[WARN]${NC} $*" >&2; }
+log_error() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}[SUCCESS]${NC} $*" >&2; }
+log_step() { echo -e "${BLUE}[STEP]${NC} $*" >&2; }
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
new file mode 100755
index 0000000..9a0e970
--- /dev/null
+++ b/scripts/ci_build.sh
@@ -0,0 +1,359 @@
+#!/bin/bash
+# CI/CD agnostic wrapper for complete build pipeline
+# Orchestrates all build scripts with a single command
+# Usage: ./scripts/ci.sh <environment> [OPTIONS]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+
+# Load shared configuration (colors, logging functions, paths)
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Function to print banner
+print_banner() {
+    echo "╔════════════════════════════════════════╗"
+    echo "║   OpenMQTTGateway CI/CD Build          ║"
+    echo "╚════════════════════════════════════════╝"
+    echo ""
+}
+
+# Function to print summary
+print_summary() {
+    local env="$1"
+    local version="$2"
+    local start_time="$3"
+    local end_time
+    end_time=$(date +%s)
+    local duration=$((end_time - start_time))
+    
+    echo ""
+    echo "╔════════════════════════════════════════╗"
+    echo "║          Build Summary                 ║"
+    echo "╚════════════════════════════════════════╝"
+    echo "  Environment: $env"
+    echo "  Version: $version"
+    echo "  Duration: ${duration}s"
+    echo "  Status: SUCCESS ✓"
+    echo "╚════════════════════════════════════════╝"
+}
+
+# Function to check if command exists
+command_exists() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+# Function to get command version
+get_command_version() {
+    local cmd="$1"
+    case "$cmd" in
+        platformio)
+            platformio --version 2>&1 | head -n1 | grep -oP '\d+\.\d+\.\d+' || echo "unknown"
+            ;;
+        python|python3)
+            python3 --version 2>&1 | grep -oP '\d+\.\d+' || echo "unknown"
+            ;;
+        *)
+            echo "unknown"
+            ;;
+    esac
+}
+
+# Function to verify required tools
+verify_build_tools() {
+    log_info "Verifying required build tools..."
+    
+    local missing_tools=()
+    
+    # Check Python
+    if ! command_exists python3; then
+        missing_tools+=("python3")
+    else
+        local python_version
+        python_version=$(get_command_version python3)
+        log_info "✓ Python ${python_version} found"
+    fi
+    
+    # Check PlatformIO
+    if ! command_exists platformio; then
+        missing_tools+=("platformio")
+    else
+        local pio_version
+        pio_version=$(get_command_version platformio)
+        log_info "✓ PlatformIO ${pio_version} found"
+    fi
+    
+    # Check git (for version auto-generation)
+    if ! command_exists git; then
+        log_warn "git not found (optional, but recommended)"
+    else
+        log_info "✓ git found"
+    fi
+    
+    # Report missing tools
+    if [[ ${#missing_tools[@]} -gt 0 ]]; then
+        log_error "Missing required tools: ${missing_tools[*]}"
+        log_error ""
+        log_error "Please install missing tools:"
+        for tool in "${missing_tools[@]}"; do
+            case "$tool" in
+                python3)
+                    log_error "  - Python 3: https://www.python.org/downloads/"
+                    ;;
+                platformio)
+                    log_error "  - PlatformIO: pip3 install platformio"
+                    log_error "    or: pip3 install ${PLATFORMIO_VERSION:-platformio}"
+                    ;;
+            esac
+        done
+        log_error ""
+        log_error "Or skip this check with: --skip-verification"
+        return 1
+    fi
+    
+    log_info "All required tools are available"
+    return 0
+}
+
+# Function to cleanup on error
+cleanup_on_error() {
+    log_error "Build failed, cleaning up..."
+    # Restore any backups
+    find . -name "*.bak" -type f -exec bash -c 'mv "$1" "${1%.bak}"' _ {} \; 2>/dev/null || true
+}
+
+# Show usage
+usage() {
+    cat << EOF
+Usage: $0 <environment> [OPTIONS]
+
+Complete CI/CD build pipeline wrapper.
+
+Arguments:
+    environment     PlatformIO environment name
+
+Options:
+    --mode MODE            Build mode: 'prod' or 'dev' [default: prod]
+                           'dev' enables OTA and development features
+    --deploy-ready         Prepare for deployment (renamed artifacts)
+    --version [TAG]        Set version tag (if TAG omitted, auto-generated)
+    --output DIR           Output directory for artifacts [default: generated/artifacts/]
+    --skip-verification    Skip build tools verification
+    --clean                Clean build before starting
+    --verbose              Enable verbose output
+    --help                 Show this help message
+
+Environment Variables:
+    CI              Set to 'true' in CI/CD environments
+    BUILD_NUMBER    Build number from CI/CD
+    GIT_COMMIT      Git commit hash for versioning
+
+Examples:
+    # Local development build
+    $0 esp32dev-all-test --mode dev
+
+    # Production release build
+    $0 esp32dev-bt --version v1.7.0 --mode prod --deploy-ready
+
+    # CI/CD build (auto-detects version)
+    $0 theengs-bridge --version --mode dev
+
+EOF
+}
+
+# Main pipeline
+main() {
+    local environment=""
+    local version=""
+    local set_version=false
+    local mode=""
+    local prepare_for_deploy=false
+    local output_dir=""
+    local skip_verification=false
+    local clean=false
+    local verbose=false
+    
+    # Parse arguments
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --version)
+                set_version=true
+                # Check if next argument is a version tag or another option
+                if [[ $# -gt 1 && ! "$2" =~ ^-- ]]; then
+                    version="$2"
+                    shift 2
+                else
+                    shift
+                fi
+                ;;
+            --mode)
+                if [[ $# -lt 2 ]]; then
+                    log_error "--mode requires an argument: 'prod' or 'dev'"
+                    usage
+                    exit 1
+                fi
+                if [[ "$2" != "prod" && "$2" != "dev" ]]; then
+                    log_error "Invalid mode: $2. Must be 'prod' or 'dev'"
+                    usage
+                    exit 1
+                fi
+                mode="$2"
+                shift 2
+                ;;
+            --deploy-ready)
+                prepare_for_deploy=true
+                shift
+                ;;
+            --output)
+                if [[ $# -lt 2 ]]; then
+                    log_error "--output requires a directory argument"
+                    usage
+                    exit 1
+                fi
+                output_dir="$2"
+                shift 2
+                ;;
+            --skip-verification)
+                skip_verification=true
+                shift
+                ;;
+            --clean)
+                clean=true
+                shift
+                ;;
+            --verbose)
+                verbose=true
+                shift
+                ;;
+            --help|-h)
+                usage
+                exit 0
+                ;;
+            -*)
+                log_error "Unknown option: $1"
+                usage
+                exit 1
+                ;;
+            *)
+                environment="$1"
+                shift
+                ;;
+        esac
+    done
+    
+    # Validate environment
+    if [[ -z "$environment" ]]; then
+        log_error "Environment name is required"
+        usage
+        exit 1
+    fi
+    
+    # Set default mode if not specified
+    if [[ -z "$mode" ]]; then
+        mode="prod"
+        log_info "Mode not specified, defaulting to production"
+    fi
+
+    
+    # Auto-generate version if --version flag is set but no tag provided
+    if [[ "$set_version" == "true" && -z "$version" ]]; then
+        if [[ "${CI:-false}" == "true" ]]; then
+            # CI/CD environment
+            version="${BUILD_NUMBER:-${GIT_COMMIT:-unknown}}"
+        else
+            # Local development
+            version="local-$(date +%Y%m%d-%H%M%S)"
+        fi
+        log_info "Auto-generated version: $version"
+    fi
+    
+    # Setup error handling
+    trap cleanup_on_error ERR
+    
+    # Change to project root
+    cd "$PROJECT_ROOT"
+    
+    # Start timer
+    local start_time
+    start_time=$(date +%s)
+    
+    # Print banner
+    print_banner
+    
+    # Step 1: Verify build tools
+    if [[ "$skip_verification" == "false" ]]; then
+        log_step "1/4 Verifying build tools..."
+        verify_build_tools || exit 1
+        echo ""
+    else
+        log_warn "Skipping build tools verification (--skip-verification)"
+        echo ""
+    fi
+    
+    # Step 2: Set version 
+    # not required
+
+    # Step 3: Build firmware
+    log_step "3/4 Building firmware for: $environment"
+    local build_opts=()
+    [[ "$mode" == "dev" ]] && build_opts+=(--dev-ota)
+    [[ "$clean" == "true" ]] && build_opts+=(--clean)
+    [[ "$verbose" == "true" ]] && build_opts+=(--verbose)
+    [[ "$set_version" == "true" ]] && build_opts+=(--version "$version")
+    
+    "${SCRIPT_DIR}/ci_build_firmware.sh" "$environment" "${build_opts[@]}" || exit 1
+    echo ""
+    
+    # Step 4: Prepare artifacts
+    log_step "4/4 Preparing artifacts..."
+
+    if [[ "$prepare_for_deploy" == "true" ]]; then
+        log_info "Preparing artifacts for deployment"
+        local artifact_opts=()
+        [[ "$clean" == "true" ]] && artifact_opts+=(--clean)
+        [[ -n "$output_dir" ]] && artifact_opts+=(--output "$output_dir")
+        [[ "$set_version" == "true" ]] && artifact_opts+=(--version "$version")
+        "${SCRIPT_DIR}/ci_prepare_artifacts.sh" "$environment" "${artifact_opts[@]}" || exit 1
+        echo ""
+        # Check if site folder exists and copy built files to avoid rebuilding the site
+        if [[ "$mode" == "dev" ]]; then
+            local site_dir="${PROJECT_ROOT}/generated/site/dev"
+            local artifacts_dir="${output_dir:-${PROJECT_ROOT}/generated/artifacts/firmware_build}"
+            
+            if [[ -d "$site_dir" ]]; then
+                log_info "Site folder exists, copying built firmware files to site/dev..."
+                
+                # Copy firmware files for the current environment
+                for file in "${artifacts_dir}/${environment}"-*.bin "${artifacts_dir}/${environment}"-*.tgz; do
+                    if [[ -f "$file" ]]; then
+                        cp -v "$file" "$site_dir/" || log_warn "Failed to copy $(basename "$file")"
+                    fi
+                done
+                
+                log_info "✓ Firmware files copied to site/dev (no site rebuild needed)"
+            else
+                log_warn "Site folder not found at: $site_dir"
+                log_info "Run 'ci.sh site ' to generate it"
+            fi
+        fi
+    fi
+    
+    # Print summary
+    print_summary "$environment" "$version" "$start_time"
+    
+    log_info "✓ Complete build pipeline finished successfully"
+}
+
+# Run main if executed directly
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "$@"
+fi
diff --git a/scripts/ci_build_firmware.sh b/scripts/ci_build_firmware.sh
new file mode 100755
index 0000000..7e4d43f
--- /dev/null
+++ b/scripts/ci_build_firmware.sh
@@ -0,0 +1,294 @@
+#!/bin/bash
+# Builds firmware for specified PlatformIO environment
+# Used by: CI/CD pipelines and local development
+# Usage: ./build_firmware.sh <environment> [OPTIONS]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+
+# Load shared configuration (colors, logging functions, paths)
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Set absolute path for BUILD_DIR
+BUILD_DIR="${PROJECT_ROOT}/${BUILD_DIR}"
+
+# Script-specific logging function
+log_build() { echo -e "${BLUE}[BUILD]${NC} $*"; }
+
+# Function to validate environment name
+validate_environment() {
+    local env="$1"
+    
+    if [[ -z "$env" ]]; then
+        log_error "Environment name is required"
+        return 1
+    fi
+    
+    # Check if environment exists in platformio.ini or environments.ini
+    if ! grep -q "^\[env:${env}\]" "${PROJECT_ROOT}/platformio.ini" "${PROJECT_ROOT}/environments.ini" 2>/dev/null; then
+        log_warn "Environment '${env}' not found in configuration files"
+        log_warn "Proceeding anyway (PlatformIO will validate)"
+    fi
+    
+    log_info "Building environment: $env"
+}
+
+
+
+# Function to check PlatformIO availability
+check_platformio() {
+    if ! command -v platformio >/dev/null 2>&1; then
+        log_error "PlatformIO not found. Run setup_build_env.sh first"
+        return 1
+    fi
+}
+
+# Function to clean build artifacts
+clean_build() {
+    local env="$1"
+    local env_dir="${BUILD_DIR}/${env}"
+    
+    if [[ -d "$env_dir" ]]; then
+        log_info "Cleaning previous build artifacts for: $env"
+        rm -rf "$env_dir"
+    fi
+}
+
+# Function to run PlatformIO build
+run_build() {
+    local env="$1"
+    local clean="${2:-false}"
+    local verbose="${3:-false}"
+    local enable_dev_ota="${4:-false}"
+    local version="${5:-edge}"
+
+    if [[ "$enable_dev_ota" == "true" ]]; then
+        log_info "Development OTA enabled"
+         export PLATFORMIO_BUILD_FLAGS='"-DDEVELOPMENTOTA=true"'
+    fi
+
+    if [[ -n "$version" ]]; then
+        log_info "Setting firmware version to: $version"
+        export PLATFORMIO_BUILD_FLAGS="${PLATFORMIO_BUILD_FLAGS} -DOMG_VERSION=\\\"${version}\\\""
+    fi
+    
+    log_build "Starting build for environment: $env"
+    
+    local build_cmd="platformio run -e $env"
+    
+    if [[ "$clean" == "true" ]]; then
+        build_cmd="platformio run -e $env --target clean && $build_cmd"
+    fi
+    
+    if [[ "$verbose" == "true" ]]; then
+        build_cmd="$build_cmd --verbose"
+    fi
+    
+    # Execute build with timing
+    local start_time
+    start_time=$(date +%s)
+    
+    log_info  "PlatformIO Build Flags: $PLATFORMIO_BUILD_FLAGS"
+    log_info "Executing: $build_cmd"
+    
+    if eval "$build_cmd"; then
+        local end_time
+        end_time=$(date +%s)
+        local duration=$((end_time - start_time))
+        
+        log_build "Build completed successfully in ${duration}s"
+        return 0
+    else
+        log_error "Build failed for environment: $env"
+        return 1
+    fi
+}
+
+# Function to verify build artifacts
+verify_artifacts() {
+    local env="$1"
+    local env_dir="${BUILD_DIR}/${env}"
+    
+    log_info "Verifying build artifacts..."
+    
+    local artifacts_found=0
+    local firmware="${env_dir}/firmware.bin"
+    local partitions="${env_dir}/partitions.bin"
+    local bootloader="${env_dir}/bootloader.bin"
+    
+    if [[ -f "$firmware" ]]; then
+        local size
+        size=$(stat -f%z "$firmware" 2>/dev/null || stat -c%s "$firmware" 2>/dev/null)
+        log_info "✓ firmware.bin (${size} bytes)"
+        ((artifacts_found++))
+    else
+        log_warn "✗ firmware.bin not found"
+    fi
+    
+    if [[ -f "$partitions" ]]; then
+        log_info "✓ partitions.bin"
+        ((artifacts_found++))
+    fi
+    
+    if [[ -f "$bootloader" ]]; then
+        log_info "✓ bootloader.bin"
+        ((artifacts_found++))
+    fi
+    
+    if [[ $artifacts_found -eq 0 ]]; then
+        log_error "No build artifacts found"
+        return 1
+    fi
+    
+    log_info "Found ${artifacts_found} artifact(s)"
+}
+
+# Function to show build summary
+show_build_summary() {
+    local env="$1"
+    local env_dir="${BUILD_DIR}/${env}"
+    
+    echo ""
+    echo "═══════════════════════════════════════"
+    echo "  Build Summary: $env"
+    echo "═══════════════════════════════════════"
+    
+    if [[ -d "$env_dir" ]]; then
+        find "$env_dir" -name "*.bin" -o -name "*.elf" | while read -r file; do
+            local size
+            size=$(stat -f%z "$file" 2>/dev/null || stat -c%s "$file" 2>/dev/null)
+            local size_kb=$((size / 1024))
+            echo "  $(basename "$file"): ${size_kb} KB"
+        done
+    fi
+    
+    echo "═══════════════════════════════════════"
+}
+
+# Show usage
+usage() {
+    cat << EOF
+Usage: $0 <environment> [OPTIONS]
+
+Build firmware for a specific PlatformIO environment.
+
+Arguments:
+    environment     PlatformIO environment name (e.g., esp32dev-all-test)
+
+Options:
+    --dev-ota       Enable development OTA build flags
+    --clean         Clean build artifacts before building
+    --verbose       Enable verbose build output
+    --no-verify     Skip artifact verification
+    --version <ver> Set firmware version (default: edge)
+    --help          Show this help message
+
+Examples:
+    $0 esp32dev-all-test
+    $0 esp32dev-bt --dev-ota
+    $0 theengs-bridge --clean --verbose
+
+EOF
+}
+
+# Main execution
+main() {
+    local environment=""
+    local enable_dev_ota=false
+    local clean_build_flag=false
+    local verbose=false
+    local verify=true
+    local version="edge"
+    
+    # Parse arguments
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --version)
+                version="$2"
+                shift 2
+                ;;
+            --dev-ota)
+                enable_dev_ota=true
+                shift
+                ;;
+            --clean)
+                clean_build_flag=true
+                shift
+                ;;
+            --verbose)
+                verbose=true
+                shift
+                ;;
+            --no-verify)
+                verify=false
+                shift
+                ;;
+            --help|-h)
+                usage
+                exit 0
+                ;;
+            -*)
+                log_error "Unknown option: $1"
+                usage
+                exit 1
+                ;;
+            *)
+                environment="$1"
+                shift
+                ;;
+        esac
+    done
+    
+    # Validate inputs
+    if [[ -z "$environment" ]]; then
+        log_error "Environment name is required"
+        usage
+        exit 1
+    fi
+    
+    # Change to project root
+    cd "$PROJECT_ROOT"
+    
+    # Check prerequisites
+    check_platformio || exit 1
+    
+    # Validate environment
+    validate_environment "$environment" || exit 1
+    
+    # Setup build environment
+    export PYTHONIOENCODING=utf-8
+    export PYTHONUTF8=1
+    
+    # Clean if requested
+    if [[ "$clean_build_flag" == "true" ]]; then
+        clean_build "$environment"
+    fi
+    
+    # Run build
+    run_build "$environment" "$clean_build_flag" "$verbose" "$enable_dev_ota" "$version" || exit 1
+    
+    # Verify artifacts
+    if [[ "$verify" == "true" ]]; then
+        verify_artifacts "$environment" || exit 1
+    fi
+    
+    # Show summary
+    show_build_summary "$environment"
+    
+    log_info "Build process completed successfully"
+}
+
+# Run main if executed directly
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "$@"
+fi
diff --git a/scripts/ci_list-env.sh b/scripts/ci_list-env.sh
new file mode 100755
index 0000000..052f74d
--- /dev/null
+++ b/scripts/ci_list-env.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# Lists all available PlatformIO environments for OpenMQTTGateway
+# Usage: ./scripts/ci_list.sh [--full]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+
+# Load shared configuration (colors, logging functions, paths)
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+
+## use .github/workflows/environments.json to list environments
+list_environments_from_Json() {
+    local json_file="${PROJECT_ROOT}/.github/workflows/environments.json"
+    if [[ ! -f "$json_file" ]]; then
+        log_error "JSON file not found: $json_file"
+        return 1
+    fi
+
+    if ! command -v jq >/dev/null 2>&1; then
+        log_error "jq is required to read $json_file"
+        return 1
+    fi
+
+    log_info "Available PlatformIO environments from JSON:"
+    echo ""
+    local envs=()
+    while IFS= read -r env; do
+        # Skip test environments
+        if [[ ! "$env" =~ -test$ && ! "$env" =~ -all- ]]; then
+            envs+=("$env")
+        fi
+    done < <(jq -r '.environments.all[]? // empty' "$json_file")
+
+    # Sort and display unique environments
+    if [[ ${#envs[@]} -gt 0 ]]; then
+        printf '%s\n' "${envs[@]}" | sort -u | column -c 80
+    else
+        log_warn "No environments found in JSON file"
+    fi
+    echo ""
+    log_info "Total: $(printf '%s\n' "${envs[@]}" | sort -u | wc -l) environments"
+
+}
+
+
+list_environments() {
+    log_info "Available PlatformIO environments:"
+    echo ""
+    local env_files=("${PROJECT_ROOT}/platformio.ini" "${PROJECT_ROOT}/environments.ini")
+    local envs=()
+    for file in "${env_files[@]}"; do
+        if [[ -f "$file" ]]; then
+            while IFS= read -r line; do
+                if [[ "$line" =~ ^\[env:([^\]]+)\] ]]; then
+                    local env_name="${BASH_REMATCH[1]}"
+                    envs+=("$env_name")
+                fi
+            done < "$file"
+        fi
+    done
+    # Sort and display unique environments
+    if [[ ${#envs[@]} -gt 0 ]]; then
+        printf '%s\n' "${envs[@]}" | sort -u | column -c 80
+    else
+        log_warn "No environments found in configuration files"
+    fi
+    echo ""
+    log_info "Total: $(printf '%s\n' "${envs[@]}" | sort -u | wc -l) environments"
+}
+
+# Main execution
+usage() {
+    cat <<EOF
+Usage: ${0##*/} [--full]
+
+List available PlatformIO environments for OpenMQTTGateway.
+
+Options:
+  --full    Parse platformio.ini and environments.ini for an exhaustive list
+            (slower, includes all defined envs except *-test / *-all-)
+  (default) Use .github/workflows/environments.json (fast, curated list)
+
+Examples:
+  ${0##*/}          # quick, curated list
+  ${0##*/} --full   # exhaustive list from config files
+EOF
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    USE_FULL=false
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --full)
+                USE_FULL=true
+                shift
+                ;;
+            -h|--help)
+                usage
+                exit 0
+                ;;
+            *)
+                log_warn "Unknown option: $1"
+                usage
+                exit 1
+                ;;
+        esac
+    done
+
+    if [[ "$USE_FULL" == true ]]; then
+        list_environments
+    else
+        list_environments_from_Json
+    fi
+fi
diff --git a/scripts/ci_prepare_artifacts.sh b/scripts/ci_prepare_artifacts.sh
new file mode 100755
index 0000000..406c2d7
--- /dev/null
+++ b/scripts/ci_prepare_artifacts.sh
@@ -0,0 +1,292 @@
+#!/bin/bash
+# shellcheck disable=SC2015
+# Prepares firmware artifacts for upload or deployment
+# Used by: CI/CD pipelines for artifact packaging
+# Usage: ./prepare_artifacts.sh <environment> [OPTIONS]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+
+# Load shared configuration (colors, logging functions, paths)
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Set absolute paths
+BUILD_DIR="${PROJECT_ROOT}/${BUILD_DIR}"
+DEFAULT_OUTPUT_DIR="${PROJECT_ROOT}/${ARTIFACTS_DIR}"
+
+# Function to create output directory
+prepare_output_dir() {
+    local output_dir="$1"
+    local clean_flag="${2:-false}"
+    
+    if [[ -d "$output_dir" ]]; then
+        if [[ "$clean_flag" == "true" ]]; then
+            log_warn "Cleaning and recreating output directory: $output_dir"
+            rm -rf "$output_dir"
+            mkdir -p "$output_dir"
+        else
+            log_warn "Output directory already exists and will be reused: $output_dir"
+        fi
+    else
+        mkdir -p "$output_dir"
+        log_info "Created output directory: $output_dir"
+    fi
+}
+
+# Function to copy artifact with optional renaming
+copy_artifact() {
+    local source="$1"
+    local dest="$2"
+    local artifact_type="$3"
+    
+    if [[ ! -f "$source" ]]; then
+        log_warn "${artifact_type} not found: $source"
+        return 1
+    fi
+    
+    if cp "$source" "$dest"; then
+        local size
+        size=$(stat -f%z "$dest" 2>/dev/null || stat -c%s "$dest" 2>/dev/null)
+        local size_kb=$((size / 1024))
+        log_info "✓ Copied ${artifact_type}: $(basename "$dest") (${size_kb} KB)"
+        return 0
+    else
+        log_error "Failed to copy ${artifact_type}: $source"
+        return 1
+    fi
+}
+
+
+# Function to prepare deployment artifacts (with renaming)
+prepare_artifacts() {
+    local env="$1"
+    local output_dir="$2"
+    local env_dir="${BUILD_DIR}/${env}"
+    
+    log_info "Preparing firmware directory for: $env"
+    local copied=0
+    
+    # Copy and rename firmware.bin
+    if copy_artifact "${env_dir}/firmware.bin" "${output_dir}/${env}-firmware.bin" "firmware"; then
+        ((copied++))
+    fi
+    
+    # Copy and rename partitions.bin (optional)
+    copy_artifact "${env_dir}/partitions.bin" "${output_dir}/${env}-partitions.bin" "partitions" && ((copied++)) || true
+    
+    # Copy and rename bootloader.bin (optional)
+    copy_artifact "${env_dir}/bootloader.bin" "${output_dir}/${env}-bootloader.bin" "bootloader" && ((copied++)) || true
+    
+    # Copy boot_app0.bin if exists (ESP32 specific)
+    copy_artifact "${env_dir}/boot_app0.bin" "${output_dir}/${env}-boot_app0.bin" "boot_app0" && ((copied++)) || true
+    
+    if [[ $copied -eq 0 ]]; then
+        log_error "No artifacts were copied"
+        return 1
+    fi
+    
+    log_info "Copied ${copied} artifact(s) in deployment mode"
+}
+
+prepare_libraries() {
+    local env="$1"
+    local output_dir="$2"
+    local env_dir="${BUILD_DIR}/${env}"
+  
+    # Process libraries: create temp copy with renamed folders, zip, preserve originals
+    log_info "Processing libraries for environment: $env"
+    TEMP_LIBDEPS=$(mktemp -p "$output_dir" -d) || { echo "Failed to create temp directory"; return 1; }
+
+    cp -r .pio/libdeps/"$env" "$TEMP_LIBDEPS/" || { log_error "Failed to copy libdeps for $env"; return 1; }
+
+    (
+    cd "$TEMP_LIBDEPS"
+    log_step "Replace space by _ in folder names (temp copy only)"
+    find . -type d -name "* *" | while read -r FNAME; do 
+        mv "$FNAME" "${FNAME// /_}"
+    done
+    
+    log_step "Zipping libraries per board"
+    for i in */; do
+        tar -czf "${i%/}-libraries.tgz" "$i" > /dev/null
+    done
+    
+    mv ./*.tgz "${output_dir}"
+    )
+
+    rm -rf "$TEMP_LIBDEPS"
+    log_info "✓ Created library archives in: $output_dir"
+}
+
+prepare_sources() {
+    local output_dir="$1"
+    
+    log_info "Preparing source code archive"
+    
+    # Create and move sources tar.gz (newly generated, safe to move)
+    if tar -czf "${output_dir}/OpenMQTTGateway_sources.tgz" main LICENSE.txt > /dev/null; then
+        log_info "✓ Created source archive: OpenMQTTGateway_sources.tgz"
+    else
+        log_error "Failed to create source archive"
+        return 1
+    fi
+}
+
+
+
+
+
+
+
+
+# Function to list artifacts
+list_artifacts() {
+    local output_dir="$1"
+    
+    echo ""
+    echo "═══════════════════════════════════════"
+    echo "  Prepared Artifacts"
+    echo "═══════════════════════════════════════"
+    
+    if [[ -d "$output_dir" ]]; then
+        find "$output_dir" -type f | sort | while read -r file; do
+            local size
+            size=$(stat -f%z "$file" 2>/dev/null || stat -c%s "$file" 2>/dev/null)
+            local size_kb=$((size / 1024))
+            echo "  $(basename "$file"): ${size_kb} KB"
+        done
+    else
+        echo "  No artifacts found"
+    fi
+    
+    echo "═══════════════════════════════════════"
+}
+
+# Show usage
+usage() {
+    cat << EOF
+Usage: $0 <environment> [OPTIONS]
+
+Prepare artifacts for upload or deployment.
+
+Arguments:
+    environment     PlatformIO environment name, if omitted will be created source archive only. 
+
+Options:
+    --clean         Clean existing output directory before preparing artifacts
+    --output DIR    Output directory [default: generated/artifacts/]
+    --help          Show this help message
+
+Examples:
+    $0 esp32dev-all-test
+    $0 esp32dev-bt --deploy --manifest
+    $0 theengs-bridge --output build/artifacts --compress
+
+EOF
+}
+
+# Main execution
+main() {
+    local environment=""
+    local output_dir="$DEFAULT_OUTPUT_DIR"
+    local clean_flag=false
+    #local version=""   ## WILL BE USED WHEN THE VERSION ITSELF AFFECTS THE ARTIFACTS NAMING
+    
+    # Parse arguments
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --output)
+                output_dir="$2"
+                shift 2
+                ;;
+            -v|--version)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "-v|--version requires a version string"
+                    return 1
+                fi
+                #version="$2"
+                shift 2
+                ;;
+            --clean)
+                clean_flag=true
+                shift
+                ;;
+            --help|-h)
+                usage
+                exit 0
+                ;;
+            -*)
+                log_error "Unknown option: $1"
+                usage
+                exit 1
+                ;;
+            *)
+                environment="$1"
+                shift
+                ;;
+        esac
+    done
+    
+    # Change to project root
+    cd "$PROJECT_ROOT"
+
+    # TODO FOR NEXT STEP MULTI RELEASE: TAG, RC, edge
+    #if [[ -n "$version" ]]; then
+    #    # Sanitize version string for directory name
+    #    safe_version=$(echo "$version" | sed 's/[^a-zA-Z0-9._-]/_/g')
+    #    output_dir="${output_dir}/${safe_version}" 
+    #fi
+
+
+    # Validate inputs
+    if [[ -z "$environment" ]]; then
+        log_info "No environment specified, only preparing source archive"
+        
+        # Create output directory
+        prepare_output_dir "$output_dir" "$clean_flag"
+
+        # Prepare source code archive
+        prepare_sources "$output_dir" || exit 1
+    else
+        # Check if build directory exists
+        if [[ ! -d "${BUILD_DIR}/${environment}" ]]; then
+            log_error "Build directory not found for environment: $environment"
+            log_error "Run build_firmware.sh first"
+            exit 1
+        fi
+
+        #normalize output directory path
+        #output_dir="${output_dir}/firmware-${environment}"
+        output_dir="${output_dir}/firmware_build"
+
+
+        # Create output directory
+        prepare_output_dir "$output_dir" "$clean_flag"
+        
+        # Prepare artifacts based on mode
+        prepare_artifacts "$environment" "$output_dir" || exit 1
+
+        # Prepare libraries
+        prepare_libraries "$environment" "$output_dir" || exit 1        
+    fi
+    
+    # Show summary
+    list_artifacts "$output_dir"
+    
+    log_info "Artifact preparation completed successfully"
+}
+
+# Run main if executed directly
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "$@"
+fi
diff --git a/scripts/ci_qa.sh b/scripts/ci_qa.sh
new file mode 100755
index 0000000..267e3df
--- /dev/null
+++ b/scripts/ci_qa.sh
@@ -0,0 +1,474 @@
+#!/bin/bash
+# CI/CD Quality Assurance (QA) - Code Linting and Formatting
+# Checks and fixes code formatting using clang-format
+# Usage: ./scripts/ci_qa.sh [OPTIONS]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+
+# Load shared configuration
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Default values
+FIX_MODE=false
+FORMAT_ONLY=false
+SOURCE_DIR="main"
+EXTENSIONS="h,ino,cpp"
+CLANG_FORMAT_VERSION="9"
+VERBOSE=false
+
+# Function to check if clang-format is available
+check_clang_format() {
+    local version="$1"
+    local cmd="clang-format-${version}"
+    
+    if command -v "$cmd" >/dev/null 2>&1; then
+        echo "$cmd"
+        return 0
+    fi
+    
+    # Try without version suffix
+    if command -v clang-format >/dev/null 2>&1; then
+        echo "clang-format"
+        return 0
+    fi
+    
+    return 1
+}
+
+# Function to find files to check
+find_files() {
+    local source="$1"
+    local extensions="$2"
+    
+    if [[ ! -d "${PROJECT_ROOT}/${source}" ]]; then
+        return 1
+    fi
+    
+    local find_patterns=()
+    IFS=',' read -ra exts <<< "$extensions"
+    for ext in "${exts[@]}"; do
+        find_patterns+=(-name "*.${ext}" -o)
+    done
+    # Remove last -o
+    unset 'find_patterns[-1]'
+    
+    local files
+    files=$(find "${PROJECT_ROOT}/${source}" -type f \( "${find_patterns[@]}" \) 2>/dev/null || true)
+    
+    if [[ -z "$files" ]]; then
+        return 1
+    fi
+    
+    echo "$files"
+}
+
+# Function to check formatting
+check_formatting() {
+    local clang_format_cmd="$1"
+    local files="$2"
+    
+    log_info "Checking code formatting..."
+    
+    local failed_files=()
+    local checked_count=0
+    local has_issues=false
+    
+    while IFS= read -r file; do
+        if [[ -z "$file" ]]; then
+            continue
+        fi
+        
+        checked_count=$((checked_count + 1))
+        
+        if [[ "$VERBOSE" == true ]]; then
+            log_info "Checking: $file"
+        fi
+        
+        # Check if file needs formatting and capture diff
+        local diff_output
+        diff_output=$("$clang_format_cmd" --dry-run --Werror "$file" 2>&1)
+        local format_result=$?
+        
+        if [[ $format_result -ne 0 ]]; then
+            failed_files+=("$file")
+            has_issues=true
+            
+            # Show the actual formatting differences
+            echo ""
+            log_warn "⚠ Formatting issues in: $file"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            
+            # Generate and show diff with colors
+            local actual_diff
+            actual_diff=$(diff -u "$file" <("$clang_format_cmd" "$file") 2>/dev/null || true)
+            
+            if [[ -n "$actual_diff" ]]; then
+                echo "$actual_diff" | head -50 | while IFS= read -r line; do
+                    if [[ "$line" =~ ^-[^-] ]]; then
+                        echo -e "\033[31m$line\033[0m"  # Red for removed lines
+                    elif [[ "$line" =~ ^+[^+] ]]; then
+                        echo -e "\033[32m$line\033[0m"  # Green for added lines
+                    elif [[ "$line" =~ ^@@ ]]; then
+                        echo -e "\033[36m$line\033[0m"  # Cyan for line numbers
+                    else
+                        echo "$line"
+                    fi
+                done
+            else
+                echo "$diff_output"
+            fi
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+        else
+            if [[ "$VERBOSE" == true ]]; then
+                log_info "  ✓ OK"
+            fi
+        fi
+    done <<< "$files"
+    
+    echo ""
+    log_info "Checked ${checked_count} files"
+    
+    if [[ $has_issues == true ]]; then
+        echo ""
+        log_error "Found ${#failed_files[@]} files with formatting issues:"
+        for file in "${failed_files[@]}"; do
+            log_error "  - $file"
+        done
+        echo ""
+        log_error "To fix these issues automatically, run:"
+        log_error "  $0 --fix"
+        echo ""
+        return 1
+    fi
+    
+    log_info "✓ All files are properly formatted"
+    return 0
+}
+
+# Function to fix formatting
+fix_formatting() {
+    local clang_format_cmd="$1"
+    local files="$2"
+    
+    log_info "Fixing code formatting..."
+    
+    local fixed_count=0
+    local total_count=0
+    
+    while IFS= read -r file; do
+        if [[ -z "$file" ]]; then
+            continue
+        fi
+        
+        total_count=$((total_count + 1))
+        
+        if [[ "$VERBOSE" == true ]]; then
+            log_info "Processing: $file"
+        fi
+        
+        # Apply formatting in-place
+        if "$clang_format_cmd" -i "$file" 2>/dev/null; then
+            fixed_count=$((fixed_count + 1))
+            if [[ "$VERBOSE" == true ]]; then
+                log_info "  ✓ Formatted"
+            fi
+        else
+            if [[ "$VERBOSE" == true ]]; then
+                log_warn "  ✗ Failed to format"
+            fi
+        fi
+    done <<< "$files"
+    
+    echo ""
+    log_info "Processed ${total_count} files"
+    log_info "✓ Formatting applied to ${fixed_count} files"
+    
+    if [[ $fixed_count -gt 0 ]]; then
+        log_warn ""
+        log_warn "Files have been modified. Please review and commit the changes:"
+        log_warn "  git diff"
+        log_warn "  git add -u"
+        log_warn "  git commit -m 'style: apply clang-format'"
+    fi
+}
+
+# Function to run shellcheck on scripts
+run_shellcheck() {
+    log_info "Checking shell scripts with ShellCheck..."
+    
+    # Check if shellcheck is installed
+    if ! command -v shellcheck >/dev/null 2>&1; then
+        log_warn "ShellCheck not found, skipping shell script checks"
+        log_info "To install ShellCheck:"
+        log_info "  Ubuntu/Debian: sudo apt-get install shellcheck"
+        log_info "  macOS: brew install shellcheck"
+        return 0  # Don't fail, just skip
+    fi
+    
+    log_info "✓ ShellCheck found: $(shellcheck --version | head -n2 | tail -n1)"
+    
+    # Find all .sh files in scripts directory
+    local scripts_dir="${PROJECT_ROOT}/scripts"
+    if [[ ! -d "$scripts_dir" ]]; then
+        log_warn "Scripts directory not found: $scripts_dir"
+        return 0
+    fi
+    
+    local shell_files
+    shell_files=$(find "$scripts_dir" -type f -name "*.sh" 2>/dev/null)
+    
+    if [[ -z "$shell_files" ]]; then
+        log_warn "No shell scripts found in $scripts_dir"
+        return 0
+    fi
+    
+    local file_count
+    file_count=$(echo "$shell_files" | wc -l)
+    log_info "Found $file_count shell script(s) to check"
+    
+    # Run shellcheck on all files at once to allow cross-file analysis
+    log_info "Running ShellCheck on scripts directory..."
+    
+    local shellcheck_output
+    # shellcheck disable=SC2086
+    shellcheck_output=$(shellcheck -f gcc $shell_files 2>&1)
+    local shellcheck_result=$?
+    
+    if [[ $shellcheck_result -ne 0 ]]; then
+        echo ""
+        log_warn "⚠ ShellCheck found issues:"
+        echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+        echo "$shellcheck_output"
+        echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+        echo ""
+        log_error "Please fix the ShellCheck warnings/errors"
+        return 1
+    fi
+    
+    log_success "✓ All $file_count shell script(s) passed ShellCheck"
+    return 0
+}
+
+# Function to run all QA checks
+run_all_checks() {
+    log_info "Running all quality assurance checks..."
+    
+    local all_passed=true
+    
+    # Format check
+    log_info "═══ Code Formatting ═══"
+    if ! run_format_check; then
+        all_passed=false
+    fi
+    echo ""
+    
+    # ShellCheck
+    log_info "═══ Shell Scripts Check ═══"
+    if ! run_shellcheck; then
+        all_passed=false
+    fi
+    echo ""
+    
+    # Future: Add more checks here
+    # - cppcheck static analysis
+    # - code complexity metrics
+    # - TODO/FIXME detection
+    # - license header validation
+    
+    if [[ "$all_passed" == false ]]; then
+        log_error "Some QA checks failed"
+        return 1
+    fi
+    
+    log_info "✓ All QA checks passed"
+    return 0
+}
+
+# Function to run format check
+run_format_check() {
+    log_info "Checking for clang-format version ${CLANG_FORMAT_VERSION}..."
+    
+    local clang_format_cmd
+    clang_format_cmd=$(check_clang_format "$CLANG_FORMAT_VERSION")
+    
+    # shellcheck disable=SC2181
+    if [[ $? -ne 0 ]] || [[ -z "$clang_format_cmd" ]]; then
+        log_error "clang-format not found"
+        log_error "Please install clang-format:"
+        log_error "  Ubuntu/Debian: sudo apt-get install clang-format-${CLANG_FORMAT_VERSION}"
+        log_error "  macOS: brew install clang-format"
+        return 1
+    fi
+    
+    if [[ "$clang_format_cmd" == "clang-format-${CLANG_FORMAT_VERSION}" ]]; then
+        log_info "✓ clang-format-${CLANG_FORMAT_VERSION} found"
+    else
+        local installed_version
+        installed_version=$(clang-format --version | grep -oP '\d+\.\d+' | head -1 || echo "unknown")
+        log_warn "clang-format-${CLANG_FORMAT_VERSION} not found, using clang-format (version ${installed_version})"
+    fi
+    
+    log_info "Finding files in '${SOURCE_DIR}' with extensions: ${EXTENSIONS}"
+    
+    local files
+    files=$(find_files "$SOURCE_DIR" "$EXTENSIONS")
+    
+    # shellcheck disable=SC2181
+    if [[ $? -ne 0 ]] || [[ -z "$files" ]]; then
+        log_error "Source directory not found: ${PROJECT_ROOT}/${SOURCE_DIR}"
+        return 1
+    fi
+    
+    local file_count
+    file_count=$(echo "$files" | wc -l)
+    log_info "Found ${file_count} files to check"
+    
+    if [[ "$FIX_MODE" == true ]]; then
+        fix_formatting "$clang_format_cmd" "$files"
+    else
+        check_formatting "$clang_format_cmd" "$files"
+    fi
+}
+
+# Function to show usage
+usage() {
+    cat << EOF
+Usage: $0 [OPTIONS]
+
+Run quality assurance checks on OpenMQTTGateway code.
+
+Options:
+    --check                  Check formatting only (CI mode) [default]
+    --fix                    Fix formatting issues automatically
+    --format                 Run only format checks
+    --all                    Run all QA checks [default]
+    --source DIR             Source directory to check [default: main]
+    --extensions EXTS        File extensions (comma-separated) [default: h,ino,cpp]
+    --clang-format-version V clang-format version [default: 9]
+    --verbose                Enable verbose output
+    --help                   Show this help message
+
+Examples:
+    # Check formatting (CI mode)
+    $0 --check
+
+    # Fix formatting issues
+    $0 --fix
+
+    # Check specific directory
+    $0 --check --source lib/LEDManager
+
+    # Check with custom extensions
+    $0 --check --extensions h,cpp
+
+    # Verbose output
+    $0 --check --verbose
+
+EOF
+    exit 0
+}
+
+# Parse command line arguments
+parse_args() {
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --check)
+                FIX_MODE=false
+                shift
+                ;;
+            --fix)
+                FIX_MODE=true
+                shift
+                ;;
+            --format)
+                FORMAT_ONLY=true
+                shift
+                ;;
+            --all)
+                FORMAT_ONLY=false
+                shift
+                ;;
+            --source)
+                SOURCE_DIR="$2"
+                shift 2
+                ;;
+            --extensions)
+                EXTENSIONS="$2"
+                shift 2
+                ;;
+            --clang-format-version)
+                CLANG_FORMAT_VERSION="$2"
+                shift 2
+                ;;
+            --verbose)
+                VERBOSE=true
+                shift
+                ;;
+            --help)
+                usage
+                ;;
+            *)
+                log_error "Unknown option: $1"
+                usage
+                ;;
+        esac
+    done
+}
+
+# Main execution
+main() {
+    local start_time
+    start_time=$(date +%s)
+    
+    parse_args "$@"
+    
+    log_info "Starting QA pipeline..."
+    
+    if [[ "$FIX_MODE" == true ]]; then
+        log_info "Mode: FIX (will modify files)"
+    else
+        log_info "Mode: CHECK (read-only)"
+    fi
+    
+    # Run checks
+    local result=0
+    if [[ "$FORMAT_ONLY" == true ]]; then
+        run_format_check || result=$?
+    else
+        run_all_checks || result=$?
+    fi
+    
+    local end_time
+    end_time=$(date +%s)
+    local duration=$((end_time - start_time))
+    
+    echo ""
+    echo "╔════════════════════════════════════════╗"
+    echo "║          QA Pipeline Summary           ║"
+    echo "╚════════════════════════════════════════╝"
+    echo "  Duration: ${duration}s"
+    
+    if [[ $result -eq 0 ]]; then
+        echo "  Status: SUCCESS ✓"
+        echo "╚════════════════════════════════════════╝"
+        return 0
+    else
+        echo "  Status: FAILED ✗"
+        echo "╚════════════════════════════════════════╝"
+        return 1
+    fi
+}
+
+# Execute main function
+main "$@"
diff --git a/scripts/ci_security.sh b/scripts/ci_security.sh
new file mode 100755
index 0000000..77e7251
--- /dev/null
+++ b/scripts/ci_security.sh
@@ -0,0 +1,428 @@
+#!/bin/bash
+# OpenMQTTGateway Security Scan Script
+# Runs Trivy vulnerability scanner and generates reports
+# Based on task-security-scan.yml workflow
+# Usage: ./scripts/ci_security.sh [OPTIONS]
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+
+# Load shared configuration (colors, logging functions, paths)
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Default values
+SCAN_TYPE="fs"
+SEVERITY="HIGH,CRITICAL"
+EXIT_CODE_ON_VULN="0"
+SCAN_PATH="."
+EXCLUDE_PATHS=""
+GENERATE_SBOM=false  # Off by default
+
+OUTPUT_DIR="${PROJECT_ROOT}/${REPORTS_DIR}"
+
+# Show usage
+usage() {
+    cat << EOF
+Usage: $0 [OPTIONS]
+
+Security vulnerability scanning using Trivy
+
+Options:
+    --scan-type <type>      Type of scan: fs (filesystem), config, or image
+                            Default: fs
+    
+    --severity <levels>     Severity levels to report (comma-separated)
+                            Options: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+                            Default: HIGH,CRITICAL
+    
+    --scan-path <path>      Path to scan (default: entire repository)
+                            Default: .
+    
+    --exit-code <code>      Exit code when vulnerabilities found
+                            0 = continue (don't fail)
+                            1 = fail build
+                            Default: 0
+    
+    --exclude <paths>       Paths to exclude from scan (comma-separated)
+                            Example: node_modules,test,docs
+                            Default: (none)
+    
+    --generate-sbom         Generate Software Bill of Materials (SBOM)
+                            Creates CycloneDX and SPDX JSON formats
+                            Default: off
+    
+    --output-dir <dir>      Directory to save reports
+                            Default: ./generated/reports
+    
+    -h, --help              Show this help message
+
+Examples:
+    # Scan filesystem for HIGH and CRITICAL issues
+    $0
+
+    # Scan config files and fail if vulnerabilities found
+    $0 --scan-type config --exit-code 1
+
+    # Scan specific path for all severity levels
+    $0 --scan-path ./main --severity UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+
+    # Scan with excluded paths
+    $0 --exclude node_modules,test,docs
+
+    # Scan with multiple options
+    $0 --scan-path ./main --exclude test --severity HIGH,CRITICAL --exit-code 1
+
+    # Scan with SBOM generation
+    $0 --generate-sbom
+
+    # Complete scan with SBOM and custom severity
+    $0 --severity UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL --generate-sbom
+
+EOF
+    exit 0
+}
+
+# Function to check if Trivy is installed
+check_trivy() {
+    if ! command -v trivy &> /dev/null; then
+        log_error "Trivy is not installed. Install it from: https://github.com/aquasecurity/trivy"
+        return 1
+    fi
+    log_success "Trivy found: $(trivy --version)"
+}
+
+# Function to check if jq is installed (for JSON parsing)
+check_jq() {
+    if ! command -v jq &> /dev/null; then
+        log_warn "jq is not installed. Some report features will be limited."
+        return 1
+    fi
+    return 0
+}
+
+# Function to run Trivy scan with specified format
+# Usage: run_trivy_scan <format> <filename> [exit_code]
+run_trivy_scan() {
+    local format="$1"
+    local filename="$2"
+    local exit_code="${3:-0}"  # Default to 0 for non-critical scans
+    local output_file="${OUTPUT_DIR}/${filename}"
+    
+    log_info "Running Trivy $SCAN_TYPE scan ($format format)..."
+    
+    mkdir -p "$OUTPUT_DIR"
+    
+    # Build Trivy command with all enabled scanners
+    local trivy_cmd=(
+        trivy "$SCAN_TYPE" "$SCAN_PATH"
+        --format "$format"
+        --output "$output_file"
+        --severity "$SEVERITY"
+        --exit-code "$exit_code"
+    )
+    
+    # Add exclude paths if provided
+    if [[ -n "$EXCLUDE_PATHS" ]]; then
+        IFS=',' read -r -a exclude_dirs <<< "$EXCLUDE_PATHS"
+        for skip_dir in "${exclude_dirs[@]}"; do
+            if [[ -n "$skip_dir" ]]; then
+                trivy_cmd+=(--skip-dirs "$skip_dir")
+            fi
+        done
+    fi
+    
+    log_info "Executing Trivy ${SCAN_TYPE} scan"
+    
+    if "${trivy_cmd[@]}" 2>&1 | tee -a "${OUTPUT_DIR}/trivy-scan.log"; then
+        log_success "${format^^} report generated: $output_file"
+        return 0
+    else
+        local rc=$?
+        if [[ $rc -eq 1 && "$exit_code" == "1" ]]; then
+            log_error "Vulnerabilities found (exit code: $rc)"
+            return $rc
+        fi
+        log_success "Scan completed with exit code: $rc"
+        return 0
+    fi
+}
+
+# Function to create summary report
+create_summary_report() {
+    log_info "Creating security summary report..."
+    
+    local summary_file="${OUTPUT_DIR}/security-summary.md"
+    
+    {
+        echo "# 🔒 Security Scan Results"
+        echo ""
+        echo "**Scan Type**: $SCAN_TYPE"
+        echo "**Path Scanned**: $SCAN_PATH"
+        echo "**Severity Filter**: $SEVERITY"
+        echo "**Scan Date**: $(date -u '+%Y-%m-%d %H:%M:%S UTC')"
+        echo ""
+    } > "$summary_file"
+    
+    # Parse SARIF if it exists
+    local sarif_file="${OUTPUT_DIR}/trivy-results.sarif"
+    if [[ -f "$sarif_file" ]]; then
+        log_info "Parsing SARIF results..."
+        
+        if check_jq; then
+            # Count vulnerabilities by severity
+            local vuln_count
+            vuln_count=$(jq '[.runs[].results[]] | length' "$sarif_file" 2>/dev/null || echo "0")
+            
+            local critical high medium low
+            critical=$(jq '[.runs[].results[] | select(.level == "error")] | length' "$sarif_file" 2>/dev/null || echo "0")
+            high=$(jq '[.runs[].results[] | select(.level == "warning")] | length' "$sarif_file" 2>/dev/null || echo "0")
+            medium=$(jq '[.runs[].results[] | select(.level == "note")] | length' "$sarif_file" 2>/dev/null || echo "0")
+            low=$(jq '[.runs[].results[] | select(.level == "none")] | length' "$sarif_file" 2>/dev/null || echo "0")
+            
+            {
+                echo "## Vulnerability Summary"
+                echo ""
+                echo "**Total Vulnerabilities**: ${vuln_count}"
+                echo ""
+                echo "- 🔴 **Critical**: ${critical}"
+                echo "- 🟠 **High**: ${high}"
+                echo "- 🟡 **Medium**: ${medium}"
+                echo "- 🟢 **Low**: ${low}"
+                echo ""
+            } >> "$summary_file"
+            
+            # List vulnerability details
+            if [[ "$vuln_count" -gt 0 ]]; then
+                {
+                    echo "## Vulnerability Details"
+                    echo ""
+                } >> "$summary_file"
+                
+                jq -r '.runs[].results[] | 
+                    "### \(.level | ascii_upcase): \(.ruleId)\n" +
+                    "**Location**: \(.locations[0].physicalLocation.artifactLocation.uri // "N/A")\n" +
+                    "**Message**: \(.message.text)\n" +
+                    (if .properties.CVE then "**CVE**: \(.properties.CVE)\n" else "" end) +
+                    (if .properties.cvss then "**CVSS Score**: \(.properties.cvss)\n" else "" end) +
+                    ""' "$sarif_file" >> "$summary_file" 2>/dev/null || \
+                    echo "Could not parse vulnerability details" >> "$summary_file"
+            fi
+        else
+            echo "⚠️  jq not available for detailed SARIF parsing" >> "$summary_file"
+        fi
+    else
+        echo "⚠️  SARIF file not found" >> "$summary_file"
+    fi
+    
+    # Add available report formats
+    {
+        echo "## Report Formats Available"
+        echo ""
+        if [[ -f "${OUTPUT_DIR}/trivy-results.sarif" ]]; then
+            echo "- ✅ \`trivy-results.sarif\` - SARIF format (for GitHub/IDE integration)"
+        fi
+        if [[ -f "${OUTPUT_DIR}/trivy-report.json" ]]; then
+            echo "- ✅ \`trivy-report.json\` - JSON format (for automation)"
+        fi
+        if [[ -f "${OUTPUT_DIR}/trivy-report.txt" ]]; then
+            echo "- ✅ \`trivy-report.txt\` - Human-readable table"
+        fi
+        echo ""
+    } >> "$summary_file"
+    
+    # Add footer
+    {
+        echo "---"
+        echo ""
+        echo "Generated by OpenMQTTGateway CI/CD Security Scan"
+        echo "For more information, see: https://github.com/aquasecurity/trivy"
+    } >> "$summary_file"
+    
+    log_success "Summary report generated: $summary_file"
+}
+
+# Function to check for critical vulnerabilities and fail if needed
+check_critical_vulnerabilities() {
+    if [[ "$EXIT_CODE_ON_VULN" != "1" ]]; then
+        return 0
+    fi
+    
+    local sarif_file="${OUTPUT_DIR}/trivy-results.sarif"
+    
+    if [[ ! -f "$sarif_file" ]]; then
+        log_warn "SARIF file not found, skipping critical check"
+        return 0
+    fi
+    
+    if check_jq; then
+        local critical
+        critical=$(jq '[.runs[].results[] | select(.level == "error")] | length' "$sarif_file" 2>/dev/null || echo "0")
+        
+        if [[ "$critical" -gt 0 ]]; then
+            log_error "❌ Found ${critical} critical vulnerabilities!"
+            log_error "Review the security reports in: $OUTPUT_DIR"
+            return 1
+        fi
+    fi
+    
+    return 0
+}
+
+# Main execution
+main() {
+    # Parse arguments
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --scan-type)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--scan-type requires an argument"
+                    return 1
+                fi
+                SCAN_TYPE="$2"
+                shift 2
+                ;;
+            --severity)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--severity requires an argument"
+                    return 1
+                fi
+                SEVERITY="$2"
+                shift 2
+                ;;
+            --scan-path)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--scan-path requires an argument"
+                    return 1
+                fi
+                SCAN_PATH="$2"
+                shift 2
+                ;;
+            --exit-code)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--exit-code requires an argument"
+                    return 1
+                fi
+                EXIT_CODE_ON_VULN="$2"
+                shift 2
+                ;;
+            --exclude)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--exclude requires an argument"
+                    return 1
+                fi
+                EXCLUDE_PATHS="$2"
+                shift 2
+                ;;
+            --generate-sbom)
+                GENERATE_SBOM=true
+                shift
+                ;;
+            --output-dir)
+                if [[ -z "${2:-}" ]]; then
+                    log_error "--output-dir requires an argument"
+                    return 1
+                fi
+                OUTPUT_DIR="$2"
+                shift 2
+                ;;
+            -h|--help)
+                usage
+                ;;
+            *)
+                log_error "Unknown option: $1"
+                echo ""
+                usage
+                ;;
+        esac
+    done
+    
+    # Pre-flight checks
+    log_info "Running security scan checks..."
+    if ! check_trivy; then
+        log_error "Required tool check failed"
+        return 1
+    fi
+    check_jq || true
+    
+    echo ""
+    log_info "═══ Security Scan Configuration ═══"
+    echo "  Scan Type: $SCAN_TYPE"
+    echo "  Path: $SCAN_PATH"
+    echo "  Severity: $SEVERITY"
+    echo "  Exit on Vulnerabilities: $EXIT_CODE_ON_VULN"
+    echo "  Excluded Paths: ${EXCLUDE_PATHS:-none}"
+    echo "  Generate SBOM: ${GENERATE_SBOM:-false}"
+    echo "  Output Directory: $OUTPUT_DIR"
+    echo ""
+    
+    # Run scans
+    if ! run_trivy_scan "sarif" "trivy-results.sarif" "$EXIT_CODE_ON_VULN"; then
+        if [[ "$EXIT_CODE_ON_VULN" == "1" ]]; then
+            return 1
+        fi
+    fi
+    
+    run_trivy_scan "json" "trivy-report.json" "0"
+    run_trivy_scan "table" "trivy-report.txt" "0"
+    
+    # Create summary
+    create_summary_report
+    
+    # Generate SBOM if requested
+    if [[ "$GENERATE_SBOM" == "true" ]]; then
+        log_info "Generating Software Bill of Materials (SBOM)..."
+        
+        local sbom_dir="${OUTPUT_DIR}/sbom"
+        mkdir -p "$sbom_dir"
+        
+        # Generate CycloneDX SBOM
+        log_info "Generating CycloneDX SBOM..."
+        if trivy "$SCAN_TYPE" "$SCAN_PATH" \
+            --format cyclonedx \
+            --output "$sbom_dir/sbom-cyclonedx.json" \
+            --exit-code 0 2>&1 | grep -i "generated\|error" || true; then
+            if [[ -f "$sbom_dir/sbom-cyclonedx.json" ]]; then
+                log_success "CycloneDX SBOM generated: $sbom_dir/sbom-cyclonedx.json"
+            fi
+        fi
+        
+        # Generate SPDX SBOM
+        log_info "Generating SPDX SBOM..."
+        if trivy "$SCAN_TYPE" "$SCAN_PATH" \
+            --format spdx-json \
+            --output "$sbom_dir/sbom-spdx.json" \
+            --exit-code 0 2>&1 | grep -i "generated\|error" || true; then
+            if [[ -f "$sbom_dir/sbom-spdx.json" ]]; then
+                log_success "SPDX SBOM generated: $sbom_dir/sbom-spdx.json"
+            fi
+        fi
+        
+        if [[ -f "$sbom_dir/sbom-cyclonedx.json" ]] || [[ -f "$sbom_dir/sbom-spdx.json" ]]; then
+            log_success "SBOM generation completed"
+            echo ""
+        fi
+    fi
+    # Check for critical vulnerabilities
+    if ! check_critical_vulnerabilities; then
+        return 1
+    fi
+    
+    echo ""
+    log_success "Security scan completed successfully!"
+    log_info "Reports saved to: $OUTPUT_DIR"
+    
+    return 0
+}
+
+# Execute main function
+main "$@"
diff --git a/scripts/ci_site.sh b/scripts/ci_site.sh
new file mode 100755
index 0000000..e29900c
--- /dev/null
+++ b/scripts/ci_site.sh
@@ -0,0 +1,352 @@
+#!/bin/bash
+# CI/CD Site/Documentation Builder
+# This script builds and deploys VitePress documentation with version management.
+# Usage: ./scripts/ci_site.sh [OPTIONS] - Specify options for the script execution.
+
+set -euo pipefail
+
+# Constants
+# Resolve the folder containing this script so relative paths work
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+DOCS_DIR="${PROJECT_ROOT}/docs"
+readonly SCRIPT_DIR
+readonly PROJECT_ROOT
+readonly DOCS_DIR
+
+
+# Load shared configuration
+if [[ -f "${SCRIPT_DIR}/ci_00_config.sh" ]]; then
+    source "${SCRIPT_DIR}/ci_00_config.sh"
+else
+    echo "ERROR: ci_00_config.sh not found" >&2
+    exit 1
+fi
+
+# Final output directory for the site
+readonly SITE_OUTPUT_DIR="${PROJECT_ROOT}/${SITE_DIR}"
+
+# Default values
+MODE="prod"  # Set the default mode to production
+CURL_INSECURE=false  # Allow curl to skip TLS verification (use only when needed)
+CLEAN=false  # Clean generated/site before build
+LEGACY_OPENSSL=false  # Use --openssl-legacy-provider for older Node.js versions
+
+# Function to check required tools
+check_requirements() {
+    log_info "Checking required tools..."
+    
+    local missing_tools=()
+
+    if ! command -v node >/dev/null 2>&1; then
+        missing_tools+=("node")  # Node.js is required
+    else
+        local node_version
+        node_version=$(node --version)
+        log_info "✓ Node.js ${node_version} found"
+    fi
+    
+    if ! command -v npm >/dev/null 2>&1; then
+        missing_tools+=("npm")  # npm is required
+    else
+        local npm_version
+        npm_version=$(npm --version)
+        log_info "✓ npm ${npm_version} found"
+    fi
+    
+    if ! command -v openssl >/dev/null 2>&1; then
+        missing_tools+=("openssl")  # OpenSSL is required
+    else
+        local openssl_version
+        openssl_version=$(openssl version | grep -oP '\d+\.\d+\.\d+' || echo "unknown")
+        log_info "✓ OpenSSL ${openssl_version} found"
+    fi
+    
+    if [[ ${#missing_tools[@]} -gt 0 ]]; then
+        log_error "Missing required tools: ${missing_tools[*]}"
+        return 1
+    fi
+    
+    log_info "All required tools are available"
+    return 0
+}
+
+# Function to install dependencies
+install_dependencies() {
+    log_info "Installing dependencies..."
+    
+    # Install Node dependencies
+    log_info "Installing Node.js dependencies..."
+    cd "${PROJECT_ROOT}"
+    npm install --quiet || {
+        log_error "Failed to install Node.js dependencies"
+        return 1
+    }
+    
+    log_info "Dependencies installed successfully"
+}
+
+# Function to download common config
+download_common_config() {
+    log_info "Downloading common configuration..."
+    
+    local config_url="https://www.theengs.io/commonConfig.js"
+    local config_dest="${DOCS_DIR}/.vitepress/public/commonConfig.js"
+    local curl_opts="-sSf"
+
+    # Optionally disable TLS verification if explicitly requested
+    if [[ "${CURL_INSECURE}" == "true" ]]; then
+        curl_opts+="k"
+        log_warn "curl is running with --insecure; TLS verification is disabled"
+    fi
+    
+    mkdir -p "$(dirname "$config_dest")"
+    
+    if curl ${curl_opts} -o "$config_dest" "$config_url"; then
+        log_info "✓ Common config downloaded"
+    else
+        log_warn "Failed to download common config, continuing anyway..."
+    fi
+}
+
+create_configuration_files() {
+    local url_prefix="$1"
+    local version="$2"
+    local mode="$3"
+    # Note: dest is always "generated/site" (from defaults.json).
+    # The dev subdirectory is handled by destination_dir in the GitHub Actions deploy step.
+
+    # download common config
+    download_common_config
+
+
+    ## Create a meta.json file on config folder
+    local meta_file="${DOCS_DIR}/.vitepress/meta.json"
+    cat > "$meta_file" <<EOF
+{
+    "title": "Theengs OpenMQTTGateway",
+    "version": "${version}",
+    "url_prefix": "${url_prefix}",
+    "mode": "${mode}"
+}
+EOF
+    log_info "✓ Generated meta.json at ${meta_file}"
+}
+
+# Function to build documentation
+build_docs() {
+    log_info "Building documentation..."
+    
+    cd "${PROJECT_ROOT}"
+    
+    # Set Node options for compatibility with older Node.js versions (if requested)
+    if [[ "$LEGACY_OPENSSL" == true ]]; then
+        log_info "Using --openssl-legacy-provider for older Node.js compatibility"
+        export NODE_OPTIONS="--openssl-legacy-provider"
+    fi
+    
+    npm run docs:build || {
+        log_error "Documentation build failed"
+        return 1
+    }
+    log_info "✓ Documentation built successfully"
+}
+
+# Function to preview documentation
+preview_docs() {
+    log_info "Starting local preview server..."
+    
+    cd "${PROJECT_ROOT}"
+    
+    npm run site:preview || {
+        log_error "Failed to start preview server"
+        return 1
+    }
+    
+    log_info "Preview server running at https://localhost:8443"
+    log_info "Press Ctrl+C to stop the preview server"
+}
+
+# Function to clean generated site folder
+clean_build() {
+    local site_folder="${PROJECT_ROOT}/generated/site"
+    if [[ -d "$site_folder" ]]; then
+        log_info "Cleaning ${site_folder}..."
+        rm -rf "$site_folder"
+        log_info "✓ Cleaned ${site_folder}"
+    else
+        log_info "Nothing to clean: ${site_folder} does not exist"
+    fi
+}
+
+# Show usage
+usage() {
+    cat << EOF
+Usage: $0 [OPTIONS]
+
+Build and deploy OpenMQTTGateway documentation with VitePress.
+Generates site structure and meta.json file.
+
+OPTIONS:
+    --mode MODE
+        Build mode: 'prod' (production) or 'dev' (development) [default: dev]
+
+    --url-prefix PATH
+        Base URL path for links (e.g., '/' for root, '/dev/' for dev) [default: /dev/]
+
+    --version VERSION
+        Version string written to meta.json (e.g., '1.8.0', 'edge') [default: edge]
+
+    --preview
+        Start local HTTPS preview server after build (https://localhost:8443)
+
+    --clean
+        Remove generated/site folder before build
+
+    --insecure-curl
+        Allow curl to skip TLS verification (use only if cert errors block download)
+
+    --legacy-openssl
+        Use --openssl-legacy-provider for older Node.js versions (pre-17)
+
+    --help
+        Show this message and exit
+
+EXAMPLES:
+    # Production build
+    $0 --mode prod --url-prefix / --version 1.8.0
+
+    # Development build with preview
+    $0 --mode dev --url-prefix /dev/ --version edge --preview
+
+    # Clean and rebuild
+    $0 --clean --mode prod --version 1.8.0
+
+EOF
+}
+
+
+
+# Main execution
+main() {
+    local version="edge"
+    local mode="dev"
+    local url_prefix=""
+    local url_prefix_set=false
+    local do_preview=false
+
+# Parse command line arguments
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --mode)
+                if [[ $# -lt 2 ]]; then
+                    log_error "--mode requires an argument: 'prod' or 'dev'"
+                    usage
+                    exit 1
+                fi
+                if [[ "$2" != "prod" && "$2" != "dev" ]]; then
+                    log_error "Invalid mode: $2. Must be 'prod' or 'dev'"
+                    usage
+                    exit 1
+                fi
+                mode="$2"
+                shift 2
+                ;;
+            --url-prefix)
+                url_prefix="$2"
+                url_prefix_set=true
+                shift 2
+                ;;
+            --version)
+                version="$2"
+                shift 2
+                ;;
+            --preview)
+                do_preview=true
+                shift
+                ;;
+            --clean)
+                CLEAN=true
+                shift
+                ;;
+            --insecure-curl)
+                CURL_INSECURE=true
+                shift
+                ;;
+            --legacy-openssl)
+                LEGACY_OPENSSL=true
+                shift
+                ;;
+            --help)
+                usage
+                exit 0
+                ;;
+            *)
+                log_error "Unknown option: $1"
+                usage
+                exit 0
+                ;;
+        esac
+    done
+
+    # Set url_prefix based on mode if not explicitly provided
+    if [[ "$url_prefix_set" == false ]]; then
+        if [[ "$mode" == "prod" ]]; then
+            url_prefix="/"
+        else
+            url_prefix="/dev/"
+        fi
+    fi
+
+    local start_time
+    start_time=$(date +%s)
+    
+    
+    log_info "Starting site build pipeline..."
+    log_info "Mode: $mode"
+    log_info "URL prefix: $url_prefix"
+    
+    # Clean if requested
+    if [[ "$CLEAN" == "true" ]]; then
+        clean_build
+    fi
+    
+    # Check requirements
+    check_requirements || exit 1
+    
+    # Install dependencies
+    install_dependencies || exit 1
+
+    # Create configuration files (meta.json)
+    create_configuration_files "$url_prefix" "$version" "$mode" || exit 1
+    
+    # Build documentation
+    build_docs || exit 1
+    
+    # Preview if requested
+    if [[ "$do_preview" == true ]]; then
+        preview_docs
+    fi
+    
+    local end_time
+    end_time=$(date +%s)
+    local duration=$((end_time - start_time))
+    
+    echo ""
+    echo "╔════════════════════════════════════════╗"
+    echo "║        Site Build Summary              ║"
+    echo "╚════════════════════════════════════════╝"
+    echo "  Mode: $MODE"
+    echo "  Version: $version"
+    echo "  Duration: ${duration}s"
+    echo "  Output: $SITE_OUTPUT_DIR"
+    echo "  Status: SUCCESS ✓"
+    echo "╚════════════════════════════════════════╝"
+}
+
+
+# Run main if executed directly
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "$@"
+fi
diff --git a/scripts/common_wu.py b/scripts/common_wu.py
deleted file mode 100644
index a580627..0000000
--- a/scripts/common_wu.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import string
-
-mf_temp32 = string.Template('''{
-  "name": "OpenMQTTGateway",
-  "new_install_prompt_erase": true,
-  "builds": [
-    {
-      "chipFamily": "ESP32",
-      "improv": false,
-      "parts": [
-        { "path": "$cp$bl", "offset": 4096 },
-        { "path": "$cp$part", "offset": 32768 },
-        { "path": "$cp$boot", "offset": 57344 },
-        { "path": "$cp$bin", "offset": 65536 }
-      ]
-    }
-  ]
-}''')
-
-mf_temp32c3 = string.Template('''{
-  "name": "OpenMQTTGateway",
-  "new_install_prompt_erase": true,
-  "builds": [
-    {
-      "chipFamily": "ESP32-C3",
-      "improv": false,
-      "parts": [
-        { "path": "$cp$bl", "offset": 0 },
-        { "path": "$cp$part", "offset": 32768 },
-        { "path": "$cp$boot", "offset": 57344 },
-        { "path": "$cp$bin", "offset": 65536 }
-      ]
-    }
-  ]
-}''')
-
-mf_temp32s3 = string.Template('''{
-  "name": "OpenMQTTGateway",
-  "new_install_prompt_erase": true,
-  "builds": [
-    {
-      "chipFamily": "ESP32-S3",
-      "improv": false,
-      "parts": [
-        { "path": "$cp$bl", "offset": 0 },
-        { "path": "$cp$part", "offset": 32768 },
-        { "path": "$cp$boot", "offset": 57344 },
-        { "path": "$cp$bin", "offset": 65536 }
-      ]
-    }
-  ]
-}''')
-
-mf_temp8266 = string.Template('''{
-  "name": "OpenMQTTGateway",
-  "new_install_prompt_erase": true,
-  "builds": [
-    {
-      "chipFamily": "ESP8266",
-      "parts": [{ "path": "$cp$bin", "offset": 0 }]
-    }
-  ]
-}''')
-
-wu_temp_opt = string.Template('''
-        <option
-          value="$mff"
-        >
-        $mfn
-        </option>
-        ''')
-
-wu_temp_p1 = '''<template>
-  <div align="center">
-    <select>
-      <optgroup label="ESP32">'''
-
-wu_temp_p2 = '''
-      </optgroup>
-      <optgroup label="ESP32C3">'''
-
-wu_temp_p3 = '''
-      </optgroup>
-      <optgroup label="ESP32S3">'''
-
-wu_temp_p4 = '''
-      </optgroup>
-      <optgroup label="ESP8266">'''
-
-wu_temp_end = '''
-      </optgroup>
-    </select><br><br>
-    <esp-web-install-button erase-first></esp-web-install-button>
-  </div>
-</template>
-
-<script>
-export default {
-  mounted () {
-    const espWebInstallButton = document.querySelector("esp-web-install-button");
-    espWebInstallButton.addEventListener("state-changed", (ev) => { console.log(ev.detail) });
-    const selectFW = document.querySelector("select");
-    espWebInstallButton.manifest = selectFW.value;
-    selectFW.addEventListener("change", () => {
-      espWebInstallButton.manifest = selectFW.value;
-    });
-  }
-}
-</script>'''
-
-manif_path = 'docs/.vuepress/public/firmware_build/'
-vue_path = 'docs/.vuepress/components/'
-cors_proxy = ''  # 'https://cors.bridged.cc/'
-esp32_boot = 'https://github.com/espressif/arduino-esp32/raw/2.0.7/tools/partitions/boot_app0.bin'
diff --git a/scripts/compressFirmware.py b/scripts/compressFirmware.py
index cd57a6d..0616337 100644
--- a/scripts/compressFirmware.py
+++ b/scripts/compressFirmware.py
@@ -1,3 +1,5 @@
+# Compresses firmware binaries with gzip for OTA updates during build
+# Used by: PlatformIO environments (optional, commented in environments.ini)
 import gzip
 import shutil
 import os
diff --git a/scripts/ensure_ssl_certs.js b/scripts/ensure_ssl_certs.js
new file mode 100644
index 0000000..42c3338
--- /dev/null
+++ b/scripts/ensure_ssl_certs.js
@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+function ensureSSLCerts() {
+    const sslDir = path.join(process.cwd(), '.ssl');
+    const keyFile = path.join(sslDir, 'key.pem');
+    const certFile = path.join(sslDir, 'cert.pem');
+
+    if (fs.existsSync(keyFile) && fs.existsSync(certFile)) {
+        return;
+    }
+
+    const { execSync } = require('child_process');
+
+    fs.mkdirSync(sslDir, { recursive: true });
+
+    try {
+        execSync(`openssl req -new -x509 -keyout "${keyFile}" -out "${certFile}" -days 365 -nodes -subj "/C=US/ST=State/L=City/O=OpenMQTTGateway/CN=localhost" 2>/dev/null`, {
+            stdio: 'inherit'
+        });
+        console.log('✓ SSL certificate generated');
+    } catch (err) {
+        console.error('Failed to generate SSL certificate. Ensure openssl is installed.');
+        process.exit(1);
+    }
+}
+
+ensureSSLCerts();
diff --git a/scripts/gen_wu.py b/scripts/gen_wu.py
deleted file mode 100644
index ee3a173..0000000
--- a/scripts/gen_wu.py
+++ /dev/null
@@ -1,147 +0,0 @@
-import os
-import requests
-import json
-import argparse
-import shutil
-
-from common_wu import mf_temp32, mf_temp32c3, mf_temp8266, wu_temp_opt, wu_temp_p1, wu_temp_p2, wu_temp_p3, wu_temp_p4, wu_temp_end, vue_path, manif_path, cors_proxy, esp32_boot, mf_temp32s3
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--dev', action='store_true')
-parser.add_argument('repo', nargs='?', default='1technophile/OpenMQTTGateway')
-args = parser.parse_args()
-repo = args.repo
-dev = args.dev
-
-bin_path = 'toDeploy/'
-manif_folder = "/firmware_build/"
-
-if not os.path.exists(manif_path):
-    os.makedirs(manif_path)
-
-if dev:
-    print('Generate Web Upload in dev mode')
-    manif_folder = "/dev" + manif_folder
-    # copy OTA latest version definition
-    shutil.copy("scripts/latest_version_dev.json",
-                manif_path + "latest_version_dev.json")
-    # copy the binaries frombin_path to manif_path
-    for name in os.listdir(bin_path):
-        if '.bin' in name:
-            shutil.copyfile(bin_path + name, (manif_path + name))
-else:
-    print('Generate Web Upload in release mode')
-    # copy OTA latest version definition
-    shutil.copy("scripts/latest_version.json", manif_path + "latest_version.json")
-    release = requests.get('https://api.github.com/repos/' +
-                        repo + '/releases/latest')
-    rel_data = json.loads(release.text)
-    if 'assets' in rel_data:
-        assets = rel_data['assets']
-        # Download assets into manif_path
-        for item in range(len(assets)):
-            name = assets[item]['name']
-            if 'firmware.bin' in name:
-                fw_bin = requests.get(assets[item]['browser_download_url'])
-                filename = assets[item]['browser_download_url'].split('/')[-1]
-                with open(manif_path + filename, 'wb') as output_file:
-                    output_file.write(fw_bin.content)
-                print('Downloaded: ' + filename)
-            if 'partitions.bin' in name:
-                part_bin = requests.get(assets[item]['browser_download_url'])
-                filename = assets[item]['browser_download_url'].split('/')[-1]
-                with open(manif_path + filename, 'wb') as output_file:
-                    output_file.write(part_bin.content)
-                print('Downloaded: ' + filename)
-            if 'bootloader.bin' in name:
-                bl_bin = requests.get(assets[item]['browser_download_url'])
-                filename = assets[item]['browser_download_url'].split('/')[-1]
-                with open(manif_path + filename, 'wb') as output_file:
-                    output_file.write(bl_bin.content)
-                print('Downloaded: ' + filename)
-    else:
-        print('Assets not found')
-        os._exit(1)
-
-if not os.path.exists(vue_path):
-    os.makedirs(vue_path)
-
-boot_bin = requests.get(esp32_boot)
-filename = esp32_boot.split('/')[-1]
-with open(manif_path + filename, 'wb') as output_file:
-    output_file.write(boot_bin.content)
-
-wu_file = open(vue_path + 'web-uploader.vue', 'w')
-wu_file.write(wu_temp_p1)
-
-for name in os.listdir(manif_path):
-    if 'firmware.bin' in name  and ('esp32c3' not in name ) and ('esp32s3' not in name ) and ('esp32' in name or 'ttgo' in name or 'heltec' in name or 'thingpulse' in name or 'theengs' in name or 'lilygo' in name or 'shelly' in name or 'tinypico' in name):
-        fw = name.split('-firmware')[0]
-        man_file = fw + '.manifest.json'
-        fwp_name = name.split('-firmware')[0] + '-partitions.bin'                           
-        fwb_name = name.split('-firmware')[0] + '-bootloader.bin'
-        mani_str = mf_temp32.substitute({'cp': cors_proxy, 'part': manif_folder + fwp_name.split('/')[-1], 'bin': manif_folder + name, 'bl': manif_folder + fwb_name, 'boot': manif_folder + esp32_boot.split('/')[-1]})
-
-        with open(manif_path + man_file, 'w') as nf:
-            nf.write(mani_str)
-
-        wu_file.write(wu_temp_opt.substitute(
-            {'mff': manif_folder + man_file, 'mfn': fw}))
-
-        print('Created: ' + man_file)
-
-wu_file.write(wu_temp_p2)
-
-for name in os.listdir(manif_path):
-    if 'firmware.bin' in name and ('esp32c3' in name ):
-        fw = name.split('-firmware')[0]
-        man_file = fw + '.manifest.json'
-        fwp_name = name.split('-firmware')[0] + '-partitions.bin'
-        fwb_name = name.split('-firmware')[0] + '-bootloader.bin'
-        mani_str = mf_temp32c3.substitute({'cp': cors_proxy, 'part': manif_folder + fwp_name, 'bin': manif_folder + name, 'bl': manif_folder + fwb_name, 'boot': manif_folder + esp32_boot.split('/')[-1]})
-
-        with open(manif_path + man_file, 'w') as nf:
-            nf.write(mani_str)
-
-        wu_file.write(wu_temp_opt.substitute(
-            {'mff': manif_folder + man_file, 'mfn': fw}))
-
-        print('Created: ' + man_file)
-
-wu_file.write(wu_temp_p3)
-
-for name in os.listdir(manif_path):
-    if 'firmware.bin' in name and ('esp32s3' in name ):
-        fw = name.split('-firmware')[0]
-        man_file = fw + '.manifest.json'
-        fwp_name = name.split('-firmware')[0] + '-partitions.bin'
-        fwb_name = name.split('-firmware')[0] + '-bootloader.bin'
-        mani_str = mf_temp32s3.substitute({'cp': cors_proxy, 'part': manif_folder + fwp_name, 'bin': manif_folder + name, 'bl': manif_folder + fwb_name, 'boot': manif_folder + esp32_boot.split('/')[-1]})
-
-        with open(manif_path + man_file, 'w') as nf:
-            nf.write(mani_str)
-
-        wu_file.write(wu_temp_opt.substitute(
-            {'mff': manif_folder + man_file, 'mfn': fw}))
-
-        print('Created: ' + man_file)
-
-wu_file.write(wu_temp_p4)
-
-for name in os.listdir(manif_path):
-    if 'firmware.bin' in name and ('nodemcu' in name or 'sonoff' in name or 'rf-wifi-gateway' in name or 'manual-wifi-test' in name or 'rfbridge' in name):
-        fw = name.split('-firmware')[0]
-        man_file = fw + '.manifest.json'
-        mani_str = mf_temp8266.substitute(
-            {'cp': cors_proxy, 'bin': manif_folder + name})
-
-        with open(manif_path + man_file, 'w') as nf:
-            nf.write(mani_str)
-
-        wu_file.write(
-            manif_folder + wu_temp_opt.substitute({'mff': manif_folder + man_file, 'mfn': fw}))
-
-        print('Created: ' + man_file)
-
-wu_file.write(wu_temp_end)
-wu_file.close()
diff --git a/scripts/generate_board_docs.py b/scripts/generate_board_docs.py
deleted file mode 100644
index 19a5d2e..0000000
--- a/scripts/generate_board_docs.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import pytablereader as ptr
-import pandas as pd
-import os
-import re
-import configparser
-conf = configparser.ConfigParser()
-
-# Init the table with the columns
-table_init = pd.DataFrame(columns=['Environment', 'uC', 'Hardware', 'Description', 'Modules', 'Platform',
-                                   'Partitions', 'Libraries', 'Options'])
-table = table_init
-
-# Parse platformio.ini to retrieve boards information
-conf.read('environments.ini')
-for each_section in conf.sections():
-    if ("env:" in each_section and "-test" not in each_section):
-        env = each_section.replace("env:", "")
-        uc = ""
-        board = ""
-        hardware = ""
-        description = ""
-        modules = ""
-        platform = ""
-        partitions = ""
-        libraries = ""
-        options = ""
-        for (k, v) in conf.items(each_section):
-            v = v.replace('{', '').replace('}', '').replace('$', '').replace(
-                "env:", '').replace('\'', '').replace("-D", "")
-            if (k == "board"):
-                uc = v
-            if (k == "platform"):
-                platform = v
-            if (k == "board_build.partitions"):
-                partitions = v
-            if (k == "lib_deps"):
-                libraries = v
-                libraries = libraries.replace(
-                    "\ncom-esp.lib_deps\n", "").replace(
-                    "\ncom-arduino.lib_deps\n", "").replace("libraries.", "")
-            if (k == "build_flags"):
-                options = v
-                for o in options.split('\n'):
-                    if ("gateway" in o or "sensor" in o or "actuator" in o):
-                        if (modules != ""):
-                            modules = modules + "\n"
-                        modules = modules + o[1:o.rfind("=\"")]
-                options = options.replace(
-                    "com-esp.build_flags\n", "")
-            if (k == "custom_description"):
-                description = v
-            if (k == "custom_hardware"):
-                hardware = v
-        table.loc[len(table.index)] = [env, uc, hardware, description, modules, platform,
-                                       partitions, libraries, options]
-
-# Sort rows per Environment name
-table.sort_values(by=['Environment'], inplace=True,
-                  key=lambda col: col.str.lower())
-
-# Produce individual file
-for ind in table.index:
-    table_extract = table.iloc[ind]
-    print(table_extract)
-    file = open("docs/prerequisites/boards/" +
-                table.iloc[ind]["Environment"] + ".md", 'w')
-    table_extract = table_extract.rename_axis("Board index")
-    table_md = table_extract.to_markdown()
-    n = file.write(table_md)
-    file.close()
-
-# Produce list file
-# Add link to the file from the environment and replace /n with ,
-for ind in table.index:
-    table['Environment'][ind] = "[" + table['Environment'][ind] + \
-        "](../prerequisites/boards/" + table['Environment'][ind] + ")"
-
-table = table.replace("\n", ", ", regex=True)
-table = table.drop(["Partitions", "Hardware", "Platform", "Options","Modules"], axis=1)
-table = table.reset_index(drop=True)
-print(table)
-# Convert to Markdown and save per Model_Id
-table_md = table.to_markdown()
-file = open("docs/prerequisites/board.md", 'a')
-n = file.write("# Supported\n" + table_md)
-file = open("docs/upload/web-install.md", 'a')
-n = file.write(table_md)
-file.close()
diff --git a/scripts/prepare_deploy.sh b/scripts/prepare_deploy.sh
deleted file mode 100755
index 2dda51b..0000000
--- a/scripts/prepare_deploy.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e
-echo "renaming bin files with the environment name"
-rename -v 's:/:-:g' .pio/build/*/*.bin
-mkdir toDeploy
-rename 's/.pio-build-//' .*.bin
-(
-  cd .pio/libdeps
-  echo "replace space by _ in folder names"
-  find . -type d -name "* *" | while read FNAME; do mv "$FNAME" "${FNAME// /_}"; done
-  echo "zipping libraries per board"
-  for i in */
-  do
-   zip -r "${i%/}-libraries.zip" "$i"
-  done
-  ls -lA
-  mv *.zip ../../toDeploy
-)
-# remove binaries for *-all*, *-test* env and only zip containing *-test*
-rm -f *-all*.bin *-test*.bin *-test*.zip
-echo "zipping code and licence"
-zip -r OpenMQTTGateway_sources.zip main LICENSE.txt
-mv *.zip toDeploy
-mv *.bin toDeploy
-
-ls -lA toDeploy
diff --git a/scripts/preview_site.js b/scripts/preview_site.js
new file mode 100644
index 0000000..6282b87
--- /dev/null
+++ b/scripts/preview_site.js
@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+'use strict';
+
+// Minimal HTTPS static server for generated/site only.
+
+const fs = require('fs');
+const path = require('path');
+const https = require('https');
+const mime = require('mime-types');
+
+const repoRoot = path.resolve(__dirname, '..');
+const siteRoot = path.join(repoRoot, 'generated', 'site');
+const port = parseInt(process.argv[2] || 8443, 10);
+const keyFile = process.argv[3] || path.join(repoRoot, '.ssl', 'key.pem');
+const certFile = process.argv[4] || path.join(repoRoot, '.ssl', 'cert.pem');
+
+if (!fs.existsSync(siteRoot)) {
+    console.error(`Error: folder not found: ${siteRoot}`);
+    process.exit(1);
+}
+
+if (!fs.existsSync(keyFile) || !fs.existsSync(certFile)) {
+    console.error(`Error: SSL certificates not found at ${keyFile} or ${certFile}`);
+    console.error('Use scripts/ensure_ssl_certs.js to generate them.');
+    process.exit(1);
+}
+
+const server = https.createServer({
+    key: fs.readFileSync(keyFile),
+    cert: fs.readFileSync(certFile)
+}, (req, res) => {
+    const reqPath = decodeURIComponent(req.url.split('?')[0]);
+    const safePath = reqPath.endsWith('/') ? `${reqPath}index.html` : reqPath;
+    const filePath = path.join(siteRoot, safePath);
+
+    if (!filePath.startsWith(siteRoot)) {
+        res.writeHead(403);
+        return res.end('Forbidden');
+    }
+
+    fs.stat(filePath, (err, stats) => {
+        if (err || !stats.isFile()) {
+            res.writeHead(404);
+            return res.end('Not Found');
+        }
+        const type = mime.contentType(path.extname(filePath)) || 'application/octet-stream';
+        res.writeHead(200, { 'Content-Type': type });
+        fs.createReadStream(filePath).pipe(res);
+    });
+});
+
+server.listen(port, '0.0.0.0', () => {
+    console.log(`Serving generated/site over HTTPS at https://localhost:${port}/`);
+    console.log(`Serving generated/site over HTTPS at https://<host-ip>:${port}/`);
+    console.log(`Note: remember that if you are testing DEV site you should go on https://<host-ip>:${port}/dev/`);
+});
+
+process.on('SIGINT', () => {
+    server.close(() => process.exit());
+});
diff --git a/scripts/replace_lib.py b/scripts/replace_lib.py
index a792cc5..9e69e2d 100644
--- a/scripts/replace_lib.py
+++ b/scripts/replace_lib.py
@@ -1,4 +1,5 @@
-
+# Replaces BLE library with custom version during PlatformIO build
+# Used by: Currently unused (utility script for BLE library replacement)
 import shutil
 import os
 import hashlib
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index aca7b9e..6a4e78d 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -45,7 +45,7 @@ CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=100
 # CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
 CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
-CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 CONFIG_BTDM_CTRL_HLI=y
@@ -66,7 +66,7 @@ CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
 CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y
 # CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set
 CONFIG_BT_NIMBLE_LOG_LEVEL=1
-CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
 CONFIG_BT_NIMBLE_MAX_BONDS=3
 CONFIG_BT_NIMBLE_MAX_CCCDS=8
 CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0
@@ -85,14 +85,14 @@ CONFIG_BT_NIMBLE_SM_SC=y
 # CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS is not set
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nimble"
 CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
-CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256
+CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=185
 CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0
-CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=12
 CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
 CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=15
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
-CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12
+CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=8
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -125,6 +125,8 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
 # end of TLS Key Exchange Methods
 
+CONFIG_MBEDTLS_DHM_C=y
+
 #
 # Arduino Configuration
 #
@@ -135,7 +137,7 @@ CONFIG_AUTOSTART_ARDUINO=y
 CONFIG_ARDUINO_RUN_CORE1=y
 # CONFIG_ARDUINO_RUN_NO_AFFINITY is not set
 CONFIG_ARDUINO_RUNNING_CORE=1
-CONFIG_ARDUINO_LOOP_STACK_SIZE=8192
+CONFIG_ARDUINO_LOOP_STACK_SIZE=17500
 # CONFIG_ARDUINO_EVENT_RUN_CORE0 is not set
 CONFIG_ARDUINO_EVENT_RUN_CORE1=y
 # CONFIG_ARDUINO_EVENT_RUN_NO_AFFINITY is not set
@@ -176,43 +178,91 @@ CONFIG_ARDUHAL_PARTITION_SCHEME_MIN_SPIFFS=y
 CONFIG_ARDUHAL_PARTITION_SCHEME="min_spiffs"
 # CONFIG_AUTOCONNECT_WIFI is not set
 CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
-CONFIG_ARDUINO_SELECTIVE_ArduinoOTA=y
-CONFIG_ARDUINO_SELECTIVE_AsyncUDP=y
-# CONFIG_ARDUINO_SELECTIVE_AzureIoT is not set
-# CONFIG_ARDUINO_SELECTIVE_BLE is not set
-# CONFIG_ARDUINO_SELECTIVE_BluetoothSerial is not set
-CONFIG_ARDUINO_SELECTIVE_DNSServer=y
-CONFIG_ARDUINO_SELECTIVE_EEPROM=y
-CONFIG_ARDUINO_SELECTIVE_ESP32=y
-CONFIG_ARDUINO_SELECTIVE_ESPmDNS=y
-CONFIG_ARDUINO_SELECTIVE_FFat=y
-CONFIG_ARDUINO_SELECTIVE_FS=y
-CONFIG_ARDUINO_SELECTIVE_HTTPClient=y
-CONFIG_ARDUINO_SELECTIVE_LITTLEFS=y
-CONFIG_ARDUINO_SELECTIVE_NetBIOS=y
-CONFIG_ARDUINO_SELECTIVE_Preferences=y
-CONFIG_ARDUINO_SELECTIVE_SD=y
-CONFIG_ARDUINO_SELECTIVE_SD_MMC=y
-# CONFIG_ARDUINO_SELECTIVE_SimpleBLE is not set
 CONFIG_ARDUINO_SELECTIVE_SPI=y
-CONFIG_ARDUINO_SELECTIVE_SPIFFS=y
+CONFIG_ARDUINO_SELECTIVE_Wire=y
+CONFIG_ARDUINO_SELECTIVE_ESP_SR=y
+# CONFIG_ARDUINO_SELECTIVE_EEPROM is not set
+CONFIG_ARDUINO_SELECTIVE_Preferences=y
 CONFIG_ARDUINO_SELECTIVE_Ticker=y
 CONFIG_ARDUINO_SELECTIVE_Update=y
+# CONFIG_ARDUINO_SELECTIVE_Zigbee is not set
+CONFIG_ARDUINO_SELECTIVE_FS=y
+# CONFIG_ARDUINO_SELECTIVE_SD is not set
+# CONFIG_ARDUINO_SELECTIVE_SD_MMC is not set
+CONFIG_ARDUINO_SELECTIVE_SPIFFS=y
+# CONFIG_ARDUINO_SELECTIVE_FFat is not set
+# CONFIG_ARDUINO_SELECTIVE_LittleFS is not set
+CONFIG_ARDUINO_SELECTIVE_Network=y
+CONFIG_ARDUINO_SELECTIVE_Ethernet=y
+CONFIG_ARDUINO_SELECTIVE_PPP=y
+CONFIG_ARDUINO_SELECTIVE_ArduinoOTA=y
+CONFIG_ARDUINO_SELECTIVE_AsyncUDP=y
+CONFIG_ARDUINO_SELECTIVE_DNSServer=y
+CONFIG_ARDUINO_SELECTIVE_ESPmDNS=y
+CONFIG_ARDUINO_SELECTIVE_HTTPClient=y
+# CONFIG_ARDUINO_SELECTIVE_Matter is not set
+# CONFIG_ARDUINO_SELECTIVE_NetBIOS is not set
 CONFIG_ARDUINO_SELECTIVE_WebServer=y
 CONFIG_ARDUINO_SELECTIVE_WiFi=y
-CONFIG_ARDUINO_SELECTIVE_WiFiClientSecure=y
-CONFIG_ARDUINO_SELECTIVE_WiFiProv=y
-CONFIG_ARDUINO_SELECTIVE_Wire=y
+CONFIG_ARDUINO_SELECTIVE_NetworkClientSecure=y
+# CONFIG_ARDUINO_SELECTIVE_WiFiProv is not set
+# CONFIG_ARDUINO_SELECTIVE_BLE is not set
+# CONFIG_ARDUINO_SELECTIVE_BluetoothSerial is not set
+# CONFIG_ARDUINO_SELECTIVE_SimpleBLE is not set
+# CONFIG_ARDUINO_SELECTIVE_RainMaker is not set
+# CONFIG_ARDUINO_SELECTIVE_OpenThread is not set
+# CONFIG_ARDUINO_SELECTIVE_Insights is not set
+# end of Arduino Configuration
 # end of Arduino Configuration
 
 # CONFIG_ESP32_WIFI_IRAM_OPT is not set
 # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
 
-#
-# SPI configuration
-#
-# CONFIG_SPI_MASTER_IN_IRAM is not set
-# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set
-# CONFIG_SPI_SLAVE_IN_IRAM is not set
-# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
-# end of SPI configuration
\ No newline at end of file
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_BOOTLOADER_LOG_LEVEL=0
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL=1
+
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
+CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
+CONFIG_ESP_TASK_WDT_PANIC=y
+CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
+CONFIG_HEAP_POISONING_LIGHT=y
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
+CONFIG_HTTPD_WS_SUPPORT=y
+# CONFIG_LOG_COLORS is not set
+
+# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
+CONFIG_LWIP_TCP_SYNMAXRTX=6
+CONFIG_LWIP_TCP_MSS=1436
+CONFIG_LWIP_TCP_RTO_TIME=3000
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
+CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
+CONFIG_LWIP_MAX_SOCKETS=10
+CONFIG_LWIP_IP_FORWARD=y
+CONFIG_LWIP_IPV4_NAPT=y
+CONFIG_LWIP_DHCP_RESTORE_LAST_IP=n
+CONFIG_LWIP_DHCP_OPTIONS_LEN=128
+CONFIG_LWIP_SNTP_MAX_SERVERS=3
+CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
+CONFIG_LWIP_DHCP_GET_NTP_SRV=y
+# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
+# CONFIG_LWIP_IPV6_DHCP6 is not set
+# CONFIG_LWIP_PPP_SUPPORT is not set
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
+CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
+CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
+CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y