From d913f7649bb54bd442b1e68cb597915bae538d70 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 10 Dec 2024 22:58:10 +0100
Subject: [PATCH 01/49] FEMS Backports 2024-12-10 (#2916)

* Edge
  * ENTSO-E: added preferred resolution config
  * ModbusTcpApi: fix updating ModbusRecordTable
    - Clears ModbusList on initializing => components, that are removed in the modbus component_ids cant be accessed by qmodmaster anymore.
    - Fixed ModbusComponents getting actually removed out of array => resulted in write commands not being executed after esscluster change
    - High Prio because this bug could lead to serious problems on our systems, especially on Industrial systems.
  * ToU: resolution property addition in ENTSO-E App + fix ENTSO-E timing
    - Added resolution property to be able to be configurable through APP.
    - Fixed the ENTSO-E Bug where prices are mismatched by 15 mins.
  * Prediction ValueRange: fix possible NPE if value is null
    - In my refactoring of the Prediction class I missed handling of a situation where a NullPointerException could happen.
    - This leads to the problem that - if no local historic values are existing, e.g. after system outage or at IBN, the prediction fails with a NullPointerException.
  * Time-of-Use-Tariff: apply ESS_MAX_SOC in Run-State
    - Unfortunately this had been lost during splitting of Optimizer and ToU-Controller
    - Also increasing the value to 94 % to take into account larger storage systems
  * EVCS Mennekes Read Only implementation
    - Mennekes Implementation from OpenEMS PR #2082
    - Added App for Mennekes
    - Added new App Category for Read Only Evcs
    - Added Read only to mennekes config
  * Core: add Greece to safety country list
  * Backport GoodWe Grid.Meter fix; relates to #2895

* UI
  * dynamic scaling for charts and start scales at least at 0
    - Redoing feature that yAxis scale has dynamic scale and didnt have to start at 0
  * adjust server not accessible page for local monitoring
    - Adjusting server not accessible page for local monitoring,
  * update last updated timestamp for empty edge
    - Updating `lastUpdated` timestamp even if edge config is empty, `_sum/State` still exists
  * show absolute value for grid current value in modal
    - Use absolute value for grid modal current, text on the current value shows state `grid-feed-in` or `grid-buy`
  * Offline-Page Translations
  * ToU chart bugfix regarding dynamic scaling
  * Darkmode
    - some color changes were done for both light and dark mode

---------

Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Co-authored-by: Fabian Brandtner <10850256+fabian94533@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-authored-by: Anas Shetla <141644226+AnasShetla@users.noreply.github.com>
Co-authored-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
---
 .../alerting/scheduler/MessageScheduler.java  |   1 +
 .../io/openems/backend/alerting/Dummy.java    |   4 +-
 ...yHistoricTimeseriesExportXlsxResponse.java |   2 -
 .../common/oem/DummyOpenemsEdgeOem.java       |   7 +-
 io.openems.edge.application/EdgeApp.bndrun    |   4 +-
 .../bridge/modbus/api/element/WordOrder.java  |   1 -
 .../onewire/jsonrpc/GetDeviceResponse.java    |   2 -
 .../api/modbus/AbstractModbusTcpApi.java      |  37 +-
 .../GetModbusProtocolExportXlsxResponse.java  |   2 -
 .../jsonrpc/GetModbusProtocolResponse.java    |   2 -
 .../controller/ess/timeofusetariff/Utils.java |  13 +-
 .../ess/timeofusetariff/v1/UtilsV1.java       |   2 +-
 .../ess/timeofusetariff/UtilsTest.java        |   8 +-
 .../ess/timeofusetariff/v1/UtilsV1Test.java   |  12 +
 .../edge/controller/evcs/ControllerEvcs.java  |  22 +-
 .../controller/evcs/ControllerEvcsImpl.java   |   7 +-
 .../controller/evcs/translation_de.properties |   1 +
 .../controller/evcs/translation_en.properties |   1 +
 .../openems/edge/app/enums/SafetyCountry.java |   1 +
 .../evcs/readonly/MennekesEvcsReadOnly.java   | 177 ++++++
 .../edge/app/timeofusetariff/EntsoE.java      |  45 +-
 .../core/appmanager/OpenemsAppCategory.java   |   5 +
 .../formly/builder/InputBuilder.java          |   2 +-
 .../core/appmanager/translation_de.properties |   9 +
 .../core/appmanager/translation_en.properties |   9 +
 .../jsonrpc/ChannelExportXlsxResponse.java    |   2 -
 .../edge/core/host/NetworkConfiguration.java  |   2 -
 .../jsonrpc/ExecuteSystemCommandResponse.java |   2 -
 .../jsonrpc/ExecuteSystemRestartResponse.java |   2 -
 .../jsonrpc/GetNetworkConfigResponse.java     |   2 -
 .../jsonrpc/GetSystemUpdateStateResponse.java |   2 -
 .../io/openems/edge/core/appmanager/Apps.java |  18 +-
 .../core/appmanager/TestTranslations.java     |   1 +
 .../edge/energy/v1/optimizer/UtilsV1.java     |   1 -
 .../optimizer/SimulationResultTest.java       |   2 +-
 .../edge/ess/power/api/Constraint.java        |   1 -
 .../src/io/openems/edge/evcs/api/Evcs.java    |   8 +
 .../io/openems/edge/evcs/api/ManagedEvcs.java |   1 -
 .../edge/evcs/hardybarth/EvcsHardyBarth.java  |   1 -
 io.openems.edge.evcs.mennekes/.classpath      |  12 +
 io.openems.edge.evcs.mennekes/.gitignore      |   2 +
 io.openems.edge.evcs.mennekes/.project        |  23 +
 .../org.eclipse.core.resources.prefs          |   2 +
 io.openems.edge.evcs.mennekes/bnd.bnd         |  17 +
 io.openems.edge.evcs.mennekes/readme.adoc     |  15 +
 .../edge/evcs/mennekes/AvailableState.java    |  45 ++
 .../io/openems/edge/evcs/mennekes/Config.java |  42 ++
 .../edge/evcs/mennekes/EvcsMennekes.java      | 546 ++++++++++++++++++
 .../edge/evcs/mennekes/EvcsMennekesImpl.java  | 403 +++++++++++++
 .../evcs/mennekes/MennekesErrorStates.java    |  84 +++
 .../edge/evcs/mennekes/MennekesOcppState.java |  41 ++
 .../edge/evcs/mennekes/VehicleState.java      |  36 ++
 .../evcs/mennekes/translation_de.properties   |  23 +
 .../evcs/mennekes/translation_en.properties   |  23 +
 io.openems.edge.evcs.mennekes/test/.gitignore |   0
 .../edge/evcs/mennekes/MennekesTest.java      |  53 ++
 .../openems/edge/evcs/mennekes/MyConfig.java  | 100 ++++
 .../goodwe/gridmeter/GoodWeGridMeterImpl.java |  49 +-
 .../gridmeter/GoodWeGridMeterImplTest.java    |   4 +-
 .../predictor/api/prediction/Prediction.java  |   6 +-
 .../predictor/api/oneday/PredictionTest.java  |  36 --
 .../api/prediction/PredictionTest.java        |  64 ++
 .../acting/SimulatorGridMeterActingImpl.java  |   2 +-
 .../timeofusetariff/api/TimeOfUsePrices.java  |  11 +-
 .../edge/timeofusetariff/entsoe/Config.java   |   3 +
 .../timeofusetariff/entsoe/Resolution.java    |  24 +
 .../timeofusetariff/entsoe/TouEntsoeImpl.java |   3 +-
 .../edge/timeofusetariff/entsoe/Utils.java    |  47 +-
 .../edge/timeofusetariff/entsoe/MyConfig.java |  11 +
 .../timeofusetariff/entsoe/ParserTest.java    |  77 ++-
 .../timeofusetariff/entsoe/TouEntsoeTest.java |   1 +
 io.openems.wrapper/fastexcel.bnd              |   2 +-
 ui/package-lock.json                          |  24 +-
 ui/src/app/app.component.html                 |  17 +-
 .../view/component/changelog.constants.ts     |   2 +-
 .../chart/totalchart.component.ts             |   6 +-
 .../ChannelThreshold/flat/flat.html           |   2 +-
 .../Ess/GridoptimizedCharge/chart/chart.ts    |   7 +-
 .../chart/sellToGridLimitChart.component.ts   |   9 +-
 .../Ess/GridoptimizedCharge/flat/flat.html    |   2 +-
 .../Ess/TimeOfUseTariff/chart/chart.ts        |  18 +-
 .../Ess/TimeOfUseTariff/flat/flat.html        |   2 +-
 .../Io/DigitalOutput/chart/chart.ts           |   6 +-
 .../Io/DigitalOutput/details/chart/chart.ts   |   4 +-
 .../Io/DigitalOutput/flat/flat.html           |   2 +-
 .../Io/heatingelement/flat/flat.html          |   2 +-
 .../Controller/ModbusTcpApi/flat/flat.html    |  13 +-
 .../app/edge/history/abstracthistorychart.ts  |  16 +-
 .../history/common/autarchy/flat/flat.html    |   2 +-
 .../history/common/consumption/chart/chart.ts |  13 +-
 .../details/chart/consumptionMeter.ts         |   4 +-
 .../common/consumption/details/chart/evcs.ts  |   4 +-
 .../common/energy/chart/channels.spec.ts      |  84 ++-
 .../edge/history/common/energy/chart/chart.ts |  15 +-
 .../edge/history/common/energy/flat/flat.html |   5 +-
 .../edge/history/common/grid/chart/chart.ts   |   5 +-
 .../common/grid/details/chart/chart.ts        |   3 +-
 .../common/production/chart/totalChart.ts     |   5 +-
 .../common/production/details/chart/sum.ts    |   3 +-
 .../selfconsumption/chart/chart.component.ts  |   3 +-
 .../common/selfconsumption/flat/flat.html     |   5 +-
 ...ayedselltogridchartoverview.component.html |   8 +-
 .../delayedselltogrid/widget.component.html   |   4 +-
 .../edge/history/heatpump/chart.component.ts  |   6 +-
 .../heatpumpchartoverview.component.html      |   8 +-
 .../history/heatpump/widget.component.html    |   9 +-
 ...ricpeakshavingchartoverview.component.html |   8 +-
 .../asymmetric/widget.component.html          |   5 +-
 ...ricpeakshavingchartoverview.component.html |   8 +-
 .../symmetric/widget.component.html           |   4 +-
 ...lotpeakshavingchartoverview.component.html |   8 +-
 .../timeslot/widget.component.html            |   4 +-
 ui/src/app/edge/history/shared.ts             |  11 +-
 .../history/storage/socchart.component.ts     |  12 +-
 .../storagechartoverview.component.html       |  12 +-
 .../history/storage/totalchart.component.ts   |   1 +
 .../history/storage/widget.component.html     |   6 +-
 .../Channelthreshold/Channelthreshold.ts      |   2 +-
 .../edge/live/Controller/ChpSoc/ChpSoc.html   |   2 +-
 .../ChpSoc/modal/modal.component.html         |  11 +-
 .../Ess/FixActivePower/flat/flat.html         |   3 +-
 .../Ess/FixActivePower/modal/modal.html       |   2 +-
 .../Ess/GridOptimizedCharge/modal/modal.html  |   2 +-
 .../TimeOfUseTariff/Ess_TimeOfUseTariff.ts    |   7 +-
 .../Ess/TimeOfUseTariff/flat/flat.html        |   3 +-
 .../Ess/TimeOfUseTariff/modal/modal.html      |   2 +-
 .../TimeOfUseTariff/modal/powerSocChart.ts    |  26 +-
 .../TimeOfUseTariff/modal/statePriceChart.ts  |   3 +-
 .../edge/live/Controller/Evcs/flat/flat.html  |   4 +-
 .../edge/live/Controller/Evcs/flat/flat.ts    |   2 +
 .../live/Controller/Evcs/modal/modal.html     |  91 ++-
 .../edge/live/Controller/Evcs/modal/modal.ts  |   3 +
 .../Io_ChannelSingleThreshold.html            |   3 +-
 .../modal/modal.component.html                |  12 +-
 .../FixDigitalOutput/Io_FixDigitalOutput.html |   4 +-
 .../modal/modal.component.html                |  13 +-
 .../Io/HeatingElement/flat/flat.html          |   3 +-
 .../Io/HeatingElement/modal/modal.html        |   2 +-
 .../Controller/Io/Heatpump/Io_Heatpump.html   |   3 +-
 .../Io/Heatpump/modal/modal.component.html    |   9 +-
 .../Controller/ModbusTcpApi/flat/flat.html    |   6 +-
 .../PeakShaving/Asymmetric/Asymmetric.html    |   3 +-
 .../Asymmetric/modal/modal.component.html     |   3 +-
 .../PeakShaving/Symmetric/Symmetric.html      |   3 +-
 .../Symmetric/modal/modal.component.html      |   3 +-
 .../Symmetric_TimeSlot.html                   |   4 +-
 .../modal/modal.component.html                |   3 +-
 .../modal/modal.component.html                |   3 +-
 .../Evcs_Api_Cluster/Evcs_Api_Cluster.html    |   3 +-
 .../modal/evcsCluster-modal.page.html         |   3 +-
 .../edge/live/common/autarchy/flat/flat.html  |   2 +-
 .../live/common/consumption/flat/flat.html    |   2 +-
 .../app/edge/live/common/grid/modal/modal.ts  |   3 +-
 .../common/selfconsumption/flat/flat.html     |   4 +-
 .../common/storage/modal/modal.component.html |   8 +-
 .../delayedselltogrid.component.html          |   3 +-
 .../modal/modal.component.html                |   3 +-
 .../chart/section/consumption.component.html  |  12 +-
 .../chart/section/grid.component.html         |  12 +-
 .../chart/section/grid.component.ts           |   2 +-
 .../chart/section/production.component.html   |  11 +-
 .../chart/section/production.component.ts     |   2 +-
 .../chart/section/storage.component.html      |  13 +-
 .../energymonitor.component.html              |   4 +-
 ui/src/app/edge/live/live.component.html      |   5 +-
 ui/src/app/edge/live/live.component.ts        |   2 +-
 ui/src/app/edge/live/livedataservice.ts       |   9 +-
 .../settings/channels/channels.component.html |   9 +-
 .../component/install/index.component.html    |   5 +-
 .../component/install/install.component.html  |   6 +-
 .../component/update/index.component.html     |   5 +-
 .../component/update/update.component.html    |   8 +-
 .../shared/components/constant-line.scss      |  18 +
 .../profile/aliasupdate.component.html        |   2 +-
 .../settings/profile/profile.component.html   |   7 +-
 .../app/edge/settings/settings.component.html |  32 +-
 .../system/oe-system-update.component.html    |   6 +-
 .../systemlog/systemlog.component.html        |   4 +-
 ui/src/app/index/login.component.ts           |  16 +-
 .../index/overview/overview.component.html    |  10 +-
 ui/src/app/index/shared/loading-screen.html   |  41 +-
 .../components/chart/abstracthistorychart.ts  |  20 +-
 .../components/chart/chart.constants.spec.ts  |   2 +-
 .../components/chart/chart.constants.ts       |  57 +-
 ui/src/app/shared/components/chart/chart.html |  14 +-
 .../edge/offline/offline.component.ts         |  56 +-
 .../components/edge/offline/offline.module.ts |   2 +
 .../components/edge/offline/offline.spec.ts   |  23 +
 .../flat-widget-line/flat-widget-line.html    |   2 +-
 .../flat-widget-percentagebar.html            |  16 +-
 .../flat/flat-widget.component.html           |   4 +-
 ui/src/app/shared/components/flat/flat.html   |   7 +-
 .../app/shared/components/footer/footer.html  |   8 +-
 .../subnavigation/footerNavigation.html       |  14 +-
 .../components/header/header.component.html   |  37 +-
 .../modal/modal-button/modal-button.html      |   9 +-
 .../modal/modal-button/modal-button.ts        |   1 +
 ui/src/app/shared/components/modal/modal.html |   8 +-
 .../modal-horizontal-line.html                |   4 +-
 .../pickdate/pickdate.component.html          |   8 +-
 .../pickdate/popover/popover.component.ts     |  41 +-
 .../pickdate/popover/popover.spec.ts          |   1 +
 .../app/shared/components/shared/converter.ts |  15 +
 .../shared/components/shared/dataservice.ts   |   2 +-
 .../components/shared/testing/common.ts       |  69 ++-
 .../components/shared/testing/tester.ts       |  24 +-
 .../status/single/status.component.html       |   7 +-
 ui/src/app/shared/service/defaulttypes.ts     |  15 +-
 ui/src/app/shared/service/utils.ts            |   8 +-
 ui/src/app/shared/service/websocket.ts        |   6 +-
 ui/src/app/shared/shared.ts                   |   4 +
 ui/src/app/shared/utils/time/timeutils.ts     |  16 +
 ui/src/app/user/user.component.html           |  47 +-
 ui/src/app/user/user.component.ts             |  41 ++
 ui/src/assets/i18n/cz.json                    |   2 +-
 ui/src/assets/i18n/de.json                    |  21 +-
 ui/src/assets/i18n/en.json                    |  17 +-
 ui/src/assets/img/fenecon-logo-dark.png       | Bin 0 -> 21590 bytes
 ui/src/assets/img/fenecon-logo-light.png      | Bin 0 -> 17727 bytes
 ui/src/environments/index.scss                | 259 +++++++++
 ui/src/global-ion-custom.scss                 |  19 +
 ui/src/global.scss                            | 143 ++++-
 ui/src/index.html                             |   2 +-
 ui/src/themes/openems/scss/variables.scss     | 105 +---
 224 files changed, 3542 insertions(+), 751 deletions(-)
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_de.properties
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_en.properties
 create mode 100644 io.openems.edge.core/src/io/openems/edge/app/evcs/readonly/MennekesEvcsReadOnly.java
 create mode 100644 io.openems.edge.evcs.mennekes/.classpath
 create mode 100644 io.openems.edge.evcs.mennekes/.gitignore
 create mode 100644 io.openems.edge.evcs.mennekes/.project
 create mode 100644 io.openems.edge.evcs.mennekes/.settings/org.eclipse.core.resources.prefs
 create mode 100644 io.openems.edge.evcs.mennekes/bnd.bnd
 create mode 100644 io.openems.edge.evcs.mennekes/readme.adoc
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/AvailableState.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/Config.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekes.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesErrorStates.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesOcppState.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/VehicleState.java
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_de.properties
 create mode 100644 io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_en.properties
 create mode 100644 io.openems.edge.evcs.mennekes/test/.gitignore
 create mode 100644 io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MennekesTest.java
 create mode 100644 io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MyConfig.java
 delete mode 100644 io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/oneday/PredictionTest.java
 create mode 100644 io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/prediction/PredictionTest.java
 create mode 100644 io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Resolution.java
 create mode 100644 ui/src/app/edge/settings/energy-journey/shared/components/constant-line.scss
 create mode 100644 ui/src/app/shared/components/edge/offline/offline.spec.ts
 create mode 100644 ui/src/assets/img/fenecon-logo-dark.png
 create mode 100644 ui/src/assets/img/fenecon-logo-light.png
 create mode 100644 ui/src/environments/index.scss

diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java
index 7585adf772c..51a760bcc7c 100644
--- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java
+++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java
@@ -12,6 +12,7 @@
 
 /**
  * Schedules one or more {@link Message} for type {@link T} to a specific time.
+ * 
  * <p>
  * After the specified time is reached, the scheduler sends the Messages to
  * their {@link Handler} and removes them from itself.
diff --git a/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java b/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java
index 84d406508e8..66feef1c4ab 100644
--- a/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java
+++ b/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java
@@ -224,14 +224,14 @@ public void leap(long amount) {
 		 * Try to advance the Clock to a specific amount of minutes after
 		 * initialization. If the given point is ahead, the time will leap by the
 		 * missing amount. If the given point is behind, nothing will happen.
+		 * 
 		 * <p>
 		 * A return value >=0 means, the clock has advanced the given amount in minutes
 		 * with this call.
-		 * </p>
+		 * 
 		 * <p>
 		 * A return value <0 means, the clock has already advanced the given amount
 		 * above.
-		 * </p>
 		 *
 		 * @param point to advance to
 		 * @return difference
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponse.java b/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponse.java
index acf64aba840..5e9fba1f529 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponse.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponse.java
@@ -36,8 +36,6 @@
 /**
  * Represents a JSON-RPC Response for 'queryHistoricTimeseriesExportXlxs'.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
index 790f1fbf9c9..f5327adf50d 100644
--- a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
+++ b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
@@ -81,13 +81,14 @@ public SystemUpdateParams getSystemUpdateParams() {
 			.put("App.Api.RestJson.ReadOnly", "") //
 			.put("App.Api.RestJson.ReadWrite", "") //
 			.put("App.Timedata.InfluxDb", "")//
+			.put("App.Evcs.Alpitronic", "") //
+			.put("App.Evcs.Cluster", "") //
 			.put("App.Evcs.HardyBarth", "") //
-			.put("App.Evcs.Keba", "") //
 			.put("App.Evcs.IesKeywatt", "") //
-			.put("App.Evcs.Alpitronic", "") //
+			.put("App.Evcs.Keba", "") //
+			.put("App.Evcs.Mennekes.ReadOnly", "") //
 			.put("App.Evcs.Webasto.Next", "") //
 			.put("App.Evcs.Webasto.Unite", "") //
-			.put("App.Evcs.Cluster", "") //
 			.put("App.Hardware.KMtronic8Channel", "") //
 			.put("App.Heat.HeatPump", "") //
 			.put("App.Heat.CHP", "") //
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index c47df44769a..8c9a2f48182 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -123,6 +123,7 @@
 	bnd.identity;id='io.openems.edge.evcs.goe.chargerhome',\
 	bnd.identity;id='io.openems.edge.evcs.hardybarth',\
 	bnd.identity;id='io.openems.edge.evcs.keba.kecontact',\
+	bnd.identity;id='io.openems.edge.evcs.mennekes',\
 	bnd.identity;id='io.openems.edge.evcs.ocpp.abl',\
 	bnd.identity;id='io.openems.edge.evcs.ocpp.common',\
 	bnd.identity;id='io.openems.edge.evcs.ocpp.ies.keywatt.singleccs',\
@@ -193,7 +194,7 @@
 	bnd.identity;id='io.openems.edge.timeofusetariff.rabotcharge',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.swisspower',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.tibber',\
-
+	
 -runbundles: \
 	Java-WebSocket;version='[1.5.4,1.5.5)',\
 	bcpkix;version='[1.79.0,1.79.1)',\
@@ -300,6 +301,7 @@
 	io.openems.edge.evcs.goe.chargerhome;version=snapshot,\
 	io.openems.edge.evcs.hardybarth;version=snapshot,\
 	io.openems.edge.evcs.keba.kecontact;version=snapshot,\
+	io.openems.edge.evcs.mennekes;version=snapshot,\
 	io.openems.edge.evcs.ocpp.abl;version=snapshot,\
 	io.openems.edge.evcs.ocpp.common;version=snapshot,\
 	io.openems.edge.evcs.ocpp.ies.keywatt.singleccs;version=snapshot,\
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java
index 0a3d508f1bd..a666988038a 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java
@@ -3,7 +3,6 @@
 /**
  * Defines the word order.
  *
- * <p>
  * <ul>
  * <li>LSWMSW = Least significant word, most significant word
  * <li>MSWLSW = Most significant word, least significant word
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
index e3dd4845c81..04549846a09 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
@@ -16,8 +16,6 @@
 /**
  * Wraps a JSON-RPC Response to "getDevices" Request.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
index 435021672eb..7aff8bc95ec 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
@@ -87,15 +87,15 @@ protected synchronized void addComponent(OpenemsComponent component) {
 	protected abstract Consumer<Entry<WriteChannel<?>, WriteObject>> handleWrites();
 
 	protected abstract void setOverrideStatus(Status status);
-	
+
 	protected abstract Runnable handleTimeouts();
 
 	protected synchronized void removeComponent(OpenemsComponent component) {
+		this._components.remove(component);
 		if (this.invalidComponents.remove(component)) {
 			if (this.invalidComponents.isEmpty()) {
 				this._setComponentNoModbusApiFault(false);
 			}
-			this._components.remove(component);
 			return;
 		}
 		this.updateComponents();
@@ -231,8 +231,9 @@ protected void forever() {
 					this.slave.addProcessImage(UNIT_ID, AbstractModbusTcpApi.this.processImage);
 					if (isEnabled()) {
 						this.slave.open();
-						AbstractModbusTcpApi.this.logInfo(this.log, AbstractModbusTcpApi.this.implementationName
-							+ " started on port [" + port + "] with UnitId [" + AbstractModbusTcpApi.UNIT_ID + "].");
+						AbstractModbusTcpApi.this.logInfo(this.log,
+								AbstractModbusTcpApi.this.implementationName + " started " //
+										+ "on port [" + port + "] with UnitId [" + AbstractModbusTcpApi.UNIT_ID + "].");
 					}
 				} catch (ModbusException e) {
 					ModbusSlaveFactory.close();
@@ -274,6 +275,7 @@ protected int getCycleTime() {
 	 */
 	private void initializeModbusRecords(Meta metaComponent, String[] componentIds) {
 		// Add generic header
+		this.records.clear();
 		this.records.put(0, new ModbusRecordUint16Hash(0, "OpenEMS"));
 		var nextAddress = 1;
 
@@ -492,21 +494,20 @@ protected ModbusSlave getPossiblyDisabledComponent(String componentId) {
 
 	public static record ConfigRecord(String id, String alias, boolean enabled, Meta metaComponent,
 			String[] componentIds, int apiTimeout, int port, int maxConcurrentConnections) {
-		
+
 		@Override
 		public boolean equals(Object other) {
-			
-		    if (this == other) {
-		        return true;
-		    }
-		    if (other == null) {
-		        return false;
-		    }   
-		    if (!(other instanceof ConfigRecord)) {
-		        return false;
-		    }
+			if (this == other) {
+				return true;
+			}
+			if (other == null) {
+				return false;
+			}
+			if (!(other instanceof ConfigRecord)) {
+				return false;
+			}
 			ConfigRecord config = (ConfigRecord) other;
-			
+
 			if (config.id.equals(this.id) && config.alias.equals(this.alias) //
 					&& config.enabled == this.enabled && config.metaComponent.equals(this.metaComponent) //
 					&& Arrays.equals(config.componentIds, this.componentIds) //
@@ -514,14 +515,10 @@ public boolean equals(Object other) {
 					&& config.maxConcurrentConnections == this.maxConcurrentConnections) {
 				return true;
 			}
-			
 			return false;
-			
 		}
 	}
 
-	;
-
 	/**
 	 * Format a given channelAddress to a ChannelId.
 	 * 
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java
index b86d0a983bd..9ddab6e1a8a 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java
@@ -25,8 +25,6 @@
 /**
  * Represents a JSON-RPC Response for 'getModbusProtocolExportXlsx'.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java
index a46c4436da7..7f53ac28cef 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java
@@ -15,8 +15,6 @@
 /**
  * Wraps a JSON-RPC Response to "getModbusProtocol" Request.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java
index c49f3bfb7b7..8c945077d45 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java
@@ -38,7 +38,7 @@ private Utils() {
 	}
 
 	/** Keep some buffer to avoid scheduling errors because of bad predictions. */
-	public static final float ESS_MAX_SOC = 90F;
+	public static final float ESS_MAX_SOC = 94F;
 
 	/**
 	 * C-Rate (capacity divided by time) during {@link StateMachine#CHARGE_GRID}.
@@ -83,7 +83,7 @@ public static ApplyState calculateAutomaticMode(Sum sum, ManagedSymmetricEss ess
 		final var pwrDelayDischarge = calculateDelayDischargePower(ess);
 		final var pwrChargeGrid = calculateChargeGridPower(period.context().essChargeInChargeGrid(), ess,
 				essActivePower, gridActivePower, maxChargePowerFromGrid);
-		actualState = postprocessRunState(period.state(), pwrBalancing, pwrDelayDischarge, pwrChargeGrid);
+		actualState = postprocessRunState(ess, period.state(), pwrBalancing, pwrDelayDischarge, pwrChargeGrid);
 
 		// Get and apply ActivePower Less-or-Equals Set-Point
 		setPoint = switch (actualState) {
@@ -103,6 +103,7 @@ public static ApplyState calculateAutomaticMode(Sum sum, ManagedSymmetricEss ess
 	 * NOTE: this can be useful, if live operation deviates from predicted
 	 * operation, e.g. because predictions were wrong.
 	 * 
+	 * @param ess               the {@link ManagedSymmetricEss}
 	 * @param state             the initial state
 	 * @param pwrBalancing      the power set-point as it would be in
 	 *                          {@link StateMachine#BALANCING}
@@ -112,14 +113,18 @@ public static ApplyState calculateAutomaticMode(Sum sum, ManagedSymmetricEss ess
 	 *                          {@link StateMachine#CHARGE_GRID}
 	 * @return the new state
 	 */
-	public static StateMachine postprocessRunState(StateMachine state, int pwrBalancing, int pwrDelayDischarge,
-			int pwrChargeGrid) {
+	public static StateMachine postprocessRunState(ManagedSymmetricEss ess, StateMachine state, int pwrBalancing,
+			int pwrDelayDischarge, int pwrChargeGrid) {
 		if (state == CHARGE_GRID) {
 			// CHARGE_GRID,...
 			if (pwrChargeGrid >= pwrDelayDischarge) {
 				// but battery charge/discharge is the same as DELAY_DISCHARGE
 				state = DELAY_DISCHARGE;
 			}
+			var soc = ess.getSoc();
+			if (soc.isDefined() && soc.get() >= ESS_MAX_SOC) {
+				state = DELAY_DISCHARGE;
+			}
 		}
 
 		if (state == DELAY_DISCHARGE) {
diff --git a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1.java b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1.java
index ecd43524fa0..7570929552c 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1.java
@@ -104,7 +104,7 @@ protected static ApplyState calculateAutomaticMode(Sum sum, ManagedSymmetricEss
 		final var pwrDelayDischarge = calculateDelayDischargePower(ess);
 		final var pwrChargeGrid = max(limitChargePowerFor14aEnWG, calculateChargeGridPower(//
 				essChargeInChargeGrid, ess, essActivePower, gridActivePower, maxChargePowerFromGrid));
-		actualState = postprocessRunState(targetState, pwrBalancing, pwrDelayDischarge, pwrChargeGrid);
+		actualState = postprocessRunState(ess, targetState, pwrBalancing, pwrDelayDischarge, pwrChargeGrid);
 
 		// Get and apply ActivePower Less-or-Equals Set-Point
 		setPoint = switch (actualState) {
diff --git a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/UtilsTest.java b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/UtilsTest.java
index 4fdb0ff9f98..e24333dac4b 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/UtilsTest.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/UtilsTest.java
@@ -216,14 +216,14 @@ public void testCalculateAutomaticMode() {
 
 	@Test
 	public void testCalculateChargeEnergyInChargeGrid() {
-		assertEquals(1375, calculateChargeEnergyInChargeGrid(//
+		assertEquals(1436, calculateChargeEnergyInChargeGrid(//
 				new GlobalSimulationsContext(CLOCK, RiskLevel.MEDIUM, TIME, ImmutableList.of(), ImmutableList.of(), //
 						new GlobalSimulationsContext.Grid(0, 20000), //
 						new GlobalSimulationsContext.Ess(0, 12223, 5000, 5000), //
 						ImmutableMap.of(), //
 						ImmutableList.of())));
 
-		assertEquals(525, calculateChargeEnergyInChargeGrid(//
+		assertEquals(540, calculateChargeEnergyInChargeGrid(//
 				new GlobalSimulationsContext(CLOCK, RiskLevel.MEDIUM, TIME, ImmutableList.of(), ImmutableList.of(), //
 						new GlobalSimulationsContext.Grid(0, 20000), //
 						new GlobalSimulationsContext.Ess(0, 12223, 5000, 5000), //
@@ -234,7 +234,7 @@ public void testCalculateChargeEnergyInChargeGrid() {
 								new GlobalSimulationsContext.Period.Quarter(TIME, 200, 0, 0) //
 						))));
 
-		assertEquals(538, calculateChargeEnergyInChargeGrid(//
+		assertEquals(558, calculateChargeEnergyInChargeGrid(//
 				new GlobalSimulationsContext(CLOCK, RiskLevel.MEDIUM, TIME, ImmutableList.of(), ImmutableList.of(), //
 						new GlobalSimulationsContext.Grid(0, 20000), //
 						new GlobalSimulationsContext.Ess(0, 12223, 5000, 5000), //
@@ -250,7 +250,7 @@ public void testCalculateChargeEnergyInChargeGrid() {
 								new GlobalSimulationsContext.Period.Quarter(TIME, 700, 0, 121) //
 						))));
 
-		assertEquals(499, calculateChargeEnergyInChargeGrid(//
+		assertEquals(515, calculateChargeEnergyInChargeGrid(//
 				new GlobalSimulationsContext(CLOCK, RiskLevel.MEDIUM, TIME, ImmutableList.of(), ImmutableList.of(), //
 						new GlobalSimulationsContext.Grid(0, 20000), //
 						new GlobalSimulationsContext.Ess(0, 12223, 5000, 5000), //
diff --git a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1Test.java b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1Test.java
index 54f49381f0b..68379b42d5a 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1Test.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/v1/UtilsV1Test.java
@@ -83,11 +83,23 @@ public void testCalculateAutomaticMode() {
 						new DummySum() //
 								.withGridActivePower(100), //
 						new DummyManagedSymmetricEss("ess0") //
+								.withSoc(93) //
 								.withActivePower(500), //
 						/* essChargeInChargeGrid */ 1000, //
 						/* maxChargePowerFromGrid */ 400, //
 						/* limitChargePowerFor14aEnWG */ ESS_LIMIT_14A_ENWG, //
 						CHARGE_GRID));
+		assertEquals("CHARGE_GRID to DELAY_DISCHARGE", new ApplyState(DELAY_DISCHARGE, 0), //
+				calculateAutomaticMode(//
+						new DummySum() //
+								.withGridActivePower(100), //
+						new DummyManagedSymmetricEss("ess0") //
+								.withActivePower(500) //
+								.withSoc(94), //
+						/* essChargeInChargeGrid */ 1000, //
+						/* maxChargePowerFromGrid */ 1000, //
+						/* limitChargePowerFor14aEnWG */ ESS_LIMIT_14A_ENWG, //
+						CHARGE_GRID));
 		assertEquals("CHARGE_GRID to BALANCING", new ApplyState(BALANCING, null), //
 				calculateAutomaticMode(//
 						new DummySum() //
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java
index 54bbb5e0be5..39ff4a44e88 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java
@@ -3,7 +3,9 @@
 import static io.openems.common.channel.PersistencePriority.HIGH;
 import static io.openems.common.types.OpenemsType.BOOLEAN;
 
+import io.openems.common.channel.Level;
 import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.StateChannel;
 import io.openems.edge.common.component.OpenemsComponent;
 
 public interface ControllerEvcs extends OpenemsComponent {
@@ -11,8 +13,9 @@ public interface ControllerEvcs extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		AWAITING_HYSTERESIS(Doc.of(BOOLEAN) //
-				.persistencePriority(HIGH)) //
-		; //
+				.persistencePriority(HIGH)),
+		EVCS_IS_READ_ONLY(Doc.of(Level.INFO) //
+				.translationKey(ControllerEvcs.class, "evcsIsReadOnly")); //
 
 		private final Doc doc;
 
@@ -26,4 +29,17 @@ public Doc doc() {
 		}
 	}
 
-}
\ No newline at end of file
+	public default void setEvcsIsReadOnlyChannel(boolean val) {
+		this.getEvcsIsReadOnlyChannel().setNextValue(val);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#EVCS_IS_READ_ONLY}.
+	 *
+	 * @return the Channel
+	 */
+	public default StateChannel getEvcsIsReadOnlyChannel() {
+		return this.channel(ChannelId.EVCS_IS_READ_ONLY);
+	}
+
+}
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
index 88276f368f5..c5e3786e21a 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
@@ -48,7 +48,7 @@
 		configurationPolicy = ConfigurationPolicy.REQUIRE //
 )
 public class ControllerEvcsImpl extends AbstractOpenemsComponent
-		implements Controller, EnergySchedulable, OpenemsComponent, ModbusSlave {
+		implements Controller, OpenemsComponent, ModbusSlave, EnergySchedulable, ControllerEvcs {
 
 	private static final int CHARGE_POWER_BUFFER = 200;
 	private static final double DEFAULT_UPPER_TARGET_DIFFERENCE_PERCENT = 0.10; // 10%
@@ -139,6 +139,11 @@ protected void deactivate() {
 	 */
 	@Override
 	public void run() throws OpenemsNamedException {
+		if (this.evcs.isReadOnly()) {
+			this.setEvcsIsReadOnlyChannel(true);
+			return;
+		}
+		this.setEvcsIsReadOnlyChannel(false);
 
 		final var isClustered = this.evcs.getIsClustered().orElse(false);
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_de.properties b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_de.properties
new file mode 100644
index 00000000000..36b880ce587
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_de.properties
@@ -0,0 +1 @@
+evcsIsReadOnly = Ladestation ist lesend eingebunden
\ No newline at end of file
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_en.properties b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_en.properties
new file mode 100644
index 00000000000..e407d9be6f1
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/translation_en.properties
@@ -0,0 +1 @@
+evcsIsReadOnly = Read only charging station
\ No newline at end of file
diff --git a/io.openems.edge.core/src/io/openems/edge/app/enums/SafetyCountry.java b/io.openems.edge.core/src/io/openems/edge/app/enums/SafetyCountry.java
index b3fcbc77da0..186227a4caf 100644
--- a/io.openems.edge.core/src/io/openems/edge/app/enums/SafetyCountry.java
+++ b/io.openems.edge.core/src/io/openems/edge/app/enums/SafetyCountry.java
@@ -11,6 +11,7 @@ public enum SafetyCountry implements TranslatableEnum {
 	SWEDEN("sweden"), //
 	CZECH("czech"), //
 	HOLLAND("netherlands"), //
+	GREECE_MAINLAND("greece"), //
 	;
 
 	private final String translationKey;
diff --git a/io.openems.edge.core/src/io/openems/edge/app/evcs/readonly/MennekesEvcsReadOnly.java b/io.openems.edge.core/src/io/openems/edge/app/evcs/readonly/MennekesEvcsReadOnly.java
new file mode 100644
index 00000000000..181ef2565c7
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/app/evcs/readonly/MennekesEvcsReadOnly.java
@@ -0,0 +1,177 @@
+package io.openems.edge.app.evcs.readonly;
+
+import static io.openems.edge.app.common.props.CommonProps.alias;
+import static io.openems.edge.app.common.props.CommunicationProps.modbusUnitId;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+import com.google.common.collect.Lists;
+import com.google.gson.JsonElement;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.oem.OpenemsEdgeOem;
+import io.openems.common.session.Language;
+import io.openems.common.session.Role;
+import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.app.common.props.CommunicationProps;
+import io.openems.edge.app.evcs.readonly.MennekesEvcsReadOnly.Property;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.core.appmanager.AbstractOpenemsApp;
+import io.openems.edge.core.appmanager.AbstractOpenemsAppWithProps;
+import io.openems.edge.core.appmanager.AppConfiguration;
+import io.openems.edge.core.appmanager.AppDef;
+import io.openems.edge.core.appmanager.AppDescriptor;
+import io.openems.edge.core.appmanager.ComponentUtil;
+import io.openems.edge.core.appmanager.ConfigurationTarget;
+import io.openems.edge.core.appmanager.Nameable;
+import io.openems.edge.core.appmanager.OpenemsApp;
+import io.openems.edge.core.appmanager.OpenemsAppCardinality;
+import io.openems.edge.core.appmanager.OpenemsAppCategory;
+import io.openems.edge.core.appmanager.OpenemsAppPermissions;
+import io.openems.edge.core.appmanager.Type;
+import io.openems.edge.core.appmanager.Type.Parameter;
+import io.openems.edge.core.appmanager.Type.Parameter.BundleParameter;
+import io.openems.edge.core.appmanager.dependency.Tasks;
+
+/**
+ * Describes a read only App for Mennekes Charging Station.
+ *
+ * <pre>
+  {
+    "appId":"App.Evcs.Mennekes.ReadOnly",
+    "alias":"Mennekes Ladestation",
+    "instanceId": UUID,
+    "image": base64,
+    "properties":{
+      "EVCS_ID": "evcs0",
+      "MODBUS_ID": "modbus0",
+      "MODBUS_UNIT_ID": 1,
+    },
+    "appDescriptor": {
+    	"websiteUrl": {@link AppDescriptor#getWebsiteUrl()}
+    }
+  }
+ * </pre>
+ */
+@Component(name = "App.Evcs.Mennekes.ReadOnly")
+public class MennekesEvcsReadOnly extends
+		AbstractOpenemsAppWithProps<MennekesEvcsReadOnly, Property, Parameter.BundleParameter> implements OpenemsApp {
+
+	public enum Property implements Type<Property, MennekesEvcsReadOnly, Parameter.BundleParameter>, Nameable {
+		// Component-IDs
+		EVCS_ID(AppDef.componentId("evcs0")), //
+		MODBUS_ID(AppDef.componentId("modbus0")), //
+		// Properties
+		ALIAS(alias()), //
+		IP(AppDef.copyOfGeneric(CommunicationProps.ip(), def -> def //
+				.setRequired(true))), //
+		MODBUS_UNIT_ID(AppDef.copyOfGeneric(modbusUnitId(), def -> def //
+				.setDefaultValue(1))), //
+		;
+
+		private final AppDef<? super MennekesEvcsReadOnly, ? super Property, ? super BundleParameter> def;
+
+		private Property(AppDef<? super MennekesEvcsReadOnly, ? super Property, ? super BundleParameter> def) {
+			this.def = def;
+		}
+
+		@Override
+		public Type<Property, MennekesEvcsReadOnly, BundleParameter> self() {
+			return this;
+		}
+
+		@Override
+		public AppDef<? super MennekesEvcsReadOnly, ? super Property, ? super BundleParameter> def() {
+			return this.def;
+		}
+
+		@Override
+		public Function<GetParameterValues<MennekesEvcsReadOnly>, BundleParameter> getParamter() {
+			return Parameter.functionOf(AbstractOpenemsApp::getTranslationBundle);
+		}
+
+	}
+
+	@Activate
+	public MennekesEvcsReadOnly(@Reference ComponentManager componentManager, ComponentContext componentContext,
+			@Reference ConfigurationAdmin cm, @Reference ComponentUtil componentUtil) {
+		super(componentManager, componentContext, cm, componentUtil);
+	}
+
+	@Override
+	protected ThrowingTriFunction<ConfigurationTarget, Map<Property, JsonElement>, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() {
+		return (t, p, l) -> {
+
+			// values the user enters
+			final var alias = this.getString(p, l, Property.ALIAS);
+			final var ip = this.getString(p, l, Property.IP);
+			final var modbusUnitId = this.getInt(p, Property.MODBUS_UNIT_ID);
+
+			// values which are being auto generated by the appmanager
+			final var evcsId = this.getId(t, p, Property.EVCS_ID);
+			final var modbusId = this.getId(t, p, Property.MODBUS_ID);
+
+			var components = Lists.newArrayList(//
+					new EdgeConfig.Component(evcsId, alias, "Evcs.Mennekes", JsonUtils.buildJsonObject() //
+							.addProperty("modbus.id", modbusId) //
+							.addProperty("modbusUnitId", modbusUnitId) //
+							.addProperty("readOnly", true) //
+							.build()), //
+					new EdgeConfig.Component(modbusId, "Mennekes Modbus", "Bridge.Modbus.Tcp",
+							JsonUtils.buildJsonObject() //
+									.addProperty("ip", ip) //
+									.onlyIf(t == ConfigurationTarget.ADD, b -> b //
+											.addProperty("port", 502)) //
+									.build()) //
+			);
+
+			return AppConfiguration.create() //
+					.addTask(Tasks.component(components)) //
+					.build();
+		};
+	}
+
+	@Override
+	public AppDescriptor getAppDescriptor(OpenemsEdgeOem oem) {
+		return AppDescriptor.create() //
+				.setWebsiteUrl(oem.getAppWebsiteUrl(this.getAppId())) //
+				.build();
+	}
+
+	@Override
+	public OpenemsAppCardinality getCardinality() {
+		return OpenemsAppCardinality.MULTIPLE;
+	}
+
+	@Override
+	public OpenemsAppCategory[] getCategories() {
+		return new OpenemsAppCategory[] { OpenemsAppCategory.EVCS_READ_ONLY };
+	}
+
+	@Override
+	protected MennekesEvcsReadOnly getApp() {
+		return this;
+	}
+
+	@Override
+	protected Property[] propertyValues() {
+		return Property.values();
+	}
+
+	@Override
+	public OpenemsAppPermissions getAppPermissions() {
+		return OpenemsAppPermissions.create()//
+				.setCanDelete(Role.ADMIN)//
+				.setCanSee(Role.ADMIN)//
+				.build();
+	}
+}
diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java
index 5c91317ae73..b1bf936cabb 100644
--- a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java
+++ b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java
@@ -1,5 +1,6 @@
 package io.openems.edge.app.timeofusetariff;
 
+import static io.openems.edge.app.common.props.CommonProps.defaultDef;
 import static io.openems.edge.core.appmanager.validator.Checkables.checkCommercial92;
 import static io.openems.edge.core.appmanager.validator.Checkables.checkHome;
 import static io.openems.edge.core.appmanager.validator.Checkables.checkOr;
@@ -42,6 +43,7 @@
 import io.openems.edge.core.appmanager.Type;
 import io.openems.edge.core.appmanager.dependency.Tasks;
 import io.openems.edge.core.appmanager.dependency.aggregatetask.SchedulerByCentralOrderConfiguration.SchedulerComponent;
+import io.openems.edge.core.appmanager.formly.Exp;
 import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
 import io.openems.edge.core.appmanager.validator.ValidatorConfig;
 
@@ -85,7 +87,20 @@ public static enum Property implements Type<Property, EntsoE, Type.Parameter.Bun
 				.setField(JsonFormlyUtil::buildSelectFromNameable, (app, property, l, parameter, field) -> {
 					field.setOptions(BiddingZone.optionsFactory(), l);
 					field.isRequired(true);
-				}));
+				})),
+
+		RESOLUTION(AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabelWithAppPrefix(".resolution.label") //
+				.setTranslatedDescriptionWithAppPrefix(".resolution.description") //
+				.setRequired(true)//
+				.setDefaultValue(Resolution.HOURLY)//
+				.setField(JsonFormlyUtil::buildSelectFromNameable, (app, property, l, parameter, field) -> {
+					field.setOptions(Resolution.optionsFactory(), l);
+					final var isInBiddingZone = Exp
+							.array(Exp.staticValue(BiddingZone.GERMANY), Exp.staticValue(BiddingZone.AUSTRIA))
+							.some(t -> t.equal(Exp.currentModelValue(BIDDING_ZONE)));
+					field.onlyShowIf(isInBiddingZone);
+				})));
 
 		private final AppDef<? super EntsoE, ? super Property, ? super Type.Parameter.BundleParameter> def;
 
@@ -212,4 +227,32 @@ public static final OptionsFactory optionsFactory() {
 		}
 	}
 
+	public enum Resolution implements TranslatableEnum {
+		HOURLY("hourly"), //
+		QUARTERLY("quarterly");
+
+		private static final String TRANSLATION_PREFIX = "App.TimeOfUseTariff.ENTSO-E.resolution.option.";
+
+		private final String translationKey;
+
+		private Resolution(String translationKey) {
+			this.translationKey = TRANSLATION_PREFIX + translationKey;
+		}
+
+		@Override
+		public final String getTranslation(Language l) {
+			final var bundle = AbstractOpenemsApp.getTranslationBundle(l);
+			return TranslationUtil.getTranslation(bundle, this.translationKey);
+		}
+
+		/**
+		 * Creates a {@link OptionsFactory} of this enum.
+		 * 
+		 * @return the {@link OptionsFactory}
+		 */
+		public static final OptionsFactory optionsFactory() {
+			return OptionsFactory.of(values());
+		}
+	}
+
 }
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
index 08bb9bb17af..ab591f359b6 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
@@ -23,6 +23,11 @@ public enum OpenemsAppCategory {
 	 * Electric vehicle charging station.
 	 */
 	EVCS("evcs"),
+	
+	/**
+	 * Read only Electric vehicle charging station.
+	 */
+	EVCS_READ_ONLY("evcsReadOnly"),
 
 	/**
 	 * Heat.
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/formly/builder/InputBuilder.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/formly/builder/InputBuilder.java
index e6730bb526e..65e5eb0b1b9 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/formly/builder/InputBuilder.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/formly/builder/InputBuilder.java
@@ -140,9 +140,9 @@ public InputBuilder setMaxLenght(int maxLength) {
 
 	/**
 	 * Sets the validation of the Input.
+	 * 
 	 * <p>
 	 * e. g. to set the validation of an IP use {@link Validation#IP}
-	 * </p>
 	 *
 	 * @param validation the validation to be set
 	 * @return this
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties
index f7381ce47d9..e9795f28fb0 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties
@@ -2,6 +2,7 @@
 integratedSystems = Integrierte Systeme
 timeOfUseTariff = Dynamische Stromtarife
 evcs = E-Mobilität
+evcsReadOnly = E-Mobilität (nur lesend)
 heat = Power-to-Heat
 loadControl = Laststeuerung
 hardware = Hardware
@@ -33,6 +34,7 @@ switzerland = Schweiz
 sweden = Schweden
 czech = Tschechische Republik
 netherlands = Niederlande
+greece = Griechenland
 username = Benutzername
 password = Passwort
 left = Links
@@ -155,6 +157,9 @@ App.Evcs.IesKeywatt.connector.description = Die Anschlusskennung der Stromzapfs
 App.Evcs.Keba.Name = KEBA Ladestation
 App.Evcs.Keba.Name.short = KEBA
 
+App.Evcs.Mennekes.ReadOnly.Name = Mennekes Ladestation
+App.Evcs.Mennekes.ReadOnly.Name.short = Mennekes
+
 App.Evcs.Alpitronic.Name = Alpitronic Ladestation
 App.Evcs.Alpitronic.Name.short = Alpitronic
 App.Evcs.Alpitronic.chargingStation.label = Alpitronic Ladestation - Ladepunkt {0}
@@ -458,6 +463,10 @@ App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se3 = Schweden (SE3)
 App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se4 = Schweden (SE4)
 App.TimeOfUseTariff.ENTSO-E.biddingZone.option.belgium = Belgien
 App.TimeOfUseTariff.ENTSO-E.biddingZone.option.netherlands = Niederlande
+App.TimeOfUseTariff.ENTSO-E.resolution.label = Auflösung
+App.TimeOfUseTariff.ENTSO-E.resolution.description = Auflösung entsprechend dem Preisintervall
+App.TimeOfUseTariff.ENTSO-E.resolution.option.hourly = Stundenpreise
+App.TimeOfUseTariff.ENTSO-E.resolution.option.quarterly = Viertelstundenpreise
 App.TimeOfUseTariff.GroupeE.Name = Dynamischer Stromtarif (Groupe-E)
 App.TimeOfUseTariff.GroupeE.Name.short = Groupe-E
 App.TimeOfUseTariff.Hassfurt.Name = Dynamischer Stromtarif (Stadtwerk Haßfurt)
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties
index 84ee0583ff7..03f34b1bafa 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties
@@ -2,6 +2,7 @@
 integratedSystems = Integrated Systems
 timeOfUseTariff = Time-of-use tariffs
 evcs = E-Mobility
+evcsReadOnly = E-Mobility (Read Only)
 heat = Power-to-Heat
 loadControl = Load control
 hardware = Hardware
@@ -33,6 +34,7 @@ switzerland = Switzerland
 sweden = Sweden
 czech = Czech Republic
 netherlands = Netherlands
+greece = Greece
 username = Username
 password = Password
 left = Left
@@ -155,6 +157,9 @@ App.Evcs.IesKeywatt.connector.description = The connector id of the chargepoint
 App.Evcs.Keba.Name = KEBA charging station
 App.Evcs.Keba.Name.short = KEBA
 
+App.Evcs.Mennekes.ReadOnly.Name = Mennekes charging station
+App.Evcs.Mennekes.ReadOnly.Name.short = Mennekes
+
 App.Evcs.Alpitronic.Name = Alpitronic charging station
 App.Evcs.Alpitronic.Name.short = Alpitronic
 App.Evcs.Alpitronic.chargingStation.label = Alpitronic charging station - Charging point {0}
@@ -458,6 +463,10 @@ App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se3 = Sweden (SE3)
 App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se4 = Sweden (SE4)
 App.TimeOfUseTariff.ENTSO-E.biddingZone.option.belgium = Belgium
 App.TimeOfUseTariff.ENTSO-E.biddingZone.option.netherlands = Netherlands
+App.TimeOfUseTariff.ENTSO-E.resolution.label = Resolution
+App.TimeOfUseTariff.ENTSO-E.resolution.description = Resolution corresponding to the price interval
+App.TimeOfUseTariff.ENTSO-E.resolution.option.hourly = Hourly prices
+App.TimeOfUseTariff.ENTSO-E.resolution.option.quarterly = Quarter-hourly prices
 App.TimeOfUseTariff.GroupeE.Name = Time-of-Use Tariff (Groupe-E)
 App.TimeOfUseTariff.GroupeE.Name.short = Groupe-E
 App.TimeOfUseTariff.Hassfurt.Name = Time-of-Use Tariff (Stadtwerk Hassfurt)
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java
index da0f00be519..6722f9c9fc0 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java
@@ -28,8 +28,6 @@
 /**
  * Represents a JSON-RPC Response for 'channelExportXlsxRequest'.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java
index bb280376c0f..0ce1a666cf6 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java
@@ -20,8 +20,6 @@ public NetworkConfiguration(TreeMap<String, NetworkInterface<?>> interfaces) {
 	/**
 	 * Return this NetworkConfiguration as a JSON object.
 	 *
-	 * <p>
-	 *
 	 * <pre>
 	 * {
 	 *   "interfaces": {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java
index fc3b40b57a8..42cf5c4b909 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java
@@ -13,8 +13,6 @@
 /**
  * JSON-RPC Response to {@link ExecuteSystemCommandRequest}.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemRestartResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemRestartResponse.java
index 6bc3b532cfa..7b8f1064daf 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemRestartResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemRestartResponse.java
@@ -10,8 +10,6 @@
 /**
  * JSON-RPC Response to {@link ExecuteSystemRestartRequest}.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java
index 83097f7cea5..bb9b62a4a0e 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java
@@ -10,8 +10,6 @@
 /**
  * JSON-RPC Response to "getNetworkConfig" Request.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java
index 38ea2900958..ad6162d4ad6 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java
@@ -21,8 +21,6 @@
 /**
  * JSON-RPC Response to {@link GetSystemUpdateStateRequest}.
  *
- * <p>
- *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java
index 627703a20ab..3d776848849 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java
@@ -29,6 +29,7 @@
 import io.openems.edge.app.evcs.KebaEvcs;
 import io.openems.edge.app.evcs.WebastoNextEvcs;
 import io.openems.edge.app.evcs.WebastoUniteEvcs;
+import io.openems.edge.app.evcs.readonly.MennekesEvcsReadOnly;
 import io.openems.edge.app.heat.CombinedHeatAndPower;
 import io.openems.edge.app.heat.HeatPump;
 import io.openems.edge.app.heat.HeatingElement;
@@ -426,6 +427,16 @@ public static final KebaEvcs kebaEvcs(AppManagerTestBundle t) {
 		return app(t, KebaEvcs::new, "App.Evcs.Keba");
 	}
 
+	/**
+	 * Test method for creating a {@link MennekesEvcsReadOnly}.
+	 * 
+	 * @param t the {@link AppManagerTestBundle}
+	 * @return the {@link OpenemsApp} instance
+	 */
+	public static final MennekesEvcsReadOnly mennekesEvcsReadOnlyEvcs(AppManagerTestBundle t) {
+		return app(t, MennekesEvcsReadOnly::new, "App.Evcs.Mennekes.ReadOnly");
+	}
+
 	/**
 	 * Test method for creating a {@link IesKeywattEvcs}.
 	 * 
@@ -771,12 +782,11 @@ private static final <T> T app(AppManagerTestBundle t, DefaultAppConstructorWith
 				t.componentUtil, t.appManagerUtil);
 	}
 
-	private static final <T> T app(AppManagerTestBundle t, DefaultAppConstructorWithHost<T> constructor,
-			String appId) {
+	private static final <T> T app(AppManagerTestBundle t, DefaultAppConstructorWithHost<T> constructor, String appId) {
 		return constructor.create(t.componentManger, AppManagerTestBundle.getComponentContext(appId), t.cm,
 				t.componentUtil, t.host);
 	}
-	
+
 	private static interface DefaultAppConstructor<A> {
 
 		public A create(ComponentManager componentManager, ComponentContext componentContext, ConfigurationAdmin cm,
@@ -797,5 +807,5 @@ public A create(ComponentManager componentManager, ComponentContext componentCon
 				ComponentUtil componentUtil, Host host);
 
 	}
-	
+
 }
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java
index c29e52af3a7..96b30fe1d5b 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java
@@ -83,6 +83,7 @@ public void beforeEach() throws Exception {
 					.build()));
 			this.apps.add(new TestTranslation(Apps.hardyBarthEvcs(t), true, new JsonObject()));
 			this.apps.add(new TestTranslation(Apps.kebaEvcs(t), true, new JsonObject()));
+			this.apps.add(new TestTranslation(Apps.mennekesEvcsReadOnlyEvcs(t), true, new JsonObject()));
 			this.apps.add(new TestTranslation(Apps.iesKeywattEvcs(t), true, new JsonObject()));
 			this.apps.add(new TestTranslation(Apps.alpitronicEvcs(t), true, new JsonObject()));
 			this.apps.add(new TestTranslation(Apps.webastoNext(t), true, new JsonObject()));
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/v1/optimizer/UtilsV1.java b/io.openems.edge.energy/src/io/openems/edge/energy/v1/optimizer/UtilsV1.java
index 8479bbc3bce..d141d0938f6 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/v1/optimizer/UtilsV1.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/v1/optimizer/UtilsV1.java
@@ -357,7 +357,6 @@ protected static void logSchedule(ParamsV1 params, ImmutableSortedMap<ZonedDateT
 	/**
 	 * Updates the active Schedule with a new Schedule.
 	 * 
-	 * <p>
 	 * <ul>
 	 * <li>Period of the currently active Quarter is never changed
 	 * <li>Old Periods are removed from the Schedule
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulationResultTest.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulationResultTest.java
index d175710bdc0..d671a703532 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulationResultTest.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulationResultTest.java
@@ -22,7 +22,7 @@ public void test() {
 				p(0, 0), p(1, 1), p(2, 0) //
 		});
 
-		assertEquals(1_126_154.844, result.cost(), 0.001);
+		assertEquals(1166163.462, result.cost(), 0.001);
 	}
 
 	private static int[] p(int... states) {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java
index 0bf63c6a866..f9cce7a96a4 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java
@@ -7,7 +7,6 @@
 /**
  * Creates a constraint with following settings:.
  * 
- * <p>
  * <ul>
  * <li>Relationship (EQ, GEQ, LEQ) as given in constructor
  * <li>Value as given in constructor
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
index 936efdbea6c..4e9b7cee5ed 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
@@ -703,4 +703,12 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 				.channel(11, ChannelId.MINIMUM_POWER, ModbusType.UINT16) //
 				.build();
 	}
+
+	/** Defines if the evcs is read only.
+	 * 
+	 * @return true if the evcs is read-only
+	 */
+	public default boolean isReadOnly() {
+		return false;
+	}
 }
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java
index 1d4ddb30399..160f71c0591 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java
@@ -176,7 +176,6 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * <li>Hardy Barth allows setting in Ampere. It should return 230 W (1A * 230V).
 		 * </ul>
 		 *
-		 * <p>
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Writable
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/EvcsHardyBarth.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/EvcsHardyBarth.java
index ad3cba3b5ac..fc47d290944 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/EvcsHardyBarth.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/EvcsHardyBarth.java
@@ -39,7 +39,6 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * States of the Hardy Barth.
 		 *
-		 * <p>
 		 * <ul>
 		 * <li>A = Free (no EV connected)
 		 * <li>B = EV connected, no charging (pause state)
diff --git a/io.openems.edge.evcs.mennekes/.classpath b/io.openems.edge.evcs.mennekes/.classpath
new file mode 100644
index 00000000000..bbfbdbe40e7
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/io.openems.edge.evcs.mennekes/.gitignore b/io.openems.edge.evcs.mennekes/.gitignore
new file mode 100644
index 00000000000..c2b941a96de
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/.gitignore
@@ -0,0 +1,2 @@
+/bin_test/
+/generated/
diff --git a/io.openems.edge.evcs.mennekes/.project b/io.openems.edge.evcs.mennekes/.project
new file mode 100644
index 00000000000..f68af579e0f
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openems.edge.evcs.mennekes</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>
diff --git a/io.openems.edge.evcs.mennekes/.settings/org.eclipse.core.resources.prefs b/io.openems.edge.evcs.mennekes/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/io.openems.edge.evcs.mennekes/bnd.bnd b/io.openems.edge.evcs.mennekes/bnd.bnd
new file mode 100644
index 00000000000..4169b61baee
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/bnd.bnd
@@ -0,0 +1,17 @@
+Bundle-Name: OpenEMS Edge EVCS Mennekes Amtron Professional   
+Bundle-Vendor: FENECON GmbH 
+Bundle-License: https://opensource.org/licenses/EPL-2.0
+Bundle-Version: 1.0.0.${tstamp}
+
+-buildpath: \
+	${buildpath},\
+	com.ghgande.j2mod,\
+	io.openems.common,\
+	io.openems.edge.bridge.modbus,\
+	io.openems.edge.common,\
+	io.openems.edge.evcs.api,\
+	io.openems.edge.meter.api,\
+	io.openems.edge.timedata.api,\
+
+-testpath: \
+	${testpath}
diff --git a/io.openems.edge.evcs.mennekes/readme.adoc b/io.openems.edge.evcs.mennekes/readme.adoc
new file mode 100644
index 00000000000..a7cebf8d7e7
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/readme.adoc
@@ -0,0 +1,15 @@
+= Mennekes Amtron Professional Charging Station
+
+This component implements the Mennekes Professional charging station by the manufacturer Mennekes. It collects all relevant information into the given Nature Channels and its own Channels and sends charging commands that have been set by another controllers.
+
+== https://en.wikipedia.org/wiki/Software_release_life_cycle[Software release life cycle]: BETA
+
+This implementation has been carried out during OpenEMS Hackathon Q1/2023 and is not yet fully feature tested. Please consider it BETA quality
+
+=== Technical Data
+
+Implemented Natures:
+* Evcs (Electric Vehicle Charging Station)
+* ManagedEvcs
+
+https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.evcs.mennekes[Source Code icon:github[]]
\ No newline at end of file
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/AvailableState.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/AvailableState.java
new file mode 100644
index 00000000000..9a2f1d227b0
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/AvailableState.java
@@ -0,0 +1,45 @@
+package io.openems.edge.evcs.mennekes;
+
+import io.openems.common.types.OptionsEnum;
+
+/**
+ * Shows the status of the Mennekes charger.
+ */
+public enum AvailableState implements OptionsEnum {
+	UNDEFINED(-1, "Undefined"), //
+	AVAILABLE(0, "Available"), //
+	PREPARING_TAG_ID_READY(1, "Ready to prepare the tag ID"), //
+	PREPARING_EV_READY(2, "Charging"), //
+	CHARGING(3, "Charging"), //
+	SUSPENDED_EV(4, "Suspended electric vehicle"), //
+	SUSPENDED_EV_SE(5, "Suspended electric vehicle se"), //
+	FINISHING(6, "Finishing"), //
+	RESERVED(7, "Reseved"), //
+	UNAVAILABLE(8, "Unavailable"), //
+	UNAVAILABLE_FW_UPDATE(9, "Unavailable firmware update"), //
+	FAULTED(10, "Faulted"), //
+	UNAVAILABLE_CONNECTION_OBJECT(11, "Unavailable connection");
+
+	private final int value;
+	private final String name;
+
+	private AvailableState(int value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return UNDEFINED;
+	}
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/Config.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/Config.java
new file mode 100644
index 00000000000..cad70e25e01
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/Config.java
@@ -0,0 +1,42 @@
+package io.openems.edge.evcs.mennekes;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition(//
+		name = "EVCS Mennekes Amtron Professional", //
+		description = "Implements the Mennekes Amtron professioanl electric vehicle charging station.")
+@interface Config {
+
+	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+	String id() default "evcs0";
+
+	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+	String alias() default "";
+
+	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+	boolean enabled() default true;
+
+	@AttributeDefinition(name = "Modbus-ID", description = "ID of Modbus bridge")
+	String modbus_id() default "modbus0";
+
+	@AttributeDefinition(name = "Modbus Unit-ID", description = "The Unit-ID of the Modbus device.")
+	int modbusUnitId() default 1;
+
+	@AttributeDefinition(name = "Minimum hardware current", description = "Minimum current of the Charger in mA.", required = true)
+	int minHwCurrent() default 6000;
+
+	@AttributeDefinition(name = "Maximum hardware current", description = "Maximum current of the Charger in mA.", required = true)
+	int maxHwCurrent() default 32000;
+
+	@AttributeDefinition(name = "Debug Mode", description = "Activates the debug mode")
+	boolean debugMode() default false;
+
+	@AttributeDefinition(name = "Read only", description = "Defines that this evcs is read only.", required = true)
+	boolean readOnly() default true;
+
+	@AttributeDefinition(name = "Modbus target filter", description = "This is auto-generated by 'Modbus-ID'.")
+	String Modbus_target() default "(enabled=true)";
+
+	String webconsole_configurationFactory_nameHint() default "EVCS Mennekes Amtron Professional [{id}]";
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekes.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekes.java
new file mode 100644
index 00000000000..cc43b4f95cd
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekes.java
@@ -0,0 +1,546 @@
+package io.openems.edge.evcs.mennekes;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.channel.Level;
+import io.openems.common.channel.PersistencePriority;
+import io.openems.common.channel.Unit;
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.BooleanReadChannel;
+import io.openems.edge.common.channel.Channel;
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.IntegerReadChannel;
+import io.openems.edge.common.channel.IntegerWriteChannel;
+import io.openems.edge.common.channel.StateChannel;
+import io.openems.edge.common.channel.StringReadChannel;
+import io.openems.edge.common.channel.value.Value;
+import io.openems.edge.common.component.OpenemsComponent;
+
+/**
+ * Mennekes Amtron Professional charging protocol interface.
+ * 
+ * <p>
+ * Defines the interface for Mennekes Amtron Professional
+ */
+public interface EvcsMennekes extends OpenemsComponent {
+
+	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+
+		/**
+		 * Apply charge power limit.
+		 * 
+		 * <p>
+		 * WriteChannel for the modbus register to apply the charge power given by the
+		 * applyChargePowerLimit method
+		 */
+		APPLY_CURRENT_LIMIT(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.WATT) //
+				.accessMode(AccessMode.READ_WRITE)), //
+
+		FIRMWARE_VERSION(Doc.of(OpenemsType.STRING)//
+				.unit(Unit.NONE)//
+				.text("Readable Firmware Version")),
+
+		FIRMWARE_OUTDATED(Doc.of(Level.INFO)//
+				.translationKey(EvcsMennekes.class, "firmwareOutdated")),
+
+		RAW_FIRMWARE_VERSION(Doc.of(OpenemsType.INTEGER)//
+				.unit(Unit.NONE)//
+				.text("Firmware Version as Long; has to converted to hex to interpret")), //
+
+		OCPP_CP_STATUS(Doc.of(MennekesOcppState.values())//
+				.persistencePriority(PersistencePriority.HIGH)//
+		), //
+
+		/**
+		 * ERR_RCMB_TRIGGERED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_RCMB_TRIGGERED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errRcmbTriggered")), //
+
+		/**
+		 * ERR_VEHICLE_STATE_E.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_VEHICLE_STATE_E(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errVehicleStateE")), //
+
+		/**
+		 * ERR_MODE3_DIODE_CHECK.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_MODE3_DIODE_CHECK(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errMode3DiodeCheck")), //
+
+		/**
+		 * ERR_MCB_TYPE2_TRIGGERED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_MCB_TYPE2_TRIGGERED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errMcbType2Triggered")), //
+
+		/**
+		 * ERR_MCB_SCHUKO_TRIGGERED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_MCB_SCHUKO_TRIGGERED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errMcbSchukoTriggered")), //
+
+		/**
+		 * ERR_RCD_TRIGGERED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_RCD_TRIGGERED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errRcdTriggered")), //
+
+		/**
+		 * ERR_CONTACTOR_WELD.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_CONTACTOR_WELD(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errContactorWeld")), //
+
+		/**
+		 * ERR_BACKEND_DISCONNECTED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_BACKEND_DISCONNECTED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errBackendDisconnected")), //
+
+		/**
+		 * ERR_ACTUATOR_LOCKING_FAILED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_ACTUATOR_LOCKING_FAILED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errActuatorLockingFailed")), //
+
+		/**
+		 * ERR_ACTUATOR_LOCKING_WITHOUT_PLUG_FAILED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_ACTUATOR_LOCKING_WITHOUT_PLUG_FAILED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errActuatorLockingWithoutPlugFailed")), //
+
+		/**
+		 * ERR_ACTUATOR_STUCK.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_ACTUATOR_STUCK(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errActuatorStuck")), //
+
+		/**
+		 * ERR_ACTUATOR_DETECTION_FAILED.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_ACTUATOR_DETECTION_FAILED(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errActuatorDetectionFailed")), //
+
+		/**
+		 * ERR_FW_UPDATE_RUNNING.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_FW_UPDATE_RUNNING(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errFwUpdateRunning")), //
+
+		/**
+		 * ERR_TILT.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_TILT(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errTilt")), //
+
+		/**
+		 * ERR_WRONG_CP_PR_WIRING.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_WRONG_CP_PR_WIRING(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errWrongCpPrWiring")), //
+
+		/**
+		 * ERR_TYPE2_OVERLOAD_THR_2.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_TYPE2_OVERLOAD_THR_2(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errType2OverloadThr2")), //
+
+		/**
+		 * ERR_ACTUATOR_UNLOCKED_WHILE_CHARGING.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_ACTUATOR_UNLOCKED_WHILE_CHARGING(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errActuatorUnlockedWhileCharging")), //
+
+		/**
+		 * ERR_TILT_PREVENT_CHARGING_UNTIL_REBOOT.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_TILT_PREVENT_CHARGING_UNTIL_REBOOT(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errTiltPreventChargingUntilReboot")), //
+
+		/**
+		 * ERR_PIC24.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_PIC24(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errPic24")), //
+
+		/**
+		 * ERR_USB_STICK_HANDLING.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_USB_STICK_HANDLING(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errUsbStickHandling")), //
+
+		/**
+		 * ERR_INCORRECT_PHASE_INSTALLATION.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_INCORRECT_PHASE_INSTALLATION(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errIncorrectPhaseInstallation")), //
+
+		/**
+		 * ERR_NO_POWER.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: State
+		 * </ul>
+		 */
+		ERR_NO_POWER(Doc.of(Level.WARNING)//
+				.translationKey(EvcsMennekes.class, "errNoPower")), //
+
+		/**
+		 * VEHICLE STATE.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: VehicleState
+		 * <li>Unit: None
+		 * </ul>
+		 */
+		VEHICLE_STATE(Doc.of(VehicleState.values())//
+				.initialValue(VehicleState.UNDEFINED)), //
+
+		/**
+		 * CP AVAILABILITY.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: Boolean
+		 * <li>Unit: None
+		 * </ul>
+		 */
+		CP_AVAILABILITY(Doc.of(OpenemsType.BOOLEAN)//
+				.unit(Unit.NONE)), //
+
+		/**
+		 * SAFE_CURRENT.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: Boolean
+		 * <li>Unit: None
+		 * </ul>
+		 */
+		SAFE_CURRENT(Doc.of(OpenemsType.FLOAT)//
+				.unit(Unit.AMPERE)), //
+
+		/**
+		 * MAX CURRENT EV.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: Integer
+		 * <li>Unit: Ampere
+		 * </ul>
+		 */
+		MAX_CURRENT_EV(Doc.of(OpenemsType.INTEGER)//
+				.unit(Unit.AMPERE)), //
+
+		/**
+		 * MIN CURRENT LIMIT.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: Integer
+		 * <li>Unit: Ampere
+		 * </ul>
+		 */
+		MIN_CURRENT_LIMIT(Doc.of(OpenemsType.INTEGER)//
+				.unit(Unit.AMPERE)), //
+
+		/**
+		 * CHARGE DURATION.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Type: Integer
+		 * <li>Unit: SECONDS
+		 * </ul>
+		 */
+		CHARGE_DURATION(Doc.of(OpenemsType.INTEGER)//
+				.unit(Unit.SECONDS)), //
+
+		/**
+		 * EMS CURRENT LIMIT.
+		 *
+		 * <ul>
+		 * <li>Interface: MennekesAmtron
+		 * <li>Readable
+		 * <li>Type: Integer
+		 * <li>Unit: AMPERE
+		 * </ul>
+		 */
+		EMS_CURRENT_LIMIT(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.AMPERE) //
+				.accessMode(AccessMode.READ_ONLY)), //
+		;
+
+		private final Doc doc;
+
+		private ChannelId(Doc doc) {
+			this.doc = doc;
+		}
+
+		@Override
+		public Doc doc() {
+			return this.doc;
+		}
+
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#APPLY_CURRENT_LIMIT}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerWriteChannel getApplyCurrentLimitChannel() {
+		return this.channel(ChannelId.APPLY_CURRENT_LIMIT);
+	}
+
+	/**
+	 * Sets the charge current limit of the EVCS in [A] on
+	 * {@link ChannelId#APPLY_CURRENT_LIMIT} Channel.
+	 *
+	 * @param value the next value
+	 * @throws OpenemsNamedException on error
+	 */
+	public default void setApplyCurrentLimit(Integer value) throws OpenemsNamedException {
+		this.getApplyCurrentLimitChannel().setNextWriteValue(value);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#FIRMWARE_VERSION}.
+	 * 
+	 * @return returns the channel
+	 *
+	 */
+	public default StringReadChannel getFirmwareVersionChannel() {
+		return this.channel(ChannelId.FIRMWARE_VERSION);
+	}
+
+	/**
+	 * Internal method to get the 'nextValue' of {@link ChannelId#FIRMWARE_VERSION}
+	 * Channel.
+	 *
+	 * @return value of firmware version value
+	 */
+	public default Value<String> getFirmwareVersionValue() {
+		return this.getFirmwareVersionChannel().getNextValue();
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#FIRMWARE_VERSION}
+	 * Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setFirmwareVersion(String value) {
+		this.getFirmwareVersionChannel().setNextValue(value);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#RAW_FIRMWARE_VERSION}.
+	 *
+	 * @return the Channel
+	 */
+	public default StateChannel getFirmwareOutdatedChannel() {
+		return this.channel(ChannelId.FIRMWARE_OUTDATED);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#OCPP_CP_STATUS}.
+	 *
+	 * @return the Channel
+	 */
+	public default Channel<MennekesOcppState> getOcppCpStatusChannel() {
+		return this.channel(ChannelId.OCPP_CP_STATUS);
+	}
+
+	/**
+	 * Gets the OCPP Status of the EVCS charging station. See
+	 * {@link ChannelId#OCPP_CP_STATUS}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default MennekesOcppState getOcppCpStatus() {
+		return this.getOcppCpStatusChannel().value().asEnum();
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#CP_AVAILABILITY}.
+	 *
+	 * @return the Channel
+	 */
+
+	public default BooleanReadChannel getCpAvailabilityChannel() {
+		return this.channel(ChannelId.CP_AVAILABILITY);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#MAX_CURRENT_EV}.
+	 *
+	 * @return the Channel
+	 */
+
+	public default IntegerReadChannel getMaxCurrentEvChannel() {
+		return this.channel(ChannelId.MAX_CURRENT_EV);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#VEHICLE_STATE}.
+	 *
+	 * @return the Channel
+	 */
+
+	public default Channel<VehicleState> getVehicleStateChannel() {
+		return this.channel(ChannelId.VEHICLE_STATE);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#MIN_CURRENT_LIMIT}.
+	 *
+	 * @return the Channel
+	 */
+
+	public default IntegerReadChannel getMinCurrentLimitChannel() {
+		return this.channel(ChannelId.MIN_CURRENT_LIMIT);
+	}
+
+	/**
+	 * Gets the Minimum current limit in [A] of the AC charger. See
+	 * {@link ChannelId#MIN_CURRENT_LIMIT}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+
+	public default Value<Integer> getMinCurrentLimit() {
+		return this.getMinCurrentLimitChannel().value();
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#EMS_CURRENT_LIMIT}
+	 * Channel. Sets the value in Ampere as an Integer-Value.
+	 *
+	 * @return returns the EMS current limit
+	 */
+
+	public default Value<Integer> getEmsCurrentLimit() {
+		return this.getEmsCurrentLimitChannel().value();
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#EMS_CURRENT_LIMIT}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getEmsCurrentLimitChannel() {
+		return this.channel(ChannelId.EMS_CURRENT_LIMIT);
+	}
+
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java
new file mode 100644
index 00000000000..1d4f1d1adb6
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java
@@ -0,0 +1,403 @@
+package io.openems.edge.evcs.mennekes;
+
+import static io.openems.edge.bridge.modbus.api.ModbusUtils.readElementOnce;
+import static io.openems.edge.bridge.modbus.api.ModbusUtils.FunctionCode.FC3;
+
+import java.util.function.Consumer;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventHandler;
+import org.osgi.service.event.propertytypes.EventTopics;
+import org.osgi.service.metatype.annotations.Designate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.types.MeterType;
+import io.openems.common.types.SemanticVersion;
+import io.openems.edge.bridge.modbus.api.AbstractOpenemsModbusComponent;
+import io.openems.edge.bridge.modbus.api.BridgeModbus;
+import io.openems.edge.bridge.modbus.api.ModbusComponent;
+import io.openems.edge.bridge.modbus.api.ModbusProtocol;
+import io.openems.edge.bridge.modbus.api.ModbusUtils;
+import io.openems.edge.bridge.modbus.api.element.BitsWordElement;
+import io.openems.edge.bridge.modbus.api.element.DummyRegisterElement;
+import io.openems.edge.bridge.modbus.api.element.UnsignedDoublewordElement;
+import io.openems.edge.bridge.modbus.api.element.UnsignedWordElement;
+import io.openems.edge.bridge.modbus.api.element.WordOrder;
+import io.openems.edge.bridge.modbus.api.task.FC16WriteRegistersTask;
+import io.openems.edge.bridge.modbus.api.task.FC3ReadRegistersTask;
+import io.openems.edge.common.channel.value.Value;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.event.EdgeEventConstants;
+import io.openems.edge.common.taskmanager.Priority;
+import io.openems.edge.common.type.TypeUtils;
+import io.openems.edge.evcs.api.ChargeStateHandler;
+import io.openems.edge.evcs.api.ChargingType;
+import io.openems.edge.evcs.api.Evcs;
+import io.openems.edge.evcs.api.EvcsPower;
+import io.openems.edge.evcs.api.ManagedEvcs;
+import io.openems.edge.evcs.api.Phases;
+import io.openems.edge.evcs.api.Status;
+import io.openems.edge.evcs.api.WriteHandler;
+import io.openems.edge.meter.api.ElectricityMeter;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+		name = "Evcs.Mennekes", //
+		immediate = true, //
+		configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+@EventTopics({ //
+		EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
+})
+public class EvcsMennekesImpl extends AbstractOpenemsModbusComponent
+		implements Evcs, ElectricityMeter, ManagedEvcs, OpenemsComponent, ModbusComponent, EventHandler, EvcsMennekes {
+
+	private final Logger log = LoggerFactory.getLogger(EvcsMennekesImpl.class);
+
+	// TODO: Add functionality to distinguish between firmware version. For firmware
+	// version >= 5.22 there are several new registers. Currently it is programmed
+	// for firmware version 5.14.
+	// private boolean softwareVersionSmallerThan_5_22 = true;
+
+	private Config config;
+
+	@Reference
+	private EvcsPower evcsPower;
+
+	@Reference
+	protected ConfigurationAdmin cm;
+
+	/**
+	 * Handles charge states.
+	 */
+	private final ChargeStateHandler chargeStateHandler = new ChargeStateHandler(this);
+
+	/**
+	 * Processes the controller's writes to this evcs component.
+	 */
+	private final WriteHandler writeHandler = new WriteHandler(this);
+
+	public EvcsMennekesImpl() {
+		super(//
+				OpenemsComponent.ChannelId.values(), //
+				ModbusComponent.ChannelId.values(), //
+				Evcs.ChannelId.values(), //
+				ManagedEvcs.ChannelId.values(), //
+				ElectricityMeter.ChannelId.values(), //
+				EvcsMennekes.ChannelId.values());
+	}
+
+	@Override
+	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
+	protected void setModbus(BridgeModbus modbus) {
+		super.setModbus(modbus);
+	}
+
+	@Activate
+	private void activate(ComponentContext context, Config config) throws OpenemsNamedException {
+		this.config = config;
+		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
+				"Modbus", config.modbus_id())) {
+			return;
+		}
+
+		/*
+		 * Calculates the maximum and minimum hardware power dynamically by listening on
+		 * the fixed hardware limit and the phases used for charging
+		 */
+		Evcs.addCalculatePowerLimitListeners(this);
+		this.applyConfig(config);
+
+		this.detectSoftwareVersion();
+	}
+
+	@Modified
+	private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
+		this.applyConfig(config);
+		if (super.modified(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
+				"Modbus", config.modbus_id())) {
+			return;
+		}
+	}
+
+	private void applyConfig(Config config) {
+		this.config = config;
+		this._setChargingType(ChargingType.AC);
+		this._setFixedMaximumHardwarePower(this.getConfiguredMaximumHardwarePower());
+		this._setFixedMinimumHardwarePower(this.getConfiguredMinimumHardwarePower());
+		this._setPowerPrecision(230);
+		this._setPhases(3);
+	}
+
+	@Override
+	@Deactivate
+	protected void deactivate() {
+		super.deactivate();
+	}
+
+	@Override
+	public EvcsPower getEvcsPower() {
+		return this.evcsPower;
+	}
+
+	@Override
+	public void handleEvent(Event event) {
+		if (!this.isEnabled()) {
+			return;
+		}
+		switch (event.getTopic()) {
+		case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE -> {
+			if (!this.isReadOnly()) {
+				this.writeHandler.run();
+			}
+			break;
+		}
+		}
+	}
+
+	@Override
+	protected ModbusProtocol defineModbusProtocol() {
+		// TODO: Distinguish between firmware version. For firmware version >= 5.22
+		// there are several new registers.
+		ModbusProtocol modbusProtocol = new ModbusProtocol(this,
+				new FC3ReadRegistersTask(104, Priority.HIGH,
+						m(EvcsMennekes.ChannelId.OCPP_CP_STATUS, new UnsignedWordElement(104))),
+				new FC3ReadRegistersTask(111, Priority.LOW, //
+						m(new BitsWordElement(111, this)) //
+								.bit(0, EvcsMennekes.ChannelId.ERR_ACTUATOR_UNLOCKED_WHILE_CHARGING) //
+								.bit(1, EvcsMennekes.ChannelId.ERR_TILT_PREVENT_CHARGING_UNTIL_REBOOT) //
+								.bit(2, EvcsMennekes.ChannelId.ERR_PIC24) //
+								.bit(3, EvcsMennekes.ChannelId.ERR_USB_STICK_HANDLING) //
+								.bit(4, EvcsMennekes.ChannelId.ERR_INCORRECT_PHASE_INSTALLATION) //
+								.bit(5, EvcsMennekes.ChannelId.ERR_NO_POWER),
+						m(new BitsWordElement(112, this)).bit(0, EvcsMennekes.ChannelId.ERR_RCMB_TRIGGERED) //
+								.bit(1, EvcsMennekes.ChannelId.ERR_VEHICLE_STATE_E) //
+								.bit(2, EvcsMennekes.ChannelId.ERR_MODE3_DIODE_CHECK) //
+								.bit(3, EvcsMennekes.ChannelId.ERR_MCB_TYPE2_TRIGGERED) //
+								.bit(4, EvcsMennekes.ChannelId.ERR_MCB_SCHUKO_TRIGGERED) //
+								.bit(5, EvcsMennekes.ChannelId.ERR_RCD_TRIGGERED) //
+								.bit(6, EvcsMennekes.ChannelId.ERR_CONTACTOR_WELD) //
+								.bit(7, EvcsMennekes.ChannelId.ERR_BACKEND_DISCONNECTED) //
+								.bit(8, EvcsMennekes.ChannelId.ERR_ACTUATOR_LOCKING_FAILED) //
+								.bit(9, EvcsMennekes.ChannelId.ERR_ACTUATOR_LOCKING_WITHOUT_PLUG_FAILED) //
+								.bit(10, EvcsMennekes.ChannelId.ERR_ACTUATOR_STUCK) //
+								.bit(11, EvcsMennekes.ChannelId.ERR_ACTUATOR_DETECTION_FAILED) //
+								.bit(12, EvcsMennekes.ChannelId.ERR_FW_UPDATE_RUNNING) //
+								.bit(13, EvcsMennekes.ChannelId.ERR_TILT) //
+								.bit(14, EvcsMennekes.ChannelId.ERR_WRONG_CP_PR_WIRING) //
+								.bit(15, EvcsMennekes.ChannelId.ERR_TYPE2_OVERLOAD_THR_2)),
+				new FC3ReadRegistersTask(122, Priority.HIGH,
+						m(EvcsMennekes.ChannelId.VEHICLE_STATE, new UnsignedWordElement(122))),
+				new FC3ReadRegistersTask(131, Priority.LOW,
+						m(EvcsMennekes.ChannelId.SAFE_CURRENT, new UnsignedWordElement(131))),
+				new FC3ReadRegistersTask(200, Priority.HIGH,
+						m(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(200))),
+				new FC3ReadRegistersTask(206, Priority.HIGH,
+						m(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, new UnsignedDoublewordElement(206)),
+						m(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, new UnsignedDoublewordElement(208)),
+						m(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, new UnsignedDoublewordElement(210)),
+						m(ElectricityMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(212)),
+						m(ElectricityMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(214)),
+						m(ElectricityMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(216))),
+				new FC3ReadRegistersTask(1000, Priority.LOW,
+						m(EvcsMennekes.ChannelId.EMS_CURRENT_LIMIT, new UnsignedWordElement(1000))),
+				new FC16WriteRegistersTask(1000,
+						m(EvcsMennekes.ChannelId.APPLY_CURRENT_LIMIT, new UnsignedWordElement(1000))));
+
+		// Calculates required Channels from other existing Channels.
+		this.addCalculateChannelListeners();
+
+		this.addStatusListener();
+
+		return modbusProtocol;
+	}
+
+	private void addCalculateChannelListeners() {
+
+		// TODO: Power is given by the charger since firmware 5.22
+		final Consumer<Value<Integer>> powerChannels = ignore -> {
+			this._setActivePower(TypeUtils.sum(this.getActivePowerL1().orElse(0), this.getActivePowerL2().orElse(0),
+					this.getActivePowerL3().orElse(0)));
+			final var phases = Evcs.evaluatePhaseCount(//
+					this.getActivePowerL1().orElse(0), //
+					this.getActivePowerL2().orElse(0), //
+					this.getActivePowerL3().orElse(0));
+			this._setPhases(phases);
+		};
+
+		this.getActivePowerL1Channel().onSetNextValue(powerChannels);
+		this.getActivePowerL2Channel().onSetNextValue(powerChannels);
+		this.getActivePowerL3Channel().onSetNextValue(powerChannels);
+	}
+
+	private void addStatusListener() {
+		this.channel(EvcsMennekes.ChannelId.OCPP_CP_STATUS).onSetNextValue(s -> {
+			var currentStatus = Status.UNDEFINED;
+			MennekesOcppState rawState = s.asEnum();
+			/**
+			 * Maps the raw state into a {@link Status}.
+			 */
+			currentStatus = switch (rawState) {
+			case CHARGING -> Status.CHARGING;
+			case FAULTED -> Status.ERROR;
+			case FINISHING -> Status.CHARGING_FINISHED;
+			case PREPARING -> Status.READY_FOR_CHARGING;
+			case RESERVED -> Status.NOT_READY_FOR_CHARGING;
+			case AVAILABLE, SUSPENDEDEV, SUSPENDEDEVSE, OCCUPIED -> Status.CHARGING_REJECTED;
+			case UNAVAILABLE -> Status.ERROR;
+			case UNDEFINED -> currentStatus;
+			};
+			this._setStatus(currentStatus);
+		});
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return this.config.readOnly();
+	}
+
+	@Override
+	public int getConfiguredMinimumHardwarePower() {
+		return Math.round(this.config.minHwCurrent() / 1000f) * DEFAULT_VOLTAGE * Phases.THREE_PHASE.getValue();
+	}
+
+	@Override
+	public int getConfiguredMaximumHardwarePower() {
+		return Math.round(this.config.maxHwCurrent() / 1000f) * DEFAULT_VOLTAGE * Phases.THREE_PHASE.getValue();
+	}
+
+	@Override
+	public boolean getConfiguredDebugMode() {
+		return this.config.debugMode();
+	}
+
+	@Override
+	public boolean applyDisplayText(String text) throws OpenemsException {
+		return false;
+	}
+
+	@Override
+	public int getMinimumTimeTillChargingLimitTaken() {
+		return 30;
+	}
+
+	@Override
+	public ChargeStateHandler getChargeStateHandler() {
+		return this.chargeStateHandler;
+	}
+
+	@Override
+	public void logDebug(String message) {
+		if (this.config.debugMode()) {
+			this.logInfo(this.log, message);
+		}
+	}
+
+	@Override
+	public String debugLog() {
+		return "Limit:" + this.getSetChargePowerLimit().orElse(null) + "|" + this.getStatus().getName();
+	}
+
+	public boolean isCharging() {
+		return this.getActivePower().orElse(0) > 0;
+	}
+
+	@Override
+	public boolean applyChargePowerLimit(int power) throws Exception {
+		if (this.isReadOnly()) {
+			return false;
+		}
+		var phases = this.getPhasesAsInt();
+		var current = Math.round(power / phases / Evcs.DEFAULT_VOLTAGE);
+
+		/*
+		 * Limits the charging value because Mennekes knows only values between 6 and 32
+		 * A
+		 */
+		current = Math.min(current, Evcs.DEFAULT_MAXIMUM_HARDWARE_CURRENT / 1000);
+
+		if (current < Evcs.DEFAULT_MINIMUM_HARDWARE_CURRENT / 1000) {
+			current = 0;
+		}
+
+		this.setApplyCurrentLimit(current);
+		return true;
+	}
+
+	@Override
+	public boolean pauseChargeProcess() throws Exception {
+		return this.applyChargePowerLimit(0);
+	}
+
+	@Override
+	public MeterType getMeterType() {
+		if (this.config.readOnly()) {
+			return MeterType.CONSUMPTION_METERED;
+		} else {
+			return MeterType.MANAGED_CONSUMPTION_METERED;
+		}
+	}
+
+	private void detectSoftwareVersion() throws OpenemsException {
+		readElementOnce(FC3, this.getModbusProtocol(), ModbusUtils::retryOnNull,
+				new UnsignedDoublewordElement(100).wordOrder(WordOrder.MSWLSW)).thenAccept(registerValue -> {
+					if (registerValue == null) {
+						return;
+					}
+
+					this.channel(EvcsMennekes.ChannelId.RAW_FIRMWARE_VERSION).setNextValue(registerValue);
+					final var firmwareVersion = parseSoftwareVersion(registerValue.intValue());
+					this.channel(EvcsMennekes.ChannelId.FIRMWARE_VERSION.id()).setNextValue(firmwareVersion);
+					final var outdated = !SemanticVersion.fromString(firmwareVersion)
+							.isAtLeast(SemanticVersion.fromString("5.22"));
+					this.getFirmwareOutdatedChannel().setNextValue(outdated);
+
+					if (!outdated) {
+						this.getModbusProtocol().addTask(//
+								new FC3ReadRegistersTask(705, Priority.HIGH,
+										m(Evcs.ChannelId.ENERGY_SESSION, new UnsignedWordElement(705))));
+						this.getModbusProtocol().addTask(//
+								new FC3ReadRegistersTask(706, Priority.LOW,
+										m(EvcsMennekes.ChannelId.MAX_CURRENT_EV, new UnsignedWordElement(706)),
+										new DummyRegisterElement(707, 708),
+										m(EvcsMennekes.ChannelId.CHARGE_DURATION, new UnsignedWordElement(709)),
+										new DummyRegisterElement(710, 711), //
+										m(EvcsMennekes.ChannelId.MIN_CURRENT_LIMIT, new UnsignedWordElement(712))));
+					}
+				});
+	}
+
+	protected static String parseSoftwareVersion(int registerValue) {
+
+		byte[] bytes = new byte[4];
+		bytes[0] = (byte) ((registerValue >> 24) & 0xFF);
+		bytes[1] = (byte) ((registerValue >> 16) & 0xFF);
+		bytes[2] = (byte) ((registerValue >> 8) & 0xFF);
+		bytes[3] = (byte) (registerValue & 0xFF);
+
+		// Convert bytes to a string
+		StringBuilder firmwareVersionBuilder = new StringBuilder();
+		for (byte b : bytes) {
+			if (b != 0) {
+				firmwareVersionBuilder.append((char) b);
+			}
+		}
+
+		final var firmwareVersion = firmwareVersionBuilder.toString();
+		return firmwareVersion;
+	}
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesErrorStates.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesErrorStates.java
new file mode 100644
index 00000000000..1aa8dbf96c1
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesErrorStates.java
@@ -0,0 +1,84 @@
+package io.openems.edge.evcs.mennekes;
+
+import io.openems.common.types.OptionsEnum;
+import io.openems.edge.evcs.mennekes.EvcsMennekes.ChannelId;
+
+public enum MennekesErrorStates implements OptionsEnum {
+	UNDEFINED(0x0, //
+			"Undefined", null), //
+	ERR_RCMB_TRIGGERED(0x1, //
+			"Residual current detected via sensor", ChannelId.ERR_RCMB_TRIGGERED), //
+	ERR_VEHICLE_STATE_E(0x2, //
+			"Vehicle signals error", ChannelId.ERR_VEHICLE_STATE_E), //
+	ERR_MODE3_DIDE_CHECK(0x4, //
+			"ReseVehicle diode check failed - tamper detection", ChannelId.ERR_MODE3_DIODE_CHECK), //
+	ERR_MCB_TYPE2_TRIGGERED(0x8, //
+			"MCB of type 2 socket triggered", ChannelId.ERR_MCB_TYPE2_TRIGGERED), //
+	ERR_MCB_SCHUKO_TRIGGERED(0x10, //
+			"MCB of domestic socket triggered", ChannelId.ERR_MCB_SCHUKO_TRIGGERED), //
+	ERR_RCD_TRIGGERED(0x20, //
+			"RCD triggered", ChannelId.ERR_RCD_TRIGGERED), //
+	ERR_CONTACTOR_WELD(0x40, //
+			"Contactor welded", ChannelId.ERR_CONTACTOR_WELD), //
+	ERR_BACKEND_DISCONNECTED(0x80, //
+			"Backend disconnected", ChannelId.ERR_BACKEND_DISCONNECTED), //
+	ERR_ACTUATOR_LOCKING_FAILED(0x100, //
+			"Plug locking failed", ChannelId.ERR_ACTUATOR_LOCKING_FAILED), //
+	ERR_ACTUATOR_LOCKING_WITHOUT_PLUG_FAILED(0x200, //
+			"Locking without plug error", ChannelId.ERR_ACTUATOR_LOCKING_WITHOUT_PLUG_FAILED), //
+	ERR_ACTUATOR_STUCK(0x400, //
+			"Actuator stuck cannot unlock", ChannelId.ERR_ACTUATOR_STUCK), //
+	ERR_ACTUATOR_DETECTION_FAILED(0x800, //
+			"Actuator detection failed", ChannelId.ERR_ACTUATOR_DETECTION_FAILED), //
+	ERR_FW_UPDATE_RUNNING(0x1000, //
+			"FW Update in progress", ChannelId.ERR_FW_UPDATE_RUNNING), //
+	ERR_TILT(0x2000, //
+			"The charge point is tilted", ChannelId.ERR_TILT), //
+	ERR_WRONG_CP_PR_WIRING(0x4000, //
+			"CP/PR wiring issue", ChannelId.ERR_WRONG_CP_PR_WIRING), //
+	ERR_TYPE2_OVERLOAD_THR_2(0x8000, //
+			"Car current overload, charging stopped", ChannelId.ERR_TYPE2_OVERLOAD_THR_2), //
+	ERR_ACTUATOR_UNLOCKED_WHILE_CHARGING(0x10000, //
+			"Actuator unlocked while charging", ChannelId.ERR_ACTUATOR_UNLOCKED_WHILE_CHARGING), //
+	ERR_TILT_PREVENT_CHARGING_UNTIL_REBOOT(0x20000, //
+			"The charge point was tilted and it is not allowed to charge until the charge point is rebooted",
+			ChannelId.ERR_TILT_PREVENT_CHARGING_UNTIL_REBOOT), //
+	ERR_PIC24(0x40000, //
+			"PIC24 error", ChannelId.ERR_PIC24), //
+	ERR_USB_STICK_HANDLING(0x80000, //
+			"USB stick handling in progress", ChannelId.ERR_USB_STICK_HANDLING), //
+	ERR_INCORRECT_PHASE_INSTALLATION(0x100000, //
+			"Incorrect phase rotation direction detected", ChannelId.ERR_INCORRECT_PHASE_INSTALLATION), //
+	ERR_NO_POWER(0x200000, //
+			"No power on mains detected", ChannelId.ERR_NO_POWER) //
+	;
+
+	private final int value;
+	private final String name;
+	private final ChannelId channel;
+
+	private MennekesErrorStates(int value, String name, ChannelId channel) {
+		this.value = value;
+		this.name = name;
+		this.channel = channel;
+	}
+
+	public ChannelId getChannel() {
+		return this.channel;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return UNDEFINED;
+	}
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesOcppState.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesOcppState.java
new file mode 100644
index 00000000000..742d8b64b21
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/MennekesOcppState.java
@@ -0,0 +1,41 @@
+package io.openems.edge.evcs.mennekes;
+
+import io.openems.common.types.OptionsEnum;
+
+public enum MennekesOcppState implements OptionsEnum {
+	UNDEFINED(-1, "Undefined"), //
+	AVAILABLE(0, "Available"), //
+	OCCUPIED(1, "Occupied"), //
+	RESERVED(2, "Reserved"), //
+	UNAVAILABLE(3, "Unavailable"), //
+	FAULTED(4, "Faulted"), //
+	PREPARING(5, "Preparing"), //
+	CHARGING(6, "Charging"), //
+	SUSPENDEDEVSE(7, "SuspendedEVSE"), //
+	SUSPENDEDEV(8, "SuspendedEV"), //
+	FINISHING(9, "Finishing"), //
+	;
+
+	private final int value;
+	private final String name;
+
+	private MennekesOcppState(int value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return UNDEFINED;
+	}
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/VehicleState.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/VehicleState.java
new file mode 100644
index 00000000000..11f1d1b64db
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/VehicleState.java
@@ -0,0 +1,36 @@
+package io.openems.edge.evcs.mennekes;
+
+import io.openems.common.types.OptionsEnum;
+
+public enum VehicleState implements OptionsEnum {
+	UNDEFINED(-1, "Undefined"), //
+	STATE_A(1, "No EV connected to the EVSE "), //
+	STATE_B(2, "EV connected to the EVSE, but not ready for charging "), //
+	STATE_C(3, "Connected and ready for charging, ventilation is not required "), //
+	STATE_D(4, "Connected, ready for charging and ventilation is required "), //
+	STATE_E(5, "Electrical short to earth on the controller of the EVSE, no power supply") //
+	;
+
+	private final int value;
+	private final String name;
+
+	private VehicleState(int value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return UNDEFINED;
+	}
+}
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_de.properties b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_de.properties
new file mode 100644
index 00000000000..c86d805eb42
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_de.properties
@@ -0,0 +1,23 @@
+errRcmbTriggered = Reststrom durch Sensor erkannt.
+errVehicleStateE = Fahrzeugsignalfehler.
+errMode3DiodeCheck = Fahrzeug-Diodentest fehlgeschlagen - Manipulationserkennung.
+errMcbType2Triggered = Schutzschalter des Typ-2-Anschlusses ausgelöst.
+errMcbSchukoTriggered = Schutzschalter der Haushaltssteckdose ausgelöst.
+errRcdTriggered = FI-Schutzschalter ausgelöst.
+errContactorWeld = Schütz geschweißt.
+errBackendDisconnected = Backend getrennt.
+errActuatorLockingFailed = Verriegelung des Steckers fehlgeschlagen.
+errActuatorLockingWithoutPlugFailed = Verriegelung ohne Stecker fehlgeschlagen.
+errActuatorStuck = Aktor blockiert, kann nicht entriegeln.
+errActuatorDetectionFailed = Aktor-Erkennung fehlgeschlagen.
+errFwUpdateRunning = Firmware-Update läuft.
+errTilt = Die Ladestation blockiert einen möglichen Ladevorgang.
+errWrongCpPrWiring = Problem mit CP/PR-Verkabelung.
+errType2OverloadThr2 = Fahrzeugstromüberlastung, Ladevorgang gestoppt.
+errActuatorUnlockedWhileCharging = Aktor entriegelt während des Ladevorgangs.
+errTiltPreventChargingUntilReboot = Die Ladestation blockiert einen möglichen Ladevorgang, Laden erst nach Neustart möglich.
+errPic24 = PIC24 Fehler.
+errUsbStickHandling = USB-Stick-Verarbeitung läuft.
+errIncorrectPhaseInstallation = Falsche Phasenrotation erkannt.
+errNoPower = Kein Strom an der Hauptversorgung erkannt.
+firmwareOutdated = Hinweis: Für Ihre Ladestation ist ein Update verfügbar. Um "Energie seit Ladebeginn" nutzen zu können wird die Firmware-Version 5.22 oder neuer benötigt.
\ No newline at end of file
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_en.properties b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_en.properties
new file mode 100644
index 00000000000..d417a49964c
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/translation_en.properties
@@ -0,0 +1,23 @@
+errRcmbTriggered = Residual current detected via sensor.
+errVehicleStateE = Vehicle signals error.
+errMode3DiodeCheck = Vehicle diode check failed - tamper detection.
+errMcbType2Triggered = MCB of type 2 socket triggered.
+errMcbSchukoTriggered = MCB of domestic socket triggered.
+errRcdTriggered = RCD triggered.
+errContactorWeld = Contactor welded.
+errBackendDisconnected = Backend disconnected.
+errActuatorLockingFailed = Plug locking failed.
+errActuatorLockingWithoutPlugFailed = Locking without plug error.
+errActuatorStuck = Actuator stuck, cannot unlock.
+errActuatorDetectionFailed = Actuator detection failed.
+errFwUpdateRunning = Firmware update in progress.
+errTilt = The charge point is tilted.
+errWrongCpPrWiring = CP/PR wiring issue.
+errType2OverloadThr2 = Car current overload, charging stopped.
+errActuatorUnlockedWhileCharging = Actuator unlocked while charging.
+errTiltPreventChargingUntilReboot = The charge point was tilted and charging is prevented until reboot.
+errPic24 = PIC24 error.
+errUsbStickHandling = USB stick handling in progress.
+errIncorrectPhaseInstallation = Incorrect phase rotation direction detected.
+errNoPower = No power on mains detected.
+firmwareOutdated = Note: An update is available for your charging station. Firmware version 5.22 or newer is required to use the "Energy since start of charging" function.
\ No newline at end of file
diff --git a/io.openems.edge.evcs.mennekes/test/.gitignore b/io.openems.edge.evcs.mennekes/test/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MennekesTest.java b/io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MennekesTest.java
new file mode 100644
index 00000000000..9727e0f0df1
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MennekesTest.java
@@ -0,0 +1,53 @@
+package io.openems.edge.evcs.mennekes;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import io.openems.common.types.ChannelAddress;
+import io.openems.edge.bridge.modbus.test.DummyModbusBridge;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.evcs.api.Evcs;
+import io.openems.edge.evcs.api.Status;
+
+public class MennekesTest {
+
+	private static final String EVCS_ID = "evcs0";
+	private static final String MODBUS_ID = "modbus0";
+
+	@Test
+	public void test() throws Exception {
+		new ComponentTest(new EvcsMennekesImpl()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)//
+						// Task 2
+						.withRegister(104, 6))//
+
+				.activate(MyConfig.create() //
+						.setModbusId(MODBUS_ID) //
+						.setId(EVCS_ID) //
+						.setModbusUnitId(1) //
+						.setMaxHwPower(10_000) //
+						.setMinHwPower(5_000) //
+						.build()) //
+
+				.next(new TestCase()//
+						.output(new ChannelAddress(EVCS_ID, EvcsMennekes.ChannelId.OCPP_CP_STATUS.id()),
+								MennekesOcppState.CHARGING)
+						.output(new ChannelAddress(EVCS_ID, Evcs.ChannelId.STATUS.id()), Status.CHARGING));
+	}
+
+	@Test
+	public void parseSoftwareVersionTest() {
+		// raw value from fems4 test
+		int registerValue = 892219954;
+		var firmwareVersion = EvcsMennekesImpl.parseSoftwareVersion(registerValue);
+		assertEquals("5.22", firmwareVersion);
+		// raw value from fems4 test
+		registerValue = 892219698;
+		firmwareVersion = EvcsMennekesImpl.parseSoftwareVersion(registerValue);
+		assertEquals("5.12", firmwareVersion);
+	}
+}
diff --git a/io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MyConfig.java b/io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MyConfig.java
new file mode 100644
index 00000000000..fc6425b8470
--- /dev/null
+++ b/io.openems.edge.evcs.mennekes/test/io/openems/edge/evcs/mennekes/MyConfig.java
@@ -0,0 +1,100 @@
+package io.openems.edge.evcs.mennekes;
+
+import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.utils.ConfigUtils;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+	protected static class Builder {
+		private String id;
+		private String modbusId;
+		private int modbusUnitId;
+		private int minHwPower;
+		private int maxHwPower;
+
+		private Builder() {
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setModbusId(String modbusId) {
+			this.modbusId = modbusId;
+			return this;
+		}
+
+		public Builder setModbusUnitId(int modbusUnitId) {
+			this.modbusUnitId = modbusUnitId;
+			return this;
+		}
+
+		public Builder setMinHwPower(int minHwPower) {
+			this.minHwPower = minHwPower;
+			return this;
+		}
+
+		public Builder setMaxHwPower(int maxHwPower) {
+			this.maxHwPower = maxHwPower;
+			return this;
+		}
+
+		public MyConfig build() {
+			return new MyConfig(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 *
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfig(Builder builder) {
+		super(Config.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public boolean debugMode() {
+		return false;
+	}
+
+	@Override
+	public int minHwCurrent() {
+		return this.builder.minHwPower;
+	}
+
+	@Override
+	public int maxHwCurrent() {
+		return this.builder.maxHwPower;
+	}
+
+	@Override
+	public String modbus_id() {
+		return this.builder.modbusId;
+	}
+
+	@Override
+	public String Modbus_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), this.modbus_id());
+	}
+
+	@Override
+	public int modbusUnitId() {
+		return this.builder.modbusUnitId;
+	}
+
+	@Override
+	public boolean readOnly() {
+		return true;
+	}
+
+}
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
index eddc1c5dc9c..d6574501518 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
@@ -176,16 +176,7 @@ protected ModbusProtocol defineModbusProtocol() {
 						m(GoodWeGridMeter.ChannelId.METER_POWER_FACTOR, new UnsignedWordElement(36013),
 								this.ignoreZeroAndScaleFactorMinus2), //
 						m(ElectricityMeter.ChannelId.FREQUENCY, new UnsignedWordElement(36014),
-								this.ignoreZeroAndScaleFactor1)),
-
-				new FC3ReadRegistersTask(47456, Priority.LOW, //
-						m(GoodWeGridMeter.ChannelId.EXTERNAL_METER_RATIO, new UnsignedWordElement(47456)) //
-				),
-
-				// Cannot be written for GoodWe Gen2
-				new FC6WriteRegisterTask(47456,
-						m(GoodWeGridMeter.ChannelId.EXTERNAL_METER_RATIO, new UnsignedWordElement(47456)) //
-				));
+								this.ignoreZeroAndScaleFactor1)));
 
 		// Handles different DSP versions
 		readElementOnce(FC3, protocol, ModbusUtils::retryOnNull, new UnsignedWordElement(35016))
@@ -195,6 +186,12 @@ protected ModbusProtocol defineModbusProtocol() {
 					}
 				});
 
+		switch (this.config.goodWeMeterCategory()) {
+		case COMMERCIAL_METER -> this.handleExternalMeter(protocol);
+		case SMART_METER, INTEGRATED_METER -> {
+		}
+		}
+
 		return protocol;
 	}
 
@@ -223,10 +220,30 @@ private void handleDspVersion4(ModbusProtocol protocol) {
 										createAdjustCurrentSign(this.getActivePowerL3Channel()::getNextValue))))); //
 	}
 
+	private void handleExternalMeter(ModbusProtocol protocol) {
+
+		protocol.addTask(//
+				new FC6WriteRegisterTask(47456,
+						m(GoodWeGridMeter.ChannelId.EXTERNAL_METER_RATIO, new UnsignedWordElement(47456)) //
+				)); //
+
+		protocol.addTask(//
+				new FC3ReadRegistersTask(47456, Priority.LOW, //
+						m(GoodWeGridMeter.ChannelId.EXTERNAL_METER_RATIO, new UnsignedWordElement(47456)) //
+				)); //
+	}
+
 	@Override
 	public void handleEvent(Event event) {
 		switch (event.getTopic()) {
-		case EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE -> this.handleMeterRatio();
+		case EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE -> {
+
+			switch (this.config.goodWeMeterCategory()) {
+			case COMMERCIAL_METER -> this.setExternalMeterValue();
+			case SMART_METER, INTEGRATED_METER -> {
+			}
+			}
+		}
 		case EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE -> this.calculateEnergy();
 		}
 	}
@@ -234,13 +251,9 @@ public void handleEvent(Event event) {
 	/**
 	 * Set channel for external meter if configured.
 	 */
-	private void handleMeterRatio() {
-		Integer meterCtRatio = switch (this.config.goodWeMeterCategory()) {
-		case COMMERCIAL_METER ->
-			calculateRatio(this.config.externalMeterRatioValueA(), this.config.externalMeterRatioValueB());
-		case INTEGRATED_METER -> 90;
-		case SMART_METER -> 3000;
-		};
+	protected void setExternalMeterValue() {
+		final var meterCtRatio = calculateRatio(this.config.externalMeterRatioValueA(),
+				this.config.externalMeterRatioValueB());
 
 		try {
 			ChannelUtils.setWriteValueIfNotRead(this.getExternalMeterRatioChannel(), meterCtRatio);
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImplTest.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImplTest.java
index 7312031838e..c32d8e8b7f8 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImplTest.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImplTest.java
@@ -121,7 +121,7 @@ public void testReadFromModbus() throws Exception {
 						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, -1610) //
 						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 710)) //
 
-				.next(new TestCase(), 5) // Wait for 36052
+				.next(new TestCase(), 3) // Wait for 36052
 				.next(new TestCase() //
 						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 200_000) //
 						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, 220_000) //
@@ -189,7 +189,7 @@ public void testExternalMeterRatio() throws Exception {
 						.setExternalMeterRatioValueB(5) //
 						.build()) //
 				.next(new TestCase() //
-						.output(EXTERNAL_METER_RATIO, 3000));
+						.output(EXTERNAL_METER_RATIO, null));
 	}
 
 	@Test
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/prediction/Prediction.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/prediction/Prediction.java
index 959b86f3cd7..4c7e406716b 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/prediction/Prediction.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/prediction/Prediction.java
@@ -74,9 +74,11 @@ public static Prediction sum(Prediction... predictions) {
 		return Prediction.from(result.build());
 	}
 
-	private static record ValueRange(Integer min, Integer max) {
-
+	protected static record ValueRange(Integer min, Integer max) {
 		public Integer fitWithin(Integer value) {
+			if (value == null) {
+				return null;
+			}
 			if (this.max != null && value > this.max) {
 				value = this.max;
 			}
diff --git a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/oneday/PredictionTest.java b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/oneday/PredictionTest.java
deleted file mode 100644
index c42a7d2b3a7..00000000000
--- a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/oneday/PredictionTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.openems.edge.predictor.api.oneday;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import io.openems.common.types.ChannelAddress;
-import io.openems.edge.common.sum.DummySum;
-import io.openems.edge.predictor.api.prediction.Prediction;
-
-public class PredictionTest {
-
-	@Test
-	public void testOf() {
-		var now = ZonedDateTime.now();
-		var sum = new DummySum();
-
-		assertArrayEquals(new Integer[] { 1, 5, 7, 0 /* ValueRange positive */, 9, null, null }, //
-				Arrays.copyOfRange(//
-						Prediction.from(sum, //
-								new ChannelAddress("_sum", "ProductionActivePower"), now, //
-								1, 5, 7, -1, 9 //
-						).asArray(), 0, 7));
-
-		assertArrayEquals(new Integer[] { 1, 5, 7, -1 /* NONE */, 9, null, null }, //
-				Arrays.copyOfRange(//
-						Prediction.from(sum, //
-								new ChannelAddress("foo", "bar"), now, //
-								1, 5, 7, -1, 9 //
-						).asArray(), 0, 7));
-	}
-
-}
diff --git a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/prediction/PredictionTest.java b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/prediction/PredictionTest.java
new file mode 100644
index 00000000000..0938f36e55a
--- /dev/null
+++ b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/prediction/PredictionTest.java
@@ -0,0 +1,64 @@
+package io.openems.edge.predictor.api.prediction;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import io.openems.common.types.ChannelAddress;
+import io.openems.edge.common.sum.DummySum;
+import io.openems.edge.predictor.api.prediction.Prediction.ValueRange;
+
+public class PredictionTest {
+
+	@Test
+	public void testOf() {
+		var now = ZonedDateTime.now();
+		var sum = new DummySum();
+
+		assertArrayEquals(new Integer[] { 1, 5, 7, 0 /* ValueRange positive */, 9, null, null }, //
+				Arrays.copyOfRange(//
+						Prediction.from(sum, //
+								new ChannelAddress("_sum", "ProductionActivePower"), now, //
+								1, 5, 7, -1, 9 //
+						).asArray(), 0, 7));
+
+		assertArrayEquals(new Integer[] { 1, 5, 7, -1 /* NONE */, 9, null, null }, //
+				Arrays.copyOfRange(//
+						Prediction.from(sum, //
+								new ChannelAddress("foo", "bar"), now, //
+								1, 5, 7, -1, 9 //
+						).asArray(), 0, 7));
+	}
+
+	@Test
+	public void testValueRange() {
+		{
+			var vr = new ValueRange(null, null);
+			assertNull(vr.fitWithin(null));
+			assertEquals(100, vr.fitWithin(100).intValue());
+		}
+		{
+			var vr = new ValueRange(-100, null);
+			assertNull(vr.fitWithin(null));
+			assertEquals(-100, vr.fitWithin(-150).intValue());
+			assertEquals(150, vr.fitWithin(150).intValue());
+		}
+		{
+			var vr = new ValueRange(null, 100);
+			assertNull(vr.fitWithin(null));
+			assertEquals(-150, vr.fitWithin(-150).intValue());
+			assertEquals(100, vr.fitWithin(150).intValue());
+		}
+		{
+			var vr = new ValueRange(-100, 100);
+			assertNull(vr.fitWithin(null));
+			assertEquals(-100, vr.fitWithin(-150).intValue());
+			assertEquals(100, vr.fitWithin(150).intValue());
+		}
+	}
+}
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/SimulatorGridMeterActingImpl.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/SimulatorGridMeterActingImpl.java
index 57df9b2454e..002fea68f86 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/SimulatorGridMeterActingImpl.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/SimulatorGridMeterActingImpl.java
@@ -195,12 +195,12 @@ public Timedata getTimedata() {
 
 	/**
 	 * Converts a string representation of time to an Instant object.
+	 * 
 	 * <p>
 	 * If the input time is null or empty, the current time is returned. If the
 	 * input time is successfully parsed, it is converted to an Instant object. If
 	 * the parsed time is in the past, and the current time is returned. If there's
 	 * an error parsing the input time, and the current time is returned.
-	 * </p>
 	 *
 	 * @param inputTime the string representation of time to be converted
 	 * @return an Instant converted time
diff --git a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java
index 45eda644f88..be7cdd5b5c3 100644
--- a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java
+++ b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java
@@ -1,8 +1,11 @@
 package io.openems.edge.timeofusetariff.api;
 
+import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
 import static io.openems.common.utils.DateUtils.roundDownToQuarter;
 
 import java.time.ZonedDateTime;
+import java.util.Comparator;
+import java.util.Map.Entry;
 import java.util.SortedMap;
 
 import com.google.common.collect.ImmutableSortedMap;
@@ -81,12 +84,14 @@ public static TimeOfUsePrices from(ZonedDateTime time, TimeOfUsePrices prices) {
 			// prices is EMPTY
 			return EMPTY_PRICES;
 		}
-		time = roundDownToQuarter(time);
-		if (prices.valuePerQuarter.firstKey().isEqual(time)) {
+		final var baseTime = roundDownToQuarter(time);
+		if (prices.valuePerQuarter.firstKey().isEqual(baseTime)) {
 			// prices is still valid
 			return prices;
 		}
-		final var newMap = prices.valuePerQuarter.tailMap(time, true);
+		final var newMap = prices.valuePerQuarter.entrySet().stream() //
+				.filter(e -> !baseTime.isAfter(e.getKey())) //
+				.collect(toImmutableSortedMap(Comparator.naturalOrder(), Entry::getKey, Entry::getValue));
 		if (newMap.isEmpty()) {
 			// new prices would be empty
 			return EMPTY_PRICES;
diff --git a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Config.java b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Config.java
index e0f5ac2ac9b..ae9d004ee20 100644
--- a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Config.java
+++ b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Config.java
@@ -24,5 +24,8 @@
 	@AttributeDefinition(name = "Bidding Zone", description = "Zone corresponding to the customer's location")
 	BiddingZone biddingZone();
 
+	@AttributeDefinition(name = "Resolution", description = "Resolution corresponding to the price interval")
+	Resolution resolution() default Resolution.HOURLY;
+
 	String webconsole_configurationFactory_nameHint() default "Time-Of-Use Tariff ENTSO-E [{id}]";
 }
\ No newline at end of file
diff --git a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Resolution.java b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Resolution.java
new file mode 100644
index 00000000000..918e094cb7a
--- /dev/null
+++ b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Resolution.java
@@ -0,0 +1,24 @@
+package io.openems.edge.timeofusetariff.entsoe;
+
+import java.time.Duration;
+
+public enum Resolution {
+
+	/**
+	 * Prices every Hour.
+	 */
+	HOURLY("PT60M"), //
+	/**
+	 * Prices every Quarter.
+	 */
+	QUARTERLY("PT15M");
+
+	public final String resolutionCode;
+	public final Duration duration;
+
+	private Resolution(String resolutionCode) {
+		this.resolutionCode = resolutionCode;
+		this.duration = Duration.parse(resolutionCode);
+	}
+
+}
diff --git a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/TouEntsoeImpl.java b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/TouEntsoeImpl.java
index fda5777bdd5..248caf0677a 100644
--- a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/TouEntsoeImpl.java
+++ b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/TouEntsoeImpl.java
@@ -122,6 +122,7 @@ private synchronized void scheduleTask(long seconds) {
 		var fromDate = ZonedDateTime.now().truncatedTo(ChronoUnit.HOURS);
 		var toDate = fromDate.plusDays(1);
 		var unableToUpdatePrices = false;
+		var preferredResolution = this.config.resolution();
 
 		try {
 			final var result = EntsoeApi.query(token, areaCode, fromDate, toDate);
@@ -130,7 +131,7 @@ private synchronized void scheduleTask(long seconds) {
 			final double exchangeRate = getExchangeRateOrElse(entsoeCurrency, globalCurrency, 1.);
 
 			// Parse the response for the prices
-			this.prices.set(parsePrices(result, exchangeRate));
+			this.prices.set(parsePrices(result, exchangeRate, preferredResolution));
 
 		} catch (IOException | ParserConfigurationException | SAXException e) {
 			this.logWarn(this.log, "Unable to Update Entsoe Time-Of-Use Price: " + e.getMessage());
diff --git a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Utils.java b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Utils.java
index b3b3a010a5b..effd2527734 100644
--- a/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Utils.java
+++ b/io.openems.edge.timeofusetariff.entsoe/src/io/openems/edge/timeofusetariff/entsoe/Utils.java
@@ -1,7 +1,7 @@
 package io.openems.edge.timeofusetariff.entsoe;
 
-import static io.openems.common.utils.XmlUtils.stream;
 import static io.openems.common.utils.XmlUtils.getXmlRootDocument;
+import static io.openems.common.utils.XmlUtils.stream;
 import static java.lang.Double.parseDouble;
 import static java.lang.Integer.parseInt;
 
@@ -36,14 +36,15 @@ public class Utils {
 	/**
 	 * Parses the XML response from the Entso-E API to get the Day-Ahead prices.
 	 * 
-	 * @param xml          The XML string to be parsed.
-	 * @param exchangeRate The exchange rate of user currency to EUR.
+	 * @param xml                 The XML string to be parsed.
+	 * @param exchangeRate        The exchange rate of user currency to EUR.
+	 * @param preferredResolution The user preferred resolution.
 	 * @return The {@link TimeOfUsePrices}
 	 * @throws ParserConfigurationException on error.
 	 * @throws SAXException                 on error
 	 * @throws IOException                  on error
 	 */
-	protected static TimeOfUsePrices parsePrices(String xml, double exchangeRate)
+	protected static TimeOfUsePrices parsePrices(String xml, double exchangeRate, Resolution preferredResolution)
 			throws ParserConfigurationException, SAXException, IOException {
 		var root = getXmlRootDocument(xml);
 
@@ -53,13 +54,10 @@ protected static TimeOfUsePrices parsePrices(String xml, double exchangeRate)
 			return TimeOfUsePrices.EMPTY_PRICES;
 		}
 
-		var shortestDuration = allPrices.rowKeySet().stream() //
-				.sorted() //
-				.findFirst().get();
-
-		final var prices = ImmutableSortedMap.copyOf(allPrices.row(shortestDuration));
+		final var duration = getDuration(allPrices, preferredResolution);
+		final var prices = ImmutableSortedMap.copyOf(allPrices.row(duration));
 		final var minTimestamp = prices.firstKey();
-		final var maxTimestamp = prices.lastKey().plus(shortestDuration);
+		final var maxTimestamp = prices.lastKey().plus(duration);
 
 		var result = Stream //
 				.iterate(minTimestamp, //
@@ -160,4 +158,33 @@ protected static String parseCurrency(String xml) throws ParserConfigurationExce
 		return result;
 	}
 
+	/**
+	 * Determines the appropriate {@link Duration} from the given
+	 * {@link ImmutableTable}.
+	 * 
+	 * <p>
+	 * The method checks if the specified {@code preferredResolution} exists in the
+	 * table's row keys. If it exists, the corresponding {@link Duration} is
+	 * returned. Otherwise, the method selects the shortest duration from the
+	 * available row keys.
+	 * 
+	 * @param allPrices           the {@link ImmutableTable}.
+	 * @param preferredResolution the preferred resolution to look for, encapsulated
+	 *                            in a {@link Resolution}.
+	 * @return the matching {@link Duration} if the preferred resolution exists in
+	 *         the table's row keys, otherwise the shortest {@link Duration} from
+	 *         the row keys.
+	 */
+	protected static Duration getDuration(ImmutableTable<Duration, ZonedDateTime, Double> allPrices,
+			Resolution preferredResolution) {
+		return allPrices.rowKeySet().stream() //
+				// match preferredResolution
+				.filter(e -> e.equals(preferredResolution.duration)) //
+				.findFirst() //
+				// otherwise get shortest duration
+				.orElseGet(() -> allPrices.rowKeySet().stream() //
+						.sorted() //
+						.findFirst()//
+						.get());
+	}
 }
diff --git a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/MyConfig.java b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/MyConfig.java
index c3dbb4ec27a..109aca8327b 100644
--- a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/MyConfig.java
+++ b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/MyConfig.java
@@ -9,6 +9,7 @@ protected static class Builder {
 		private String id;
 		private String securityToken;
 		private BiddingZone biddingZone;
+		private Resolution resolution;
 
 		private Builder() {
 		}
@@ -28,6 +29,11 @@ public Builder setBiddingZone(BiddingZone biddingZone) {
 			return this;
 		}
 
+		public Builder setResolution(Resolution resolution) {
+			this.resolution = resolution;
+			return this;
+		}
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -59,4 +65,9 @@ public BiddingZone biddingZone() {
 		return this.builder.biddingZone;
 	}
 
+	@Override
+	public Resolution resolution() {
+		return this.builder.resolution;
+	}
+
 }
\ No newline at end of file
diff --git a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java
index b74a0a5a447..c7268b00ed5 100644
--- a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java
+++ b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java
@@ -1,12 +1,19 @@
 package io.openems.edge.timeofusetariff.entsoe;
 
+import static io.openems.edge.timeofusetariff.entsoe.Utils.getDuration;
 import static io.openems.edge.timeofusetariff.entsoe.Utils.parseCurrency;
 import static io.openems.edge.timeofusetariff.entsoe.Utils.parsePrices;
 import static org.junit.Assert.assertEquals;
 
+import java.time.Duration;
+import java.time.ZonedDateTime;
+
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableTable;
+
 import io.openems.edge.common.currency.Currency;
+import io.openems.edge.common.test.TestUtils;
 
 public class ParserTest {
 
@@ -781,15 +788,42 @@ public class ParserTest {
 	@Test
 	public void testParsePrices() throws Exception {
 		var currencyExchangeValue = 1.0;
-		var prices = parsePrices(XML, currencyExchangeValue);
+
+		// Quarterly resolution.
+		var preferredResolution = Resolution.QUARTERLY;
+		var prices = parsePrices(XML, currencyExchangeValue, preferredResolution);
+		var startTime = prices.getFirstTime();
 		assertEquals(109.93, prices.getFirst(), 0.001);
+
+		var secondPrice = prices.getAt(startTime.plusMinutes(15));
+		assertEquals(85.84, secondPrice, 0.001);
+
+		var thirdPrice = prices.getAt(startTime.plusMinutes(30));
+		assertEquals(65.09, thirdPrice, 0.001);
+
+		// Last price
 		assertEquals(65.07, prices.getAt(prices.getLastTime()), 0.001);
+
+		// Hourly resolution.
+		preferredResolution = Resolution.HOURLY;
+		prices = parsePrices(XML, currencyExchangeValue, preferredResolution);
+		assertEquals(84.15, prices.getFirst(), 0.001);
+
+		secondPrice = prices.getAt(startTime.plusMinutes(15));
+		assertEquals(84.15, secondPrice, 0.001);
+
+		thirdPrice = prices.getAt(startTime.plusMinutes(60));
+		assertEquals(74.3, thirdPrice, 0.001);
+
+		// Last price
+		assertEquals(86.53, prices.getAt(prices.getLastTime()), 0.001);
 	}
 
 	@Test
 	public void testParsePrices2() throws Exception {
 		var currencyExchangeValue = 1.0;
-		var prices = parsePrices(MISSING_DATA_AND_MULTIPLE_PERIODS_XML, currencyExchangeValue);
+		var preferredResolution = Resolution.QUARTERLY;
+		var prices = parsePrices(MISSING_DATA_AND_MULTIPLE_PERIODS_XML, currencyExchangeValue, preferredResolution);
 		assertEquals(192, prices.asArray().length);
 		var array = prices.asArray();
 		assertEquals(array[96], array[97], 0.001); // Missing value check
@@ -801,4 +835,43 @@ public void testParseCurrency() throws Exception {
 		var res = parseCurrency(XML);
 		assertEquals(res, Currency.EUR.toString());
 	}
+
+	@Test
+	public void testPreferredResolutionExists() {
+		var clock = TestUtils.createDummyClock();
+		// Create sample data
+		var table = ImmutableTable.<Duration, ZonedDateTime, Double>builder()
+				.put(Duration.ofMinutes(15), ZonedDateTime.now(clock), 100.0)
+				.put(Duration.ofMinutes(15), ZonedDateTime.now(clock).plusMinutes(15), 200.0)
+				.put(Duration.ofMinutes(60), ZonedDateTime.now(clock), 300.0) //
+				.build();
+
+		// Preferred resolution
+		Resolution preferredResolution = Resolution.QUARTERLY;
+
+		// Call the method
+		Duration result = getDuration(table, preferredResolution);
+
+		// Assert
+		assertEquals("The preferred resolution should match.", Duration.ofMinutes(15), result);
+	}
+
+	@Test
+	public void testPreferredResolutionDoesNotExist() {
+		// Create sample data
+		ImmutableTable<Duration, ZonedDateTime, Double> table = ImmutableTable
+				.<Duration, ZonedDateTime, Double>builder().put(Duration.ofMinutes(15), ZonedDateTime.now(), 100.0)
+				.put(Duration.ofMinutes(15), ZonedDateTime.now().plusMinutes(15), 200.0)
+				.put(Duration.ofMinutes(15), ZonedDateTime.now().plusMinutes(30), 300.0).build();
+
+		// Preferred resolution that does not exist
+		Resolution preferredResolution = Resolution.HOURLY;
+
+		// Call the method
+		Duration result = getDuration(table, preferredResolution);
+
+		// Assert
+		assertEquals("The shortest duration should be returned when preferred is unavailable.", Duration.ofMinutes(15),
+				result);
+	}
 }
diff --git a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/TouEntsoeTest.java b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/TouEntsoeTest.java
index 3aa234085ab..b187da644b0 100644
--- a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/TouEntsoeTest.java
+++ b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/TouEntsoeTest.java
@@ -22,6 +22,7 @@ public void test() throws Exception {
 						.setId("tou0") //
 						.setSecurityToken("") //
 						.setBiddingZone(BiddingZone.GERMANY) //
+						.setResolution(Resolution.HOURLY) //
 						.build());
 	}
 }
diff --git a/io.openems.wrapper/fastexcel.bnd b/io.openems.wrapper/fastexcel.bnd
index 68c2302413d..fc25a00335c 100644
--- a/io.openems.wrapper/fastexcel.bnd
+++ b/io.openems.wrapper/fastexcel.bnd
@@ -5,7 +5,7 @@ Bundle-Version: 0.18.4
 
 Include-Resource: \
 	@fastexcel-0.18.4.jar,\
-	@fastexcel-reader-0.18.4.jar,\
+	@fastexcel-reader-0.18.4.jar;onduplicate:=SKIP,\
 
 -dsannotations: *
 
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 5c501b6572e..0b0a40e3ade 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -12511,9 +12511,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12536,7 +12536,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -12551,6 +12551,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/cookie": {
@@ -17723,9 +17727,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "dev": true,
       "funding": [
         {
@@ -19151,9 +19155,9 @@
       "license": "ISC"
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 9b1e3b8fc02..5585c80f6ec 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -2,11 +2,11 @@
   <app-header></app-header>
   <ion-menu type="overlay" side="start" contentId="content">
     <ion-header>
-      <ion-toolbar color="primary">
+      <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
         <ion-buttons slot="start">
-          <ion-menu-button autoHide="false"></ion-menu-button>
+          <ion-menu-button [ngStyle]="{'color': 'var(--ion-menu-color)'}" autoHide="false"></ion-menu-button>
         </ion-buttons>
-        <ion-title translate>Menu.menu</ion-title>
+        <ion-title [ngStyle]="{'color': 'var(--ion-menu-color)'}" translate>Menu.menu</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
@@ -16,10 +16,10 @@
           (click)="menu.close()">
           <ion-icon style="margin-right: 5%" size="large" color="primary" slot="start" name="person-outline">
           </ion-icon>
-          <ion-label class="ion-text-wrap" color="dark">
-            <p>{{ user.name }}</p>
-            <ion-text color="medium">
-              <p>{{ user.id }}</p>
+          <ion-label>
+            <p style="color:var(--ion-text-color);">{{ user.name }}</p>
+            <ion-text>
+              <p style="color:var(--ion-text-color-shade);">{{ user.id }}</p>
             </ion-text>
           </ion-label>
         </ion-item>
@@ -75,9 +75,6 @@ <h2 translate [translateParams]="{value: 'OpenEMS'}">Index.connectionFailed</h2>
 
     <!-- Show Sub-Views -->
     <ion-router-outlet id="content"></ion-router-outlet>
-
-    <!-- Side Menu  -->
-
   </ion-content>
 
   <oe-footer *ngIf="isUserAllowedToSeeFooter && !isHistoryDetailView"></oe-footer>
diff --git a/ui/src/app/changelog/view/component/changelog.constants.ts b/ui/src/app/changelog/view/component/changelog.constants.ts
index 76562df2294..f1d4189c47b 100644
--- a/ui/src/app/changelog/view/component/changelog.constants.ts
+++ b/ui/src/app/changelog/view/component/changelog.constants.ts
@@ -27,7 +27,7 @@ export class Changelog {
     }
 
     public static link(title: string, url: string) {
-        return "<a target=\"_blank\" href=\"" + url + "\">" + title + "</a>";
+        return "<a class='ion-link' target=\"_blank\" href=\"" + url + "\">" + title + "</a>";
     }
 }
 
diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts b/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts
index 29658f87838..ee3b75080e1 100644
--- a/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts
+++ b/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts
@@ -3,7 +3,7 @@ import { Component } from "@angular/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
-import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
+import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/shared";
 
 @Component({
   selector: "totalChart",
@@ -31,8 +31,6 @@ export class TotalChartComponent extends AbstractHistoryChart {
 
         const output: HistoryUtils.DisplayValue[] = [];
 
-        const colors: string[] = ["rgb(0,0,139)", "rgb(0,191,255)", "rgb(0,0,56)", "rgb(77,77,174)"];
-
         for (let i = 0; i < controller.length; i++) {
           const controllerId = controller[i];
           output.push({
@@ -46,7 +44,7 @@ export class TotalChartComponent extends AbstractHistoryChart {
                 // TODO add logic to not have to adjust non power data manually
                 .map(val => Utils.multiplySafely(val, 1000));
             },
-            color: colors[Math.min(i % colors.length, (colors.length - 1))],
+            color: ChartConstants.Colors.SHADES_OF_YELLOW[i % (ChartConstants.Colors.SHADES_OF_YELLOW.length - 1)],
             stack: 0,
           });
         }
diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html b/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html
index 17aa513987c..d077d3345fb 100644
--- a/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html
+++ b/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html
@@ -1,6 +1,6 @@
 <oe-flat-widget *ngIf="isInitialized && controllers" [title]="'Edge.Index.Widgets.Channeltreshold.TITLE' | translate"
   button routerLink="/device/{{edge.id}}/history/channelthresholdchart"
-  [icon]="{name:'radio-button-on-outline', color: 'primary', size: 'large'}">
+  [icon]="{name:'radio-button-on-outline', color: 'normal', size: 'large'}">
 
   <oe-flat-widget-line *ngFor="let controller of controllers" [name]="displayName.get(controller.id)"
     [channelAddress]="controller.id + '/CumulatedActiveTime'"
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts
index 4ed2a8d0982..05e4a18475e 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts
@@ -2,6 +2,7 @@
 import { Component } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 
@@ -39,13 +40,13 @@ export class GridOptimizedChargeChartComponent extends AbstractHistoryChart {
         {
           name: translate.instant("Edge.Index.Widgets.GridOptimizedCharge.maximumCharge"),
           converter: () => data["DelayChargeMaximumChargeLimit"],
-          color: "rgb(253,197,7)",
+          color: ChartConstants.Colors.YELLOW,
           borderDash: [3, 3],
         },
         {
           name: translate.instant("Edge.Index.Widgets.GridOptimizedCharge.minimumCharge"),
           converter: () => data["SellToGridLimitMinimumChargeLimit"],
-          color: "rgb(200,0,0)",
+          color: ChartConstants.Colors.RED,
           borderDash: [3, 3],
         },
         {
@@ -58,7 +59,7 @@ export class GridOptimizedChargeChartComponent extends AbstractHistoryChart {
               })
               :
               data["EssActivePower"])?.map(val => HistoryUtils.ValueConverter.POSITIVE_AS_ZERO_AND_INVERT_NEGATIVE(val)) ?? null,
-          color: "rgb(0,223,0)",
+          color: ChartConstants.Colors.GREEN,
         },
         {
           name: translate.instant("General.soc"),
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts
index 77072343e95..e8ae6a7188b 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts
@@ -2,6 +2,7 @@
 import { Component } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress } from "src/app/shared/shared";
 
@@ -32,18 +33,20 @@ export class SellToGridLimitChartComponent extends AbstractHistoryChart {
         {
           name: translate.instant("General.gridSell"),
           converter: () => data["ActivePower"],
-          color: "rgb(0,0,200)",
+          color: ChartConstants.Colors.PURPLE,
         },
         {
           name: translate.instant("Edge.Index.Widgets.GridOptimizedCharge.maximumGridFeedIn"),
           converter: () => data["_PropertyMaximumSellToGridPower"],
-          color: "rgb(0,0,0)",
+          color: ChartConstants.Colors.YELLOW,
+          hideShadow: true,
           borderDash: [3, 3],
         },
         {
           name: translate.instant("Edge.Index.Widgets.GridOptimizedCharge.MAXIMUM_GRIDSELL_WITH_CHARGE"),
           converter: () => data["_PropertyMaximumSellToGridPower"].map(el => Utils.multiplySafely(el, 0.95)),
-          color: "rgb(200,0,0)",
+          color: ChartConstants.Colors.RED,
+          hideShadow: true,
           borderDash: [3, 3],
         },
         {
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.html b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.html
index a369cd1cdb2..7d3e28ac1ed 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.html
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.html
@@ -1,6 +1,6 @@
 <oe-flat-widget *ngIf="isInitialized" [title]="component.alias" button
   routerLink="/device/{{edge.id}}/history/{{component.id}}/gridOptimizedChargeChart"
-  [icon]="{name: 'oe-grid-storage', size: 'large', color: 'dark'}">
+  [icon]="{name: 'oe-grid-storage', size: 'large', color: 'normal'}">
   <oe-flat-widget-line [name]="'Edge.Index.Widgets.GridOptimizedCharge.chargingDelayed' | translate"
     [channelAddress]="component.id + '/AvoidLowChargingTime'" [converter]="FORMAT_SECONDS_TO_DURATION"
     [filter]="filter"></oe-flat-widget-line>
diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
index bc55953e4d2..c1ef75ccd39 100644
--- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
@@ -6,6 +6,7 @@ import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthi
 import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { ChartAxis, HistoryUtils, TimeOfUseTariffUtils, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, Currency, EdgeConfig } from "src/app/shared/shared";
+import { AssertionUtils } from "src/app/shared/utils/assertions/assertions-utils";
 import { ColorUtils } from "src/app/shared/utils/color/color.utils";
 
 @Component({
@@ -86,7 +87,7 @@ export class ChartComponent extends AbstractHistoryChart {
                 {
                     name: this.translate.instant("General.gridBuy"),
                     converter: () => data["GridBuy"],
-                    color: "rgb(0,0,0)",
+                    color: ChartConstants.Colors.BLUE_GREY,
                     yAxisId: ChartAxis.RIGHT_2,
                     custom: {
                         type: "line",
@@ -105,6 +106,9 @@ export class ChartComponent extends AbstractHistoryChart {
                 position: "left",
                 yAxisId: ChartAxis.LEFT,
                 customTitle: Currency.getChartCurrencyUnitLabel(currency),
+                scale: {
+                    dynamicScale: true,
+                },
             },
             {
                 unit: YAxisType.PERCENTAGE,
@@ -168,9 +172,17 @@ export class ChartComponent extends AbstractHistoryChart {
                     el.borderColor = ColorUtils.changeOpacityFromRGBA(el.borderColor.toString(), 1);
                     return el;
                 });
+
+                const chartObject = this.chartObject;
                 this.options.scales[ChartAxis.LEFT].ticks = {
-                    ...this.options.scales[ChartAxis.LEFT].ticks,
-                    ...ChartConstants.DEFAULT_Y_SCALE_OPTIONS(this.chartObject.yAxes.find(el => el.unit === YAxisType.CURRENCY), this.translate, "line", this.datasets, true).ticks,
+                    callback: function (value, index, ticks) {
+                        if (index == (ticks.length - 1)) {
+                            const upperMostTick = chartObject.yAxes.find(el => el.unit === YAxisType.CURRENCY).customTitle;
+                            AssertionUtils.assertHasMaxLength(upperMostTick, ChartConstants.MAX_LENGTH_OF_Y_AXIS_TITLE);
+                            return upperMostTick;
+                        }
+                        return value;
+                    },
                 };
                 this.options.scales.x["offset"] = false;
                 this.options["animation"] = false;
diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.html b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.html
index 96ad055397c..12e3857a9ae 100644
--- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.html
+++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.html
@@ -1,6 +1,6 @@
 <oe-flat-widget button *ngIf="isInitialized" [title]="component.alias" button
     routerLink="/device/{{edge.id}}/history/{{component.id}}/scheduleChart" [icon]="{name:
-    'cloud-outline'}">
+    'cloud-outline', color:'normal'}">
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.TIME_OF_USE_TARIFF.STATE.DELAY_DISCHARGE' | translate"
         [value]="delayedActiveTimeOverPeriod | formatSecondsToDuration">
     </oe-flat-widget-line>
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts
index 9daf18f5179..06f0098e904 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts
@@ -4,7 +4,7 @@ import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthi
 import { Name } from "src/app/shared/components/shared/name";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
-import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
+import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/shared";
 
 @Component({
   selector: "totalChart",
@@ -30,7 +30,6 @@ export class TotalChartComponent extends AbstractHistoryChart {
       input: input,
       output: (data: HistoryUtils.ChannelData) => {
         const output: HistoryUtils.DisplayValue[] = [];
-        const colors: string[] = ["rgb(0,0,139)", "rgb(0,191,255)", "rgb(0,0,56)", "rgb(77,77,174)"];
 
         for (let i = 0; i < controllers.length; i++) {
           const controller = controllers[i];
@@ -40,12 +39,11 @@ export class TotalChartComponent extends AbstractHistoryChart {
               return energyQueryResponse?.result.data[controller.id + "/CumulatedActiveTime"] ?? null;
             },
             converter: () => {
-
               return data[controller.id]
                 // TODO add logic to not have to adjust non power data manually
                 .map(val => Utils.multiplySafely(val, 1000));
             },
-            color: colors[i % colors.length],
+            color: ChartConstants.Colors.SHADES_OF_YELLOW[i % (ChartConstants.Colors.SHADES_OF_YELLOW.length - 1)],
             stack: 0,
           });
         }
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts
index 91c271d820a..94ef64537de 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts
@@ -5,7 +5,7 @@ import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthi
 import { Name } from "src/app/shared/components/shared/name";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
-import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
+import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/shared";
 
 @Component({
   selector: "detailChart",
@@ -53,7 +53,7 @@ export class ChartComponent extends AbstractHistoryChart {
               // TODO add logic to not have to adjust non power data manually
               ?.map(val => Utils.multiplySafely(val, 1000));
           },
-          color: "rgb(0,191,255)",
+          color: ChartConstants.Colors.YELLOW,
           stack: 0,
         });
 
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.html b/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.html
index 95886fc8abf..9f443a3fa6d 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.html
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.html
@@ -1,6 +1,6 @@
 <oe-flat-widget button *ngIf="isInitialized" [title]="'Laststeuerung'" button
     routerLink="/device/{{edge.id}}/history/digitaloutputchart" [icon]="{name:
-    'power-outline'}">
+    'power-outline',color:'normal'}">
 
     <ng-container *ngFor="let controller of singleThresholdControllers; let first = first">
         <oe-flat-widget-line [name]="controller.alias" [channelAddress]="controller.id + '/CumulatedActiveTime'"
diff --git a/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.html b/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.html
index 923a442cb04..fbe00ce3acd 100644
--- a/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.html
+++ b/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.html
@@ -1,4 +1,4 @@
-<oe-flat-widget *ngIf="isInitialized" [title]="component.alias" [icon]="{name: 'flame', color: 'danger'}" button
+<oe-flat-widget *ngIf="isInitialized" [title]="component.alias" [icon]="{name: 'flame', color: 'normal'}" button
     routerLink="/device/{{edge.id}}/history/{{componentId}}/heatingelementchart">
     <ng-container *ngFor="let i of [1,2,3]">
         <oe-flat-widget-line [name]="('Edge.History.ACTIVE_DURATION_WITH_LEVEL'| translate: {level: i})"
diff --git a/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.html b/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.html
index e7a0c6ad6a6..774733cbe2b 100644
--- a/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.html
+++ b/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.html
@@ -1,5 +1,10 @@
-<oe-flat-widget button *ngIf="isInitialized" [title]="component.alias" button 
-    routerLink="/device/{{edge.id}}/history/{{component.id}}/modbusTcpApi" [icon]="{name:'swap-vertical-outline'}">
-    <oe-flat-widget-line [name]="'MODBUS_TCP_API_READ_WRITE.CUMULATED_ACTIVE_TIME' | translate" [channelAddress]="this.component.id + '/CumulatedActiveTime'" [converter]="TIME_CONVERTER" [leftColumnWidth]="80"></oe-flat-widget-line>
-    <oe-flat-widget-line [name]="'MODBUS_TCP_API_READ_WRITE.CUMULATED_INACTIVE_TIME' | translate" [channelAddress]="this.component.id + '/CumulatedInactiveTime'" [converter]="TIME_CONVERTER" [leftColumnWidth]="80"></oe-flat-widget-line>
+<oe-flat-widget button *ngIf="isInitialized" [title]="component.alias" button
+    routerLink="/device/{{edge.id}}/history/{{component.id}}/modbusTcpApi"
+    [icon]="{name:'swap-vertical-outline', color:'normal'}">
+    <oe-flat-widget-line [name]="'MODBUS_TCP_API_READ_WRITE.CUMULATED_ACTIVE_TIME' | translate"
+        [channelAddress]="this.component.id + '/CumulatedActiveTime'" [converter]="TIME_CONVERTER"
+        [leftColumnWidth]="80"></oe-flat-widget-line>
+    <oe-flat-widget-line [name]="'MODBUS_TCP_API_READ_WRITE.CUMULATED_INACTIVE_TIME' | translate"
+        [channelAddress]="this.component.id + '/CumulatedInactiveTime'" [converter]="TIME_CONVERTER"
+        [leftColumnWidth]="80"></oe-flat-widget-line>
 </oe-flat-widget>
diff --git a/ui/src/app/edge/history/abstracthistorychart.ts b/ui/src/app/edge/history/abstracthistorychart.ts
index 84a3923f138..00e9bf4a256 100644
--- a/ui/src/app/edge/history/abstracthistorychart.ts
+++ b/ui/src/app/edge/history/abstracthistorychart.ts
@@ -10,6 +10,7 @@ import { QueryHistoricTimeseriesDataResponse } from "src/app/shared/jsonrpc/resp
 import { QueryHistoricTimeseriesEnergyPerPeriodResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyPerPeriodResponse";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, Edge, EdgeConfig, Service } from "src/app/shared/shared";
+import { ColorUtils } from "src/app/shared/utils/color/color.utils";
 import { DateUtils } from "src/app/shared/utils/date/dateutils";
 import { DateTimeUtils } from "src/app/shared/utils/datetime/datetime-utils";
 import { ChronoUnit, DEFAULT_TIME_CHART_OPTIONS, EMPTY_DATASET, Resolution, calculateResolution, setLabelVisible } from "./shared";
@@ -156,15 +157,19 @@ export abstract class AbstractHistoryChart {
                 };
 
                 options.plugins.tooltip.callbacks.labelColor = (item: Chart.TooltipItem<any>) => {
-                    const color = colors[item.datasetIndex];
+                    let backgroundColor = item.dataset.backgroundColor;
 
-                    if (!color) {
-                        return;
+                    if (Array.isArray(backgroundColor)) {
+                        backgroundColor = backgroundColor[0];
+                    }
+
+                    if (!backgroundColor) {
+                        backgroundColor = item.dataset.borderColor || "rgba(0, 0, 0, 0.5)";
                     }
 
                     return {
-                        borderColor: color.borderColor,
-                        backgroundColor: color.backgroundColor,
+                        borderColor: ColorUtils.changeOpacityFromRGBA(backgroundColor, 1),
+                        backgroundColor: ColorUtils.changeOpacityFromRGBA(backgroundColor, 1),
                     };
                 };
 
@@ -246,6 +251,7 @@ export abstract class AbstractHistoryChart {
                 options = NewAbstractHistoryChart.applyChartTypeSpecificOptionsChanges("line", options, this.service, chartObject);
                 options.scales[ChartAxis.LEFT]["stacked"] = false;
                 options.scales.x["stacked"] = true;
+                options.scales.x.ticks.color = getComputedStyle(document.documentElement).getPropertyValue("--ion-color-chart-xAxis-ticks");
             }).then(() => {
                 this.options = options;
                 resolve();
diff --git a/ui/src/app/edge/history/common/autarchy/flat/flat.html b/ui/src/app/edge/history/common/autarchy/flat/flat.html
index 632cc21b2df..7137f648ff3 100644
--- a/ui/src/app/edge/history/common/autarchy/flat/flat.html
+++ b/ui/src/app/edge/history/common/autarchy/flat/flat.html
@@ -1,4 +1,4 @@
-<oe-flat-widget [title]="'General.autarchy' | translate" [icon]="{name: 'oe-grid', color:'environmental'}" button
+<oe-flat-widget [title]="'General.autarchy' | translate" [icon]="{name: 'oe-grid', color:'normal'}" button
   routerLink="/device/{{edge.id}}/history/autarchychart" *ngIf="isInitialized">
   <oe-flat-widget-percentagebar [value]="autarchyValue">
   </oe-flat-widget-percentagebar>
diff --git a/ui/src/app/edge/history/common/consumption/chart/chart.ts b/ui/src/app/edge/history/common/consumption/chart/chart.ts
index 106fdb205ad..95498d67819 100644
--- a/ui/src/app/edge/history/common/consumption/chart/chart.ts
+++ b/ui/src/app/edge/history/common/consumption/chart/chart.ts
@@ -2,6 +2,7 @@
 import { Component } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { EvcsUtils } from "src/app/shared/components/edge/utils/evcs-utils";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, YAxisType } from "src/app/shared/service/utils";
@@ -62,11 +63,11 @@ export class ChartComponent extends AbstractHistoryChart {
           converter: () => {
             return data["ConsumptionActivePower"] ?? null;
           },
-          color: "rgb(253,197,7)",
+          color: ChartConstants.Colors.BLUE,
           stack: 0,
         });
 
-        const evcsComponentColors: string[] = ["rgb(0,223,0)", "rgb(0,178,0)", "rgb(0,201,0)", "rgb(0,134,0)", "rgb(0,156,0)"];
+        const evcsComponentColors: string[] = ChartConstants.Colors.SHADES_OF_GREEN;
         evcsComponents.forEach((component, index) => {
           datasets.push({
             name: component.alias,
@@ -76,12 +77,12 @@ export class ChartComponent extends AbstractHistoryChart {
             converter: () => {
               return data[component.id + "/" + EvcsUtils.getEvcsPowerChannelId(component, config, edge)] ?? null;
             },
-            color: evcsComponentColors[Math.min(index, (evcsComponentColors.length - 1))],
+            color: evcsComponentColors[index % (evcsComponentColors.length - 1)],
             stack: 1,
           });
         });
 
-        const consumptionMeterColors: string[] = ["rgb(220,20,60)", "rgb(202, 158, 6", "rgb(228, 177, 6)", "rgb(177, 138, 5)", "rgb(152, 118, 4)"];
+        const consumptionMeterColors: string[] = ChartConstants.Colors.SHADES_OF_YELLOW;
         consumptionMeters.forEach((meter, index) => {
           datasets.push({
             name: meter.alias,
@@ -91,7 +92,7 @@ export class ChartComponent extends AbstractHistoryChart {
             converter: () => {
               return data[meter.id + "/ActivePower"] ?? null;
             },
-            color: consumptionMeterColors[Math.min(index, (consumptionMeterColors.length - 1))],
+            color: consumptionMeterColors[index % (consumptionMeterColors.length - 1)],
             stack: 1,
           });
         });
@@ -106,7 +107,7 @@ export class ChartComponent extends AbstractHistoryChart {
             converter: () => {
               return Utils.calculateOtherConsumption(data, evcsComponents, consumptionMeters);
             },
-            color: "rgb(0,0,0)",
+            color: ChartConstants.Colors.GREY,
             stack: 1,
           });
         }
diff --git a/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts b/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts
index 7fd59547f17..0dcc4470d01 100644
--- a/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts
+++ b/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts
@@ -5,7 +5,7 @@ import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthi
 import { Phase } from "src/app/shared/components/shared/phase";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, YAxisType } from "src/app/shared/service/utils";
-import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
+import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/shared";
 
 @Component({
   selector: "consumptionMeterChart",
@@ -31,7 +31,7 @@ export class ConsumptionMeterChartDetailsComponent extends AbstractHistoryChart
           name: component.alias,
           nameSuffix: (energyQueryResponse: QueryHistoricTimeseriesEnergyResponse) => energyQueryResponse.result.data[component.id + "/ActiveProductionEnergy"],
           converter: () => data[component.id],
-          color: "rgb(0,152,204)",
+          color: ChartConstants.Colors.RED,
           hiddenOnInit: false,
           stack: 2,
         },
diff --git a/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts b/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts
index c65368c8971..fc5e130c6cf 100644
--- a/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts
+++ b/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts
@@ -5,7 +5,7 @@ import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthi
 import { EvcsUtils } from "src/app/shared/components/edge/utils/evcs-utils";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, YAxisType } from "src/app/shared/service/utils";
-import { ChannelAddress, Edge, EdgeConfig } from "src/app/shared/shared";
+import { ChannelAddress, ChartConstants, Edge, EdgeConfig } from "src/app/shared/shared";
 
 @Component({
     selector: "evcsChart",
@@ -26,7 +26,7 @@ export class EvcsChartDetailsComponent extends AbstractHistoryChart {
                 name: component.alias,
                 nameSuffix: (energyQueryResponse: QueryHistoricTimeseriesEnergyResponse) => energyQueryResponse.result.data[component.id + "/ActiveConsumptionEnergy"],
                 converter: () => data[component.id],
-                color: "rgb(0,152,204)",
+                color: ChartConstants.Colors.GREEN,
                 hiddenOnInit: false,
                 stack: 2,
             }],
diff --git a/ui/src/app/edge/history/common/energy/chart/channels.spec.ts b/ui/src/app/edge/history/common/energy/chart/channels.spec.ts
index c5c12a0f2fa..43eac4ef9ed 100644
--- a/ui/src/app/edge/history/common/energy/chart/channels.spec.ts
+++ b/ui/src/app/edge/history/common/energy/chart/channels.spec.ts
@@ -11,14 +11,17 @@ export namespace History {
   export const LINE_CHART_OPTIONS = (period: string, chartType: "line" | "bar", options: { [key: string]: { scale: { min: number, max: number; } | null, ticks?: { stepSize: number }; }; }): OeChartTester.Dataset.Option => ({
     type: "option",
     options: {
-      "responsive": true, "maintainAspectRatio": false, "elements": { "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 }, "line": { "stepped": false, "fill": true } }, "datasets": { "bar": {}, "line": {} },
+      "responsive": true,
+      "maintainAspectRatio": false,
+      "elements": {
+        "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 },
+        "line": { "stepped": false, "fill": true },
+      },
+      "datasets": { "bar": {}, "line": {} },
       "plugins": {
-        "colors": {
-          "enabled": false,
-        },
-        "legend": {
-          "display": true, "position": "bottom", "labels": { "color": "" },
-        }, "tooltip": {
+        "colors": { "enabled": false },
+        "legend": { "display": true, "position": "bottom", "labels": { "color": "" } },
+        "tooltip": {
           "intersect": false, "mode": "index", "callbacks": {}, "enabled": true,
         },
         "annotation": {
@@ -27,17 +30,33 @@ export namespace History {
         "datalabels": {
           display: false,
         },
-      }, "scales": {
-        "x": { "stacked": true, "offset": false, "type": "time", "ticks": { "source": "auto", "maxTicksLimit": 31 }, "bounds": "ticks", "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } }, "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } } },
+      },
+      "scales": {
+        "x": {
+          "stacked": true,
+          "offset": false,
+          "type": "time",
+          "ticks": { "source": "auto", "maxTicksLimit": 31 },
+          "bounds": "ticks",
+          "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } },
+          "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } },
+        },
         "left": {
-          "stacked": false,
-          ...options["left"]?.scale, ...(chartType === "line" ? { stacked: false } : {}), "beginAtZero": true,
-          "title": { "text": "kW", "display": false, "padding": 5, "font": { "size": 11 } }, "position": "left", "grid": { "display": true },
+          ...options["left"]?.scale,
+          ...(chartType === "line"
+            ? { stacked: false }
+            : {}),
+          "beginAtZero": true,
+          "title": { "text": "kW", "display": false, "padding": 5, "font": { "size": 11 } },
+          "position": "left", "grid": { "display": true },
           "ticks": { ...options["left"]?.ticks, "color": "", "padding": 5, "maxTicksLimit": ChartConstants.NUMBER_OF_Y_AXIS_TICKS },
         },
         "right": {
-          "stacked": false,
-          ...options["right"]?.scale, ...(chartType === "line" ? { stacked: false } : {}), "beginAtZero": true, "type": "linear", "title": { "text": "%", "display": false, "font": { "size": 11 }, "padding": 5 }, "position": "right", "grid": { "display": false },
+          ...options["right"]?.scale, ...(chartType === "line" ? { stacked: false } : {}),
+          "beginAtZero": true,
+          "type": "linear",
+          "title": { "text": "%", "display": false, "font": { "size": 11 }, "padding": 5 },
+          "position": "right", "grid": { "display": false },
           "ticks": {
             ...options["right"]?.ticks,
             "color": "",
@@ -51,14 +70,17 @@ export namespace History {
   export const BAR_CHART_OPTIONS = (period: string, chartType: "line" | "bar", options: { [key: string]: { scale: { min?: number, max?: number; }, ticks: { stepSize?: number; }; }; }): OeChartTester.Dataset.Option => ({
     type: "option",
     options: {
-      "responsive": true, "maintainAspectRatio": false, "elements": { "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 }, "line": { "stepped": false, "fill": true } }, "datasets": { "bar": { "barPercentage": 1 }, "line": {} },
+      "responsive": true,
+      "maintainAspectRatio": false,
+      "elements": {
+        "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 },
+        "line": { "stepped": false, "fill": true },
+      },
+      "datasets": { "bar": { "barPercentage": 1 }, "line": {} },
       "plugins": {
-        "colors": {
-          "enabled": false,
-        },
-        "legend": {
-          "display": true, "position": "bottom", "labels": { "color": "" },
-        }, "tooltip": {
+        "colors": { "enabled": false },
+        "legend": { "display": true, "position": "bottom", "labels": { "color": "" } },
+        "tooltip": {
           "intersect": false, "mode": "x", "callbacks": {}, "enabled": true,
         },
         "annotation": {
@@ -67,11 +89,25 @@ export namespace History {
         "datalabels": {
           display: false,
         },
-      }, "scales": {
-        "x": { "stacked": true, "offset": true, "type": "time", "ticks": { "source": "auto", "maxTicksLimit": 31 }, "bounds": "ticks", "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } }, "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } } },
+      },
+      "scales": {
+        "x": {
+          "stacked": true,
+          "offset": true,
+          "type": "time",
+          "ticks": { "source": "auto", "maxTicksLimit": 31 },
+          "bounds": "ticks",
+          "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } },
+          "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } },
+        },
+
         "left": {
+          "beginAtZero": true,
+          ...options["left"]?.scale, ...(chartType === "line" ? { stacked: false } : {}),
+          "title": { "text": "kWh", "display": false, "padding": 5, "font": { "size": 11 } },
+          "position": "left",
+          "grid": { "display": true },
           "stacked": true,
-          ...options["left"]?.scale, ...(chartType === "line" ? { stacked: false } : {}), "beginAtZero": true, "title": { "text": "kWh", "display": false, "padding": 5, "font": { "size": 11 } }, "position": "left", "grid": { "display": true },
           "ticks": {
             ...options["left"]?.ticks,
             "color": "",
diff --git a/ui/src/app/edge/history/common/energy/chart/chart.ts b/ui/src/app/edge/history/common/energy/chart/chart.ts
index 13f6ea38376..57fb9bbc3aa 100644
--- a/ui/src/app/edge/history/common/energy/chart/chart.ts
+++ b/ui/src/app/edge/history/common/energy/chart/chart.ts
@@ -2,6 +2,7 @@
 import { Component } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, EdgeConfig, Utils } from "src/app/shared/shared";
@@ -79,7 +80,7 @@ export class ChartComponent extends AbstractHistoryChart {
             name: translate.instant("General.production"),
             nameSuffix: (energyValues: QueryHistoricTimeseriesEnergyResponse) => energyValues.result.data["_sum/ProductionActiveEnergy"],
             converter: () => data["ProductionActivePower"],
-            color: "rgb(45,143,171)",
+            color: ChartConstants.Colors.BLUE,
             stack: 0,
             hiddenOnInit: chartType == "line" ? false : true,
             order: 1,
@@ -94,7 +95,7 @@ export class ChartComponent extends AbstractHistoryChart {
             converter: () =>
               data["ProductionActivePower"]?.map((value, index) => Utils.subtractSafely(value, data["GridSell"][index], data["EssCharge"][index]))
                 ?.map(value => HistoryUtils.ValueConverter.NEGATIVE_AS_ZERO(value)),
-            color: "rgb(244,164,96)",
+            color: ChartConstants.Colors.ORANGE,
             stack: [1, 2],
             order: 2,
           }],
@@ -107,7 +108,7 @@ export class ChartComponent extends AbstractHistoryChart {
               ? data["EssCharge"]?.map((value, index) => {
                 return HistoryUtils.ValueConverter.POSITIVE_AS_ZERO_AND_INVERT_NEGATIVE(Utils.subtractSafely(value, data["ProductionDcActual"]?.[index]));
               }) : data["EssCharge"],
-            color: "rgb(0,223,0)",
+            color: ChartConstants.Colors.GREEN,
             stack: 1,
             ...(chartType === "line" && { order: 6 }),
           },
@@ -122,7 +123,7 @@ export class ChartComponent extends AbstractHistoryChart {
                   return HistoryUtils.ValueConverter.NEGATIVE_AS_ZERO(Utils.subtractSafely(value, data["ProductionDcActual"]?.[index]));
                 }) : data["EssDischarge"];
             },
-            color: "rgb(200,0,0)",
+            color: ChartConstants.Colors.RED,
             stack: 2,
             ...(chartType === "line" && { order: 5 }),
           },
@@ -132,7 +133,7 @@ export class ChartComponent extends AbstractHistoryChart {
             name: translate.instant("General.gridSellAdvanced"),
             nameSuffix: (energyValues: QueryHistoricTimeseriesEnergyResponse) => energyValues.result.data["_sum/GridSellActiveEnergy"],
             converter: () => data["GridSell"],
-            color: "rgb(0,0,200)",
+            color: ChartConstants.Colors.PURPLE,
             stack: 1,
             ...(chartType === "line" && { order: 4 }),
           },
@@ -142,7 +143,7 @@ export class ChartComponent extends AbstractHistoryChart {
             name: translate.instant("General.gridBuyAdvanced"),
             nameSuffix: (energyValues: QueryHistoricTimeseriesEnergyResponse) => energyValues.result.data["_sum/GridBuyActiveEnergy"],
             converter: () => data["GridBuy"],
-            color: "rgb(0,0,0)",
+            color: ChartConstants.Colors.BLUE_GREY,
             stack: 2,
             ...(chartType === "line" && { order: 2 }),
           },
@@ -152,7 +153,7 @@ export class ChartComponent extends AbstractHistoryChart {
             name: translate.instant("General.consumption"),
             nameSuffix: (energyValues: QueryHistoricTimeseriesEnergyResponse) => energyValues.result.data["_sum/ConsumptionActiveEnergy"],
             converter: () => data["Consumption"],
-            color: "rgb(253,197,7)",
+            color: ChartConstants.Colors.YELLOW,
             stack: 3,
             hiddenOnInit: chartType == "line" ? false : true,
             ...(chartType === "line" && { order: 0 }),
diff --git a/ui/src/app/edge/history/common/energy/flat/flat.html b/ui/src/app/edge/history/common/energy/flat/flat.html
index 9dd2bd9c078..ce40969b412 100644
--- a/ui/src/app/edge/history/common/energy/flat/flat.html
+++ b/ui/src/app/edge/history/common/energy/flat/flat.html
@@ -14,8 +14,9 @@
 </ng-container>
 
 <ng-template #desktopView>
-    <oe-flat-widget [title]="'Edge.Index.Energymonitor.title'| translate" [icon]="{name: 'laptop-outline'}"
-        *ngIf="isInitialized" [style.height.px]="getChartHeight()">
+    <oe-flat-widget [title]="'Edge.Index.Energymonitor.title'| translate"
+        [icon]="{name: 'laptop-outline', color: 'normal'}" *ngIf="isInitialized" [style.height.px]="getChartHeight()"
+        class="no-all-edges-shadow">
         <ion-button slot="end" button (click)="exportToXlxs()">
             <ion-icon [name]="'download-outline'">
             </ion-icon>
diff --git a/ui/src/app/edge/history/common/grid/chart/chart.ts b/ui/src/app/edge/history/common/grid/chart/chart.ts
index f195179022c..08cba19030f 100644
--- a/ui/src/app/edge/history/common/grid/chart/chart.ts
+++ b/ui/src/app/edge/history/common/grid/chart/chart.ts
@@ -4,6 +4,7 @@ import { TranslateService } from "@ngx-translate/core";
 import { BoxAnnotationOptions } from "chartjs-plugin-annotation";
 import { GridSectionComponent } from "src/app/edge/live/energymonitor/chart/section/grid.component";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
@@ -99,7 +100,7 @@ export class ChartComponent extends AbstractHistoryChart {
             name: translate.instant("General.gridSellAdvanced"),
             nameSuffix: (energyValues: QueryHistoricTimeseriesEnergyResponse) => energyValues?.result.data["_sum/GridSellActiveEnergy"] ?? null,
             converter: () => data["GridSell"],
-            color: "rgba(0,0,200)",
+            color: ChartConstants.Colors.PURPLE,
             stack: 1,
           },
           {
@@ -108,7 +109,7 @@ export class ChartComponent extends AbstractHistoryChart {
               return energyValues?.result.data["_sum/GridBuyActiveEnergy"] ?? null;
             },
             converter: () => data["GridBuy"],
-            color: "rgb(0,0,0)",
+            color: ChartConstants.Colors.BLUE_GREY,
             stack: 0,
           },
           offGridData ? ({
diff --git a/ui/src/app/edge/history/common/grid/details/chart/chart.ts b/ui/src/app/edge/history/common/grid/details/chart/chart.ts
index c941630eb8a..33f056e342c 100644
--- a/ui/src/app/edge/history/common/grid/details/chart/chart.ts
+++ b/ui/src/app/edge/history/common/grid/details/chart/chart.ts
@@ -2,6 +2,7 @@
 import { Component } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { Phase } from "src/app/shared/components/shared/phase";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { ChartAxis, HistoryUtils, YAxisType } from "src/app/shared/service/utils";
@@ -34,7 +35,7 @@ export class ChartComponent extends AbstractHistoryChart {
               converter: () => {
                 return data["GridActivePower"];
               },
-              color: "rgba(0,0,200)",
+              color: ChartConstants.Colors.BLUE,
               stack: 1,
             },
             ...Phase.THREE_PHASE.map((phase, index) => ({
diff --git a/ui/src/app/edge/history/common/production/chart/totalChart.ts b/ui/src/app/edge/history/common/production/chart/totalChart.ts
index 9c54d688961..c378fe61510 100644
--- a/ui/src/app/edge/history/common/production/chart/totalChart.ts
+++ b/ui/src/app/edge/history/common/production/chart/totalChart.ts
@@ -1,6 +1,7 @@
 // @ts-strict-ignore
 import { Component } from "@angular/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "../../../../../shared/service/utils";
@@ -85,7 +86,7 @@ export class TotalChartComponent extends AbstractHistoryChart {
           converter: () => {
             return data["ProductionActivePower"];
           },
-          color: "rgb(0,152,204)",
+          color: ChartConstants.Colors.BLUE,
           hiddenOnInit: true,
           stack: 2,
         });
@@ -138,7 +139,7 @@ export class TotalChartComponent extends AbstractHistoryChart {
           });
         }
 
-        const chargerColors: string[] = ["rgb(0,223,0)", "rgb(0,178,0)", "rgb(0,201,0)", "rgb(0,134,0)", "rgb(0,156,0)"];
+        const chargerColors: string[] = ["rgb(0,223,0)", "rgb(0,134,0)", "rgb(0,201,0)", "rgb(0,134,0)", "rgb(0,156,0)"];
         // ChargerComponents
         for (let i = 0; i < chargerComponents.length; i++) {
           const component = chargerComponents[i];
diff --git a/ui/src/app/edge/history/common/production/details/chart/sum.ts b/ui/src/app/edge/history/common/production/details/chart/sum.ts
index 6c630946ae0..3f87fbfc389 100644
--- a/ui/src/app/edge/history/common/production/details/chart/sum.ts
+++ b/ui/src/app/edge/history/common/production/details/chart/sum.ts
@@ -3,6 +3,7 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { Phase } from "src/app/shared/components/shared/phase";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
@@ -67,7 +68,7 @@ export class SumChartDetailsComponent extends AbstractHistoryChart {
           name: translate.instant("General.TOTAL"),
           nameSuffix: (energyQueryResponse: QueryHistoricTimeseriesEnergyResponse) => energyQueryResponse.result.data["_sum/ProductionActiveEnergy"],
           converter: () => data[component.id],
-          color: "rgb(0,152,204)",
+          color: ChartConstants.Colors.BLUE,
           hiddenOnInit: false,
           stack: 2,
         },
diff --git a/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts b/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts
index 02c9e4f827f..cb4efd7b1fc 100644
--- a/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts
+++ b/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts
@@ -1,6 +1,7 @@
 // @ts-strict-ignore
 import { Component } from "@angular/core";
 import { AbstractHistoryChart } from "src/app/shared/components/chart/abstracthistorychart";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { QueryHistoricTimeseriesEnergyResponse } from "src/app/shared/jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
 import { ChartAxis, HistoryUtils, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress } from "src/app/shared/shared";
@@ -38,7 +39,7 @@ export class ChartComponent extends AbstractHistoryChart {
                                 Utils.calculateSelfConsumption(value, data["ProductionActivePower"][index]),
                             );
                     },
-                    color: "rgb(253,197,7)",
+                    color: ChartConstants.Colors.YELLOW,
                 }];
             },
             tooltip: {
diff --git a/ui/src/app/edge/history/common/selfconsumption/flat/flat.html b/ui/src/app/edge/history/common/selfconsumption/flat/flat.html
index a3def18d075..f84bc5eb115 100644
--- a/ui/src/app/edge/history/common/selfconsumption/flat/flat.html
+++ b/ui/src/app/edge/history/common/selfconsumption/flat/flat.html
@@ -1,5 +1,6 @@
-<oe-flat-widget [title]="'General.selfConsumption' | translate" [icon]="{name: 'oe-consumption', color:'environmental'}"
-    button routerLink="/device/{{edge.id}}/history/selfconsumptionchart" *ngIf="isInitialized">
+<oe-flat-widget [title]="'General.selfConsumption' | translate" [icon]="{name: 'oe-consumption', color:'normal'}" button
+    routerLink="/device/{{edge.id}}/history/selfconsumptionchart" *ngIf="isInitialized">
+
     <oe-flat-widget-percentagebar [value]="selfconsumptionValue">
     </oe-flat-widget-percentagebar>
 </oe-flat-widget>
diff --git a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html
index 63997a1e1c5..80c6b4b4269 100644
--- a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html
+++ b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="edge && component">
     <ion-header>
-        <ion-toolbar color="primary">
-            <ion-title>{{ component.alias }}</ion-title>
-            <ion-buttons slot="end">
+        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+            <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
                     <ion-icon name="close-outline"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
-        <ion-toolbar color="primary">
+        <ion-toolbar color="secondary">
             <ion-buttons class="ion-justify-content-center">
                 <pickdate></pickdate>
             </ion-buttons>
diff --git a/ui/src/app/edge/history/delayedselltogrid/widget.component.html b/ui/src/app/edge/history/delayedselltogrid/widget.component.html
index 9850fcb7ddd..f68fc28424b 100644
--- a/ui/src/app/edge/history/delayedselltogrid/widget.component.html
+++ b/ui/src/app/edge/history/delayedselltogrid/widget.component.html
@@ -1,10 +1,10 @@
 <ion-card button routerLink="/device/{{edge.id}}/history/{{componentId}}/delayedselltogridchart"
     *ngIf="component && edge">
     <ion-item lines="full" color="light">
-        <ion-icon slot="start" size="large" color="primary" name="trending-down-outline"></ion-icon>
+        <ion-icon slot="start" size="large" color="normal" name="trending-down-outline"></ion-icon>
         <ion-label>{{ component.alias }}</ion-label>
     </ion-item>
-    <ion-card-content>
+    <ion-card-content style="color: var(--ion-card-content-color);">
         <table class="full_width">
             <tr>
                 <td style="width:35%" class="align_right">
diff --git a/ui/src/app/edge/history/heatpump/chart.component.ts b/ui/src/app/edge/history/heatpump/chart.component.ts
index 4e39df05a3c..c77225a674e 100644
--- a/ui/src/app/edge/history/heatpump/chart.component.ts
+++ b/ui/src/app/edge/history/heatpump/chart.component.ts
@@ -3,9 +3,11 @@ import { Component, Input, OnChanges, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 import * as Chart from "chart.js";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { ChartAxis } from "src/app/shared/service/utils";
 
+import { ColorUtils } from "src/app/shared/utils/color/color.utils";
 import { ChannelAddress, EdgeConfig, Service } from "../../../shared/shared";
 import { AbstractHistoryChart } from "../abstracthistorychart";
 
@@ -76,8 +78,8 @@ export class HeatPumpChartComponent extends AbstractHistoryChart implements OnIn
                     hidden: false,
                 });
                 this.colors.push({
-                    backgroundColor: "rgba(200,0,0,0.05)",
-                    borderColor: "rgba(200,0,0,1)",
+                    backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.RED, 0.05),
+                    borderColor: ChartConstants.Colors.RED,
                 });
             }
             this.datasets = datasets;
diff --git a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html
index f8d4c9d4459..685f9422e44 100644
--- a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html
+++ b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="edge">
     <ion-header>
-        <ion-toolbar color="primary">
-            <ion-title>{{ component.alias }}</ion-title>
-            <ion-buttons slot="end">
+        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+            <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history">
                     <ion-icon name="close-outline"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
-        <ion-toolbar color="primary">
+        <ion-toolbar color="secondary">
             <ion-buttons class="ion-justify-content-center">
                 <pickdate></pickdate>
             </ion-buttons>
diff --git a/ui/src/app/edge/history/heatpump/widget.component.html b/ui/src/app/edge/history/heatpump/widget.component.html
index c664db8d882..390179e6900 100644
--- a/ui/src/app/edge/history/heatpump/widget.component.html
+++ b/ui/src/app/edge/history/heatpump/widget.component.html
@@ -1,11 +1,12 @@
-<ion-card button routerLink="/device/{{edge.id}}/history/{{componentId}}/heatpumpchart" *ngIf="component && edge">
-    <ion-item lines="full" color="light">
-        <ion-icon slot="start" color="danger" name="flame"></ion-icon>
+<ion-card button routerLink="/device/{{edge.id}}/history/{{componentId}}/heatpumpchart" *ngIf="component && edge"
+    class="all-edges-shadow">
+    <ion-item lines="full" style="--background: var(--ion-background-color-card-header)">
+        <ion-icon slot="start" color="normal" name="flame"></ion-icon>
         <ion-label>{{ component.alias }}</ion-label>
     </ion-item>
     <ng-container *ngIf="component && service.currentEdge | async as edge">
         <ng-container *ngIf="edge.currentData | async as currentData">
-            <ion-card-content>
+            <ion-card-content style="color: var(--ion-card-content-color);">
                 <table class="full_width">
                     <tr *ngIf="activeTimeOverPeriodRegular !== null && activeTimeOverPeriodRegular > 59">
                         <td style="width:65%" translate>Edge.Index.Widgets.HeatPump.normalOperation</td>
diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html
index 4c6ce917658..abe6d61db2f 100644
--- a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html
+++ b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="component && edge">
     <ion-header>
-        <ion-toolbar color="primary">
-            <ion-title>{{ component.alias }}</ion-title>
-            <ion-buttons slot="end">
+        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+            <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
                     <ion-icon name="close-outline"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
-        <ion-toolbar color="primary">
+        <ion-toolbar color="secondary">
             <ion-buttons class="ion-justify-content-center">
                 <pickdate></pickdate>
             </ion-buttons>
diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html
index 89e8082f29d..fd65d43b28a 100644
--- a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html
+++ b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html
@@ -1,10 +1,11 @@
 <ion-card button routerLink="/device/{{edge.id}}/history/{{componentId}}/asymmetricpeakshavingchart"
     *ngIf="component && edge">
     <ion-item lines="full" color="light">
-        <ion-icon slot="start" size="large" color="primary" name="trending-down-outline"></ion-icon>
+        <ion-icon slot="start" size="large" color="normal" name="trending-down-outline"></ion-icon>
+
         <ion-label>{{ component.alias }}</ion-label>
     </ion-item>
-    <ion-card-content>
+    <ion-card-content style="color: var(--ion-card-content-color);">
         <table class="full_width">
             <tr>
                 <td style="width:35%" class="align_right">
diff --git a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html
index 278617c5783..7e8dff250e3 100644
--- a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html
+++ b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="edge && component">
     <ion-header>
-        <ion-toolbar color="primary">
-            <ion-title>{{ component.alias }}</ion-title>
-            <ion-buttons slot="end">
+        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+            <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
                     <ion-icon name="close-outline"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
-        <ion-toolbar color="primary">
+        <ion-toolbar color="secondary">
             <ion-buttons class="ion-justify-content-center">
                 <pickdate></pickdate>
             </ion-buttons>
diff --git a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html
index dbf3842991d..16e02041e08 100644
--- a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html
+++ b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html
@@ -1,10 +1,10 @@
 <ion-card button routerLink="/device/{{edge.id}}/history/{{componentId}}/symmetricpeakshavingchart"
     *ngIf="component && edge">
     <ion-item lines="full" color="light">
-        <ion-icon slot="start" size="large" color="primary" name="trending-down-outline"></ion-icon>
+        <ion-icon slot="start" size="large" color="normal" name="trending-down-outline"></ion-icon>
         <ion-label>{{ component.alias }}</ion-label>
     </ion-item>
-    <ion-card-content>
+    <ion-card-content style="color: var(--ion-card-content-color);">
         <table class="full_width">
             <tr>
                 <td style="width:35%" class="align_right">
diff --git a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html
index 61e67f32806..4fde5ac2cbd 100644
--- a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html
+++ b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="edge && component">
     <ion-header>
-        <ion-toolbar color="primary">
-            <ion-title>{{ component.alias }}</ion-title>
-            <ion-buttons slot="end">
+        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+            <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
                     <ion-icon name="close-outline"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
-        <ion-toolbar color="primary">
+        <ion-toolbar color="secondary">
             <ion-buttons class="ion-justify-content-center">
                 <pickdate></pickdate>
             </ion-buttons>
diff --git a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html
index 912f7c07fc5..582403623a3 100644
--- a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html
+++ b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html
@@ -1,10 +1,10 @@
 <ion-card button routerLink="/device/{{edge.id}}/history/{{componentId}}/timeslotpeakshavingchart"
     *ngIf="component && edge">
     <ion-item lines="full" color="light">
-        <ion-icon slot="start" size="large" color="primary" name="trending-down-outline"></ion-icon>
+        <ion-icon slot="start" size="large" color="normal" name="trending-down-outline"></ion-icon>
         <ion-label>{{ component.alias }}</ion-label>
     </ion-item>
-    <ion-card-content>
+    <ion-card-content style="color: var(--ion-card-content-color);">
         <table class="full_width">
             <tr>
                 <td style="width:35%" class="align_right">
diff --git a/ui/src/app/edge/history/shared.ts b/ui/src/app/edge/history/shared.ts
index 8f997b3ceb7..c946f9b6b3c 100644
--- a/ui/src/app/edge/history/shared.ts
+++ b/ui/src/app/edge/history/shared.ts
@@ -15,6 +15,12 @@ export interface Dataset {
     hidden: boolean;
 }
 
+export enum Theme {
+    LIGHT = "light",
+    DARK = "dark",
+    SYSTEM = "system",
+}
+
 export const EMPTY_DATASET = [{
     label: "no Data available",
     data: [],
@@ -131,7 +137,7 @@ export type ChartOptions = {
             ticks: {
                 source?: string,
                 maxTicksLimit?: number
-            }
+            },
         }]
     },
     tooltips: {
@@ -207,8 +213,7 @@ export const DEFAULT_TIME_CHART_OPTIONS = (): Chart.ChartOptions => ({
             stacked: true,
             offset: false,
             type: "time",
-            ticks: {
-            },
+            ticks: {},
             bounds: "data",
             adapters: {
                 date: {
diff --git a/ui/src/app/edge/history/storage/socchart.component.ts b/ui/src/app/edge/history/storage/socchart.component.ts
index bf127df1811..56594dfb119 100644
--- a/ui/src/app/edge/history/storage/socchart.component.ts
+++ b/ui/src/app/edge/history/storage/socchart.component.ts
@@ -82,8 +82,8 @@ export class SocStorageChartComponent extends AbstractHistoryChart implements On
                                             data: data,
                                         });
                                         this.colors.push({
-                                            backgroundColor: "rgba(0,223,0,0.05)",
-                                            borderColor: "rgba(0,223,0,1)",
+                                            backgroundColor: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-charge-rgba"),
+                                            borderColor: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-charge-primary"),
                                         });
                                     }
                                     if (channelAddress.channelId === "Soc" && moreThanOneESS) {
@@ -92,8 +92,8 @@ export class SocStorageChartComponent extends AbstractHistoryChart implements On
                                             data: data,
                                         });
                                         this.colors.push({
-                                            backgroundColor: "rgba(128,128,128,0.05)",
-                                            borderColor: "rgba(128,128,128,1)",
+                                            backgroundColor: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-grey-rgba"),
+                                            borderColor: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-grey-primary"),
                                         });
                                     }
                                 }
@@ -106,8 +106,8 @@ export class SocStorageChartComponent extends AbstractHistoryChart implements On
 
                                     });
                                     this.colors.push({
-                                        backgroundColor: "rgba(1, 1, 1,0)",
-                                        borderColor: "rgba(1, 1, 1,1)",
+                                        backgroundColor: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-emergencyreserve-rgba"),
+                                        borderColor: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-emergencyreserve-primary"),
                                     });
                                 }
                             });
diff --git a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
index 749335aba84..e6fc9d7ee79 100644
--- a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
+++ b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
@@ -1,19 +1,21 @@
 <ng-container *ngIf="edge">
     <ion-header>
-        <ion-toolbar class="ion-justify-content-center" color="primary">
-            <ion-title class="ion-text-start ion-padding-left" translate>General.storageSystem
+        <ion-toolbar class="ion-justify-content-center"
+            style="--ion-background-color: var(--ion-color-toolbar-primary);">
+            <ion-title class="ion-text-start ion-padding-left" style="color: var(--ion-color-white);"
+                translate>General.storageSystem
             </ion-title>
-            <ion-buttons slot="start">
+            <ion-buttons style="color: var(--ion-color-white);" slot="start">
                 <chartOptions (setShowTotal)='onNotifyTotal($event)' (setShowPhases)='onNotifyPhases($event)'
                     [showTotal]="showTotal" [showPhases]="showPhases"></chartOptions>
             </ion-buttons>
-            <ion-buttons slot="end">
+            <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history">
                     <ion-icon name="close-outline"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
-        <ion-toolbar color="primary">
+        <ion-toolbar color="secondary">
             <ion-buttons class="ion-justify-content-center">
                 <pickdate></pickdate>
             </ion-buttons>
diff --git a/ui/src/app/edge/history/storage/totalchart.component.ts b/ui/src/app/edge/history/storage/totalchart.component.ts
index fb73aec189d..d385ed25a80 100644
--- a/ui/src/app/edge/history/storage/totalchart.component.ts
+++ b/ui/src/app/edge/history/storage/totalchart.component.ts
@@ -110,6 +110,7 @@ export class StorageTotalChartComponent extends AbstractHistoryChart implements
                                     backgroundColor: "rgba(0,223,0,0.05)",
                                     borderColor: "rgba(0,223,0,1)",
                                 });
+
                             } if ("_sum/EssActivePowerL1" && "_sum/EssActivePowerL2" && "_sum/EssActivePowerL3" in result.data && this.showPhases == true) {
                                 if (channelAddress.channelId == "EssActivePowerL1") {
                                     datasets.push({
diff --git a/ui/src/app/edge/history/storage/widget.component.html b/ui/src/app/edge/history/storage/widget.component.html
index 6fc91033a0e..3581e9efb66 100644
--- a/ui/src/app/edge/history/storage/widget.component.html
+++ b/ui/src/app/edge/history/storage/widget.component.html
@@ -1,9 +1,9 @@
-<ion-card *ngIf="edge" button routerLink="/device/{{edge.id}}/history/storagechart">
-    <ion-item lines="full" color="light">
+<ion-card *ngIf="edge" button routerLink="/device/{{edge.id}}/history/storagechart" class="all-edges-shadow">
+    <ion-item lines="full" style="--background: var(--ion-background-color-card-header)">
         <ion-icon slot="start" name="oe-storage" color="success" size="large"></ion-icon>
         <ion-label translate>General.storageSystem</ion-label>
     </ion-item>
-    <ion-card-content>
+    <ion-card-content style="color: var(--ion-card-content-color);">
         <ng-container *ngIf="data && edge; else noData">
             <table class="full_width">
                 <tr>
diff --git a/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts b/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts
index e33b705a5a7..31414331d27 100644
--- a/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts
+++ b/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts
@@ -15,7 +15,7 @@ export class Controller_ChannelthresholdComponent extends AbstractFlatWidget {
   public icon: Icon = {
     name: "",
     size: "large",
-    color: "dark",
+    color: "normal",
   };
   public state: string = "?";
 
diff --git a/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html b/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html
index 4765f92b5ae..7377618d8e8 100644
--- a/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html
+++ b/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html
@@ -1,5 +1,5 @@
 <oe-flat-widget button (click)="presentModal()" *ngIf="isInitialized" [title]="component.alias" [icon]="{name:
-    'flame-outline'}">
+    'flame-outline', color: 'normal'}">
     <oe-flat-widget-line [name]="'General.mode'| translate" [value]="mode"></oe-flat-widget-line>
     <oe-flat-widget-line *ngIf="icon.name === '', else noValue" [name]="'General.state' | translate" [value]="state">
     </oe-flat-widget-line>
diff --git a/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html b/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html
index 531dec7234d..5d70991a5f3 100644
--- a/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html
@@ -1,5 +1,5 @@
 <ion-header>
-    <ion-toolbar color="primary">
+    <ion-toolbar style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title>{{ component.alias }}</ion-title>
         <ion-buttons slot="end">
             <oe-help-button key="CONTROLLER_CHP_SOC"></oe-help-button>
@@ -27,20 +27,23 @@
                     <ion-label translate>
                         General.on
                     </ion-label>
-                    <ion-icon color="success" style="width:40px" name="power-outline"></ion-icon>
+                    <ion-icon [color]="component.properties['mode'] === 'MANUAL_ON' ? 'success' : 'normal'"
+                        style="width:40px" name="power-outline"></ion-icon>
                 </ion-segment-button>
                 <ion-segment-button value="AUTOMATIC">
                     <ion-label translate>
                         General.automatic
                     </ion-label>
-                    <ion-icon style="width:40px" name="sunny-outline">
+                    <ion-icon style="width:40px" name="sunny-outline"
+                        [color]="component.properties['mode'] === 'AUTOMATIC' ? 'primary' : 'normal'">
                     </ion-icon>
                 </ion-segment-button>
                 <ion-segment-button value="MANUAL_OFF">
                     <ion-label translate>
                         General.off
                     </ion-label>
-                    <ion-icon name="power-outline" style="width: 40px"></ion-icon>
+                    <ion-icon name="power-outline" style="width: 40px"
+                        [color]="component.properties['mode'] === 'MANUAL_OFF' ? 'danger' : 'normal'"></ion-icon>
                 </ion-segment-button>
             </ion-segment>
         </ion-card-content>
diff --git a/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html b/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html
index 61ce74a5bd8..9a4f516f640 100644
--- a/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html
+++ b/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html
@@ -1,5 +1,6 @@
 <ng-container *ngIf="isInitialized">
-    <oe-flat-widget (click)="presentModal()" [icon]="{name:'swap-vertical-outline'}" [title]="component.alias">
+    <oe-flat-widget (click)="presentModal()" [icon]="{name:'swap-vertical-outline', color:'normal'}"
+        [title]="component.alias">
         <oe-flat-widget-line [name]="'General.state' | translate" [value]="propertyMode"
             [converter]="CONVERT_MANUAL_ON_OFF">
         </oe-flat-widget-line>
diff --git a/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html b/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html
index 78d026f8af5..8a2477ec730 100644
--- a/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html
+++ b/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html
@@ -14,7 +14,7 @@
 
   <oe-modal-buttons [formGroup]="formGroup" controlName="mode" [component]="component" [buttons]="[
     { name: ('General.on' | translate), value: 'MANUAL_ON', icon: {color:'success', name: 'power-outline'}},
-    { name: ('General.off' | translate), value: 'MANUAL_OFF', icon: {color:'primary', name: 'power-outline'}}]">
+    { name: ('General.off' | translate), value: 'MANUAL_OFF', icon: {color:'danger', name: 'power-outline'}}]">
   </oe-modal-buttons>
 
   <oe-modal-horizontal-line></oe-modal-horizontal-line>
diff --git a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.html b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.html
index 299cad33151..e17c3ab3952 100644
--- a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.html
+++ b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.html
@@ -36,7 +36,7 @@
     <oe-modal-buttons [formGroup]="formGroup" controlName="mode" [component]="component" [buttons]="[
     { name: ('General.manually' | translate), value: 'MANUAL', icon: {color:'success', name: 'power'}},
     { name: ('General.automatic' | translate), value: 'AUTOMATIC', icon: {color:'primary', name: 'sunny'}},
-    { name: ('General.off' | translate), value: 'OFF', icon: {color:'light-contrast', name: 'power'}}]">
+    { name: ('General.off' | translate), value: 'OFF', icon: {color:'danger', name: 'power'}}]">
     </oe-modal-buttons>
 
     <!-- MANUAL Mode -->
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts
index 6757a7d7489..9ea009a4f84 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts
@@ -4,8 +4,9 @@ import { BrowserModule } from "@angular/platform-browser";
 import { TranslateService } from "@ngx-translate/core";
 import { ChartDataset } from "chart.js";
 import { ChartAxis, TimeOfUseTariffUtils } from "src/app/shared/service/utils";
-import { Utils } from "src/app/shared/shared";
+import { ChartConstants, Utils } from "src/app/shared/shared";
 import { SharedModule } from "src/app/shared/shared.module";
+import { ColorUtils } from "src/app/shared/utils/color/color.utils";
 import { FlatComponent } from "./flat/flat";
 import { ModalComponent } from "./modal/modal";
 import { SchedulePowerAndSocChartComponent } from "./modal/powerSocChart";
@@ -152,8 +153,8 @@ export namespace Controller_Ess_TimeOfUseTariff {
             order: 2,
         });
         colors.push({
-            backgroundColor: "rgba(0,0,0, 0.2)",
-            borderColor: "rgba(0,0,0, 1)",
+            backgroundColor: ChartConstants.Colors.BLUE_GREY,
+            borderColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.BLUE_GREY, 1),
         });
 
         const scheduleChartData: Controller_Ess_TimeOfUseTariff.ScheduleChartData = {
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html
index 25962cb6b4a..74acd3a699d 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html
@@ -1,5 +1,6 @@
 <oe-flat-widget button *ngIf="isInitialized" [title]="component.alias" [icon]="{name:
-    'cloud-outline'}" (click)="presentModal()">
+    'cloud-outline', color: 'normal'}" (click)="presentModal()">
+
     <oe-flat-widget-line [name]="'General.mode' | translate" [channelAddress]="component.id + '/_PropertyMode'"
         [converter]="CONVERT_MODE_TO_MANUAL_OFF_AUTOMATIC"></oe-flat-widget-line>
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.TIME_OF_USE_TARIFF.PRICE' | translate"
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.html b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.html
index 7fffeb3ac01..bd30c4b3b05 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.html
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.html
@@ -15,7 +15,7 @@
     <oe-modal-line [name]="'General.mode'| translate"></oe-modal-line>
     <oe-modal-buttons [formGroup]="formGroup" controlName="mode" [component]="component" [buttons]="[
         { name: ('General.automatic' | translate), value: 'AUTOMATIC', icon: {color:'primary', name: 'sunny'}},
-        { name: ('General.off' | translate), value: 'OFF', icon: {color:'light-contrast', name: 'power'}}]">
+        { name: ('General.off' | translate), value: 'OFF', icon: {color:'danger', name: 'power'}}]">
     </oe-modal-buttons>
 
     <ng-container *ngIf="component.factoryId  === 'Controller.Ess.Time-Of-Use-Tariff'">
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
index ed22926be64..596be299463 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
@@ -9,6 +9,7 @@ import { ChartConstants } from "src/app/shared/components/chart/chart.constants"
 import { ComponentJsonApiRequest } from "src/app/shared/jsonrpc/request/componentJsonApiRequest";
 import { ChartAxis, HistoryUtils, TimeOfUseTariffUtils, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, Edge, EdgeConfig, Service, Websocket } from "src/app/shared/shared";
+import { ColorUtils } from "src/app/shared/utils/color/color.utils";
 import { GetScheduleRequest } from "../../../../../../shared/jsonrpc/request/getScheduleRequest";
 import { GetScheduleResponse } from "../../../../../../shared/jsonrpc/response/getScheduleResponse";
 
@@ -104,8 +105,8 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
                 order: 1,
             });
             this.colors.push({
-                backgroundColor: "rgba(0,0,0, 0.2)",
-                borderColor: "rgba(0,0,0, 1)",
+                backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.BLUE_GREY, 0.2),
+                borderColor: ChartConstants.Colors.BLUE_GREY,
             });
 
             datasets.push({
@@ -116,8 +117,8 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
                 order: 1,
             });
             this.colors.push({
-                backgroundColor: "rgba(0,0,200, 0.2)",
-                borderColor: "rgba(0,0,200, 1)",
+                backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.PURPLE, 0.2),
+                borderColor: ChartConstants.Colors.PURPLE,
             });
 
             datasets.push({
@@ -128,8 +129,8 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
                 order: 1,
             });
             this.colors.push({
-                backgroundColor: "rgba(45,143,171, 0.2)",
-                borderColor: "rgba(45,143,171, 1)",
+                backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.BLUE, 0.2),
+                borderColor: ChartConstants.Colors.BLUE,
             });
 
             datasets.push({
@@ -140,8 +141,8 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
                 order: 1,
             });
             this.colors.push({
-                backgroundColor: "rgba(253,197,7,0.2)",
-                borderColor: "rgba(253,197,7,1)",
+                backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.YELLOW, 0.2),
+                borderColor: ChartConstants.Colors.YELLOW,
             });
 
             datasets.push({
@@ -153,8 +154,8 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
                 unit: YAxisType.POWER,
             });
             this.colors.push({
-                backgroundColor: "rgba(0,223,0, 0.2)",
-                borderColor: "rgba(0,223,0, 1)",
+                backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.GREEN, 0.2),
+                borderColor: ChartConstants.Colors.GREEN,
             });
 
             datasets.push({
@@ -166,8 +167,8 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
                 unit: YAxisType.POWER,
             });
             this.colors.push({
-                backgroundColor: "rgba(200,0,0, 0.2)",
-                borderColor: "rgba(200,0,0, 1)",
+                backgroundColor: ColorUtils.rgbStringToRGBA(ChartConstants.Colors.RED, 0.2),
+                borderColor: ChartConstants.Colors.RED,
             });
 
             // State of charge data
@@ -219,6 +220,7 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
         });
 
         this.options.scales.x["ticks"] = { source: "auto", autoSkip: false };
+        this.options.scales.x.ticks.color = getComputedStyle(document.documentElement).getPropertyValue("--ion-color-chart-xAxis-ticks");
         this.options.scales.x.ticks.callback = function (value, index, values) {
             const date = new Date(value);
 
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
index 14309505f8f..f5a9e6748b3 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
@@ -122,6 +122,7 @@ export class ScheduleStateAndPriceChartComponent extends AbstractHistoryChart im
 
         this.options.scales.x["time"].unit = calculateResolution(this.service, this.service.historyPeriod.value.from, this.service.historyPeriod.value.to).timeFormat;
         this.options.scales.x["ticks"] = { source: "auto", autoSkip: false };
+        this.options.scales.x.ticks.color = getComputedStyle(document.documentElement).getPropertyValue("--ion-color-chart-xAxis-ticks");
         this.options.scales.x.ticks.maxTicksLimit = 30;
         this.options.scales.x["offset"] = false;
         this.options.scales.x.ticks.callback = function (value) {
@@ -172,7 +173,7 @@ export class ScheduleStateAndPriceChartComponent extends AbstractHistoryChart im
 
             return el;
         });
-        const leftYAxis: HistoryUtils.yAxes = { position: "left", unit: this.unit, yAxisId: ChartAxis.LEFT, customTitle: this.currencyUnit };
+        const leftYAxis: HistoryUtils.yAxes = { position: "left", unit: this.unit, yAxisId: ChartAxis.LEFT, customTitle: this.currencyUnit, scale: { dynamicScale: true } };
         [rightYaxisSoc, rightYAxisPower].forEach((element) => {
             this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, element, this.translate, "line", locale, this.datasets, true);
         });
diff --git a/ui/src/app/edge/live/Controller/Evcs/flat/flat.html b/ui/src/app/edge/live/Controller/Evcs/flat/flat.html
index 2ec4d329a1d..2466bb3e5d7 100644
--- a/ui/src/app/edge/live/Controller/Evcs/flat/flat.html
+++ b/ui/src/app/edge/live/Controller/Evcs/flat/flat.html
@@ -1,5 +1,5 @@
 <oe-flat-widget button (click)="presentModal()" style="cursor: pointer;" *ngIf="isInitialized && evcsComponent"
-    [title]="evcsComponent.alias" [icon]="{name: 'oe-evcs', color: 'environmental'}">
+    [title]="evcsComponent.alias" [icon]="{name: 'oe-evcs', color: 'normal'}">
 
     <!-- Show if Connection is Successful -->
     <ng-container *ngIf="isConnectionSuccessful, else noConnection">
@@ -13,7 +13,7 @@
             [channelAddress]="componentId + '/EnergySession'" [converter]="CONVERT_TO_KILO_WATTHOURS">
         </oe-flat-widget-line>
 
-        <oe-flat-widget-line *ngIf="isChargingEnabled" [name]="'General.mode'| translate" [value]="mode">
+        <oe-flat-widget-line *ngIf="isChargingEnabled && isReadWrite" [name]="'General.mode'| translate" [value]="mode">
         </oe-flat-widget-line>
 
         <!-- Show if charging is enabled -->
diff --git a/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts b/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts
index ea589527b23..19520cb0e68 100644
--- a/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts
@@ -42,6 +42,7 @@ export class FlatComponent extends AbstractFlatWidget {
   protected chargeDischargePower: { name: string, value: number };
   protected propertyMode: DefaultTypes.ManualOnOff | null = null;
   protected status: string;
+  protected isReadWrite: boolean;
 
   formatNumber(i: number) {
     const round = Math.ceil(i / 100) * 100;
@@ -88,6 +89,7 @@ export class FlatComponent extends AbstractFlatWidget {
 
     this.evcsComponent = this.config.getComponent(this.component.id);
     this.isConnectionSuccessful = currentData.allComponents[this.component.id + "/State"] != 3 ? true : false;
+    this.isReadWrite = !this.component.properties["readOnly"];
     this.status = this.getState(this.controller ? currentData.allComponents[this.controller.id + "/_PropertyEnabledCharging"] === 1 : null, currentData.allComponents[this.component.id + "/Status"], currentData.allComponents[this.component.id + "/Plug"]);
 
     // Check if Energy since beginning is allowed
diff --git a/ui/src/app/edge/live/Controller/Evcs/modal/modal.html b/ui/src/app/edge/live/Controller/Evcs/modal/modal.html
index 0820cf1130a..38a9b89e745 100644
--- a/ui/src/app/edge/live/Controller/Evcs/modal/modal.html
+++ b/ui/src/app/edge/live/Controller/Evcs/modal/modal.html
@@ -1,7 +1,7 @@
 <oe-modal [title]="this.component.alias" [component]="controller" [formGroup]="formGroup"
   *ngIf="isInitialized && formGroup" [helpKey]="helpKey">
 
-  <ion-button button (click)="presentModal()">
+  <ion-button *ngIf="isReadWrite" button (click)="presentModal()">
     <ion-icon name="car"></ion-icon>
   </ion-button>
 
@@ -10,16 +10,17 @@
   <ng-container *ngIf="isConnectionSuccessful">
     <oe-modal-line [name]="'Edge.Index.Widgets.EVCS.status' | translate" [value]="status">
     </oe-modal-line>
-
-    <oe-modal-line *ngIf="chargePowerLimit >= maxChargePower; else chargePowerLimitValid"
-      [name]="'Edge.Index.Widgets.EVCS.chargeTarget' | translate" [value]="maxChargePower">
-    </oe-modal-line>
-    <ng-template #chargePowerLimitValid>
-      <oe-modal-line [name]="'Edge.Index.Widgets.EVCS.chargeTarget' | translate" [value]="chargePowerLimit">
+    <ng-container *ngIf="isReadWrite">
+      <oe-modal-line *ngIf="chargePowerLimit >= maxChargePower; else chargePowerLimitValid"
+        [name]="'Edge.Index.Widgets.EVCS.chargeTarget' | translate" [value]="maxChargePower">
       </oe-modal-line>
-    </ng-template>
+      <ng-template #chargePowerLimitValid>
+        <oe-modal-line [name]="'Edge.Index.Widgets.EVCS.chargeTarget' | translate" [value]="chargePowerLimit">
+        </oe-modal-line>
+      </ng-template>
+    </ng-container>
 
-    <oe-modal-line *ngIf=" chargePower?.value> 0;else empty"
+    <oe-modal-line *ngIf="chargePower?.value > 0;else empty"
       [name]="'Edge.Index.Widgets.EVCS.chargingPower' | translate" [value]="chargePower.value"
       [converter]="Utils.CONVERT_TO_WATT">
     </oe-modal-line>
@@ -31,42 +32,41 @@
     <oe-modal-line *ngIf="chargePower?.value > 0 || state === 2 || state === 7"
       [name]="'Edge.Index.Widgets.EVCS.energySinceBeginning' | translate" [value]="energySession">
     </oe-modal-line>
-
-    <ng-container *ngIf="awaitingHysteresis">
-      <ion-row>
-        <ion-col size="1" style="display: flex; align-items: center; justify-content: center;">
-          <ion-icon name="information-outline" size="large"></ion-icon>
-        </ion-col>
-        <ion-col size="11">
-          <oe-modal-info-line
-            [info]="[{text:'Edge.Index.Widgets.EVCS.HYSTERESIS' | translate, lineStyle:'color: #FFA500'},{text:'Edge.Index.Widgets.EVCS.HYSTERESIS_INFO' | translate}]">
-          </oe-modal-info-line>
-        </ion-col>
-      </ion-row>
-    </ng-container>
-    <oe-modal-horizontal-line></oe-modal-horizontal-line>
-
-    <table class="full_width">
-      <tr>
-        <td translate>
-          General.mode
-        </td>
-        <td class="align_right" *ngIf="formGroup.value.chargeMode !== 'OFF'">
-          <ion-icon (click)="isPrioritization = false; presentPopover()" class="ion-no-padding"
-            style="text-align: right; font-size: 20px" style="cursor: pointer" name="information-circle-outline">
-          </ion-icon>
-        </td>
-      </tr>
-    </table>
-
-
-    <oe-modal-buttons *ngIf="formGroup.controls['chargeMode'].value" [formGroup]="formGroup" controlName="chargeMode"
-      [component]="component" [buttons]="[
+    <ng-container *ngIf="isReadWrite">
+      <ng-container *ngIf="awaitingHysteresis">
+        <ion-row>
+          <ion-col size="1" style="display: flex; align-items: center; justify-content: center;">
+            <ion-icon name="information-outline" size="large"></ion-icon>
+          </ion-col>
+          <ion-col size="11">
+            <oe-modal-info-line
+              [info]="[{text:'Edge.Index.Widgets.EVCS.HYSTERESIS' | translate, lineStyle:'color: #FFA500'},{text:'Edge.Index.Widgets.EVCS.HYSTERESIS_INFO' | translate}]">
+            </oe-modal-info-line>
+          </ion-col>
+        </ion-row>
+      </ng-container>
+      <oe-modal-horizontal-line></oe-modal-horizontal-line>
+
+      <table class="full_width">
+        <tr>
+          <td translate>
+            General.mode
+          </td>
+          <td class="align_right" *ngIf="formGroup.value.chargeMode !== 'OFF'">
+            <ion-icon (click)="isPrioritization = false; presentPopover()" class="ion-no-padding"
+              style="text-align: right; font-size: 20px" style="cursor: pointer" name="information-circle-outline">
+            </ion-icon>
+          </td>
+        </tr>
+      </table>
+
+      <oe-modal-buttons *ngIf="formGroup.controls['chargeMode'].value" [formGroup]="formGroup" controlName="chargeMode"
+        [component]="component" [buttons]="[
     { name: ('General.on' | translate), value: 'FORCE_CHARGE', icon: {color:'success', name: 'power-outline'}},
     { name: ('General.automatic' | translate), value: 'EXCESS_POWER', icon: {color:'primary', name: 'sunny-outline'}},
-    { name: ('General.off' | translate), value: 'OFF', icon: {color:'primary', name: 'power-outline'}}]">
-    </oe-modal-buttons>
-
+    { name: ('General.off' | translate), value: 'OFF', icon: {color:'danger', name: 'power-outline'}}]">
+      </oe-modal-buttons>
+    </ng-container>
     <oe-modal-horizontal-line></oe-modal-horizontal-line>
     <ng-container *ngIf="controller">
 
@@ -153,7 +153,7 @@
 
     </ng-container>
     <!--Uncontrollable Evcs-->
-    <ng-container *ngIf="!controller">
+    <ng-container *ngIf="!controller && isReadWrite">
 
       <oe-modal-info-line [info]="('Edge.Index.Widgets.EVCS.Uncontrollable' | translate)">
       </oe-modal-info-line>
@@ -161,9 +161,8 @@
     </ng-container>
   </ng-container>
   <ng-container *ngIf="!isConnectionSuccessful">
-
     <oe-modal-info-line [info]="('Edge.Index.Widgets.EVCS.NoConnection.description' | translate)">
     </oe-modal-info-line>
   </ng-container>
 
-</oe-modal>
+</oe-modal>
\ No newline at end of file
diff --git a/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts b/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts
index c3a4216e5d0..e4019eee0c6 100644
--- a/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts
@@ -39,6 +39,7 @@ export class ModalComponent extends AbstractModal {
   protected sessionLimit: number;
   protected helpKey: string;
   protected awaitingHysteresis: boolean;
+  protected isReadWrite: boolean = true;
 
   constructor(
     @Inject(Websocket) protected override websocket: Websocket,
@@ -115,6 +116,7 @@ export class ModalComponent extends AbstractModal {
       new ChannelAddress(this.component.id, "MinimumHardwarePower"),
       new ChannelAddress(this.component.id, "MaximumHardwarePower"),
       new ChannelAddress(this.component.id, "SetChargePowerLimit"),
+      new ChannelAddress(this.component.id, "_PropertyReadOnly"),
       new ChannelAddress(this.controller?.id, "_PropertyChargeMode"),
       new ChannelAddress(this.controller?.id, "_PropertyEnabledCharging"),
       new ChannelAddress(this.controller?.id, "_PropertyDefaultChargeMinPower"),
@@ -125,6 +127,7 @@ export class ModalComponent extends AbstractModal {
   protected override onCurrentData(currentData: CurrentData) {
     this.isConnectionSuccessful = currentData.allComponents[this.component.id + "/State"] !== 3 ? true : false;
     this.awaitingHysteresis = currentData.allComponents[this.controller?.id + "/AwaitingHysteresis"];
+    this.isReadWrite = !this.component.properties["readOnly"];
     // Do not change values after touching formControls
     if (this.formGroup?.pristine) {
       this.status = this.getState(this.controller ? currentData.allComponents[this.controller.id + "/_PropertyEnabledCharging"] === 1 : null, currentData.allComponents[this.component.id + "/Status"], currentData.allComponents[this.component.id + "/Plug"]);
diff --git a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.html b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.html
index 1154cfc7ba1..59838eae56d 100644
--- a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.html
+++ b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.html
@@ -1,5 +1,6 @@
 <oe-flat-widget *ngIf="isInitialized" button (click)="presentModal()" [title]="component.alias"
-  [icon]="icon">
+  [icon]="{name: icon.name, color: 'normal'}">
+
   <oe-flat-widget-line [name]="'General.state' | translate" [value]="state"></oe-flat-widget-line>
   <oe-flat-widget-line [name]="'General.mode' | translate" [value]="mode"></oe-flat-widget-line>
 
diff --git a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html
index 157118d7b01..d56a02325d6 100644
--- a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-  <ion-toolbar mode="md" class="ion-justify-content-center" color="primary">
+  <ion-toolbar mode="md" class="ion-justify-content-center"
+    style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
     <ion-title>{{ component.alias }}</ion-title>
     <ion-buttons slot="end">
       <oe-help-button key="CONTROLLER_IO_CHANNEL_SINGLE_THRESHOLD"></oe-help-button>
@@ -45,20 +46,23 @@
                 <ion-label translate>
                   General.on
                 </ion-label>
-                <ion-icon color="success" style="width:40px" name="power-outline"></ion-icon>
+                <ion-icon [color]="component.properties['mode'] === 'ON' ? 'success' : 'normal'" style="width:40px"
+                  name="power-outline"></ion-icon>
               </ion-segment-button>
               <ion-segment-button value="AUTOMATIC">
                 <ion-label translate>
                   General.automatic
                 </ion-label>
-                <ion-icon style="width:40px" name="sunny-outline">
+                <ion-icon [color]="component.properties['mode'] === 'AUTOMATIC' ? 'primary' : 'normal'"
+                  style="width:40px" name="sunny-outline">
                 </ion-icon>
               </ion-segment-button>
               <ion-segment-button value="OFF">
                 <ion-label translate>
                   General.off
                 </ion-label>
-                <ion-icon name="power-outline" style="width: 40px"></ion-icon>
+                <ion-icon [color]="component.properties['mode'] === 'OFF' ? 'danger' : 'normal'" name="power-outline"
+                  style="width: 40px"></ion-icon>
               </ion-segment-button>
             </ion-segment>
           </ion-card-content>
diff --git a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html
index 6a40da4eee7..11278a80c59 100644
--- a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html
+++ b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html
@@ -1,5 +1,7 @@
 <ng-container *ngIf="isInitialized">
-  <oe-flat-widget (click)="presentModal()" [title]="component.alias" [icon]="{name: 'power-outline', size: 'large'}">
+  <oe-flat-widget (click)="presentModal()" [title]="component.alias"
+    [icon]="{name: 'power-outline', size: 'large', color: 'normal'}">
+
     <oe-flat-widget-line name="Aktueller Status" [value]="state"></oe-flat-widget-line>
   </oe-flat-widget>
 </ng-container>
diff --git a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html
index 2fd0e5ba02f..b95fc16e6cf 100644
--- a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title>{{ component.alias }}</ion-title>
         <ion-buttons slot="end">
             <oe-help-button key="CONTROLLER_IO_FIX_DIGITAL_OUTPUT"></oe-help-button>
@@ -23,16 +24,18 @@
         <ion-segment *ngIf="component" (ionChange)="updateMode($event)" value="{{ component.properties['isOn'] }}"
             scrollable="false">
             <ion-segment-button value="true">
-                <ion-label translate>
+                <ion-label style="color: var(--ion-color-text)" translate>
                     General.on
                 </ion-label>
-                <ion-icon color="success" style="width:40px" name="power-outline"></ion-icon>
+                <ion-icon [color]="component.properties['isOn'] === true ? 'success' : 'secondary'" color="success"
+                    style="width:40px" name="power-outline"></ion-icon>
             </ion-segment-button>
             <ion-segment-button value="false">
-                <ion-label translate>
+                <ion-label style="color: var(--ion-color-text)" translate>
                     General.off
                 </ion-label>
-                <ion-icon name="power-outline" style="width: 40px"></ion-icon>
+                <ion-icon [color]="component.properties['isOn'] === false ? 'danger' : 'secondary'" name="power-outline"
+                    style="width: 40px"></ion-icon>
             </ion-segment-button>
         </ion-segment>
     </ion-card-content>
diff --git a/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html b/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html
index f2440c4a5d5..0b68e20aa55 100644
--- a/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html
+++ b/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html
@@ -1,5 +1,6 @@
 <ng-container *ngIf="isInitialized">
-    <oe-flat-widget button (click)="presentModal()" [title]="component.alias" [icon]="{color: 'danger', name:'flame'}">
+    <oe-flat-widget button (click)="presentModal()" [title]="component.alias" [icon]="{color: 'normal', name:'flame'}">
+
         <oe-flat-widget-line [name]="'General.mode' | translate" [value]="mode | translate">
         </oe-flat-widget-line>
         <oe-flat-widget-line [name]="'General.state' | translate" [value]="state | translate">
diff --git a/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html b/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html
index 3a8e729979e..2cdd9adc10a 100644
--- a/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html
+++ b/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html
@@ -13,7 +13,7 @@
     <oe-modal-buttons [formGroup]="formGroup" controlName="mode" [component]="component" [buttons]="[
     { name: ('General.on' | translate), value: 'MANUAL_ON', icon: {color:'success', name: 'power'}},
     { name: ('General.automatic' | translate), value: 'AUTOMATIC', icon: {color:'primary', name: 'sunny'}},
-    { name: ('General.off' | translate), value: 'MANUAL_OFF', icon: {color:'light-contrast', name: 'power'}}]">
+    { name: ('General.off' | translate), value: 'MANUAL_OFF', icon: {color:'danger', name: 'power'}}]">
     </oe-modal-buttons>
 
 
diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html b/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html
index c0ade929d82..b9f00c4917c 100644
--- a/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html
+++ b/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html
@@ -1,5 +1,6 @@
 <oe-flat-widget button (click)="presentModal()" *ngIf="isInitialized"
-    [icon]="{color: 'danger', name: 'flame', size: 'medium'}" [title]="component.alias">
+    [icon]="{color: 'normal', name: 'flame', size: 'medium'}" [title]="component.alias">
+
     <oe-flat-widget-line *ngIf="isConnectionSuccessful, else noConnection" [name]="'General.state'|translate"
         [value]="statusValue">
     </oe-flat-widget-line>
diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html
index 59063fd023e..c83b36d9ad5 100644
--- a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-  <ion-toolbar class="ion-justify-content-center" color="primary">
+  <ion-toolbar class="ion-justify-content-center"
+    style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
     <ion-title>{{ component.alias }}</ion-title>
     <ion-buttons slot="end">
       <oe-help-button key="CONTROLLER_IO_HEAT_PUMP_SG_READY"></oe-help-button>
@@ -62,13 +63,15 @@
           <ion-label translate>
             General.manually
           </ion-label>
-          <ion-icon color="success" style="width:40px" name="power-outline"></ion-icon>
+          <ion-icon [color]="component.properties['mode'] === 'MANUAL'? 'success': 'normal'" style="width:40px"
+            name="power-outline"></ion-icon>
         </ion-segment-button>
         <ion-segment-button value="AUTOMATIC">
           <ion-label translate>
             General.automatic
           </ion-label>
-          <ion-icon style="width:40px" name="sunny-outline">
+          <ion-icon style="width:40px" name="sunny-outline"
+            [color]="component.properties['mode'] === 'AUTOMATIC'? 'primary': 'normal'">
           </ion-icon>
         </ion-segment-button>
       </ion-segment>
diff --git a/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.html b/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.html
index 9df8ac9fb01..661499d50d3 100644
--- a/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.html
+++ b/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.html
@@ -1,3 +1,5 @@
-<oe-flat-widget *ngIf="isInitialized" (click)="presentModal()" [icon]="{name:'swap-vertical-outline'}" [title]="component.alias">
-    <oe-flat-widget-line [name]="'MODBUS_TCP_API_READ_WRITE.CURRENT_STATE'| translate" [value]="this.overrideStatus" [leftColumnWidth]="10"></oe-flat-widget-line>
+<oe-flat-widget *ngIf="isInitialized" (click)="presentModal()" [icon]="{name:'swap-vertical-outline', color: 'normal'}"
+    [title]="component.alias">
+    <oe-flat-widget-line [name]="'MODBUS_TCP_API_READ_WRITE.CURRENT_STATE'| translate" [value]="this.overrideStatus"
+        [leftColumnWidth]="10"></oe-flat-widget-line>
 </oe-flat-widget>
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html
index 9f457005bed..9e79dd07da8 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html
@@ -1,5 +1,6 @@
 <oe-flat-widget button (click)="presentModal()" *ngIf="isInitialized" [title]="component.alias"
-    [icon]="{name: 'trending-down-outline'}">
+    [icon]="{name: 'trending-down-outline', color: 'normal'}">
+
     <oe-flat-widget-line
         [name]="('Edge.Index.Widgets.Peakshaving.mostStressedPhase' | translate) + '&nbsp;' + (mostStressedPhase | async)?.name"
         [converter]="CONVERT_WATT_TO_KILOWATT" [value]="(mostStressedPhase | async)?.value">
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html
index ebcb86c320f..d8ec1e36904 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title>{{ component.alias }}</ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="modalCtrl.dismiss()">
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html
index 1ae94833bb1..48c58179b2e 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html
@@ -1,5 +1,6 @@
 <oe-flat-widget button (click)="presentModal()" *ngIf="isInitialized" [title]="component.alias"
-    [icon]="{name: 'trending-down-outline'}">
+    [icon]="{name: 'trending-down-outline', color: 'normal'}">
+
     <oe-flat-widget-line [name]="'General.measuredValue' | translate" [converter]="CONVERT_WATT_TO_KILOWATT"
         [value]="activePower"></oe-flat-widget-line>
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.Peakshaving.peakshavingPower'| translate"
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html
index fabeafa884e..67f2e47adb3 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title>{{ component.alias }}</ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="modalCtrl.dismiss()">
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html
index 20ba62c9fe4..7c672cb2029 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html
@@ -1,4 +1,6 @@
-<oe-flat-widget button (click)="presentModal()" [title]="component.alias" [icon]="{name: 'trending-down-outline'}">
+<oe-flat-widget button (click)="presentModal()" [title]="component.alias"
+    [icon]="{name: 'trending-down-outline', color: 'normal'}">
+
     <oe-flat-widget-line [name]="'General.measuredValue'| translate" [converter]="CONVERT_WATT_TO_KILOWATT"
         [value]="activePower"></oe-flat-widget-line>
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.Peakshaving.peakshavingPower' | translate"
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html
index a143c88db41..d191ab545f2 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title>{{ component.alias }}</ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="modalCtrl.dismiss()">
diff --git a/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.html b/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.html
index 3d98e20dabb..b38e74c1204 100644
--- a/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.html
+++ b/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title translate>General.digitalInputs</ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="modalCtrl.dismiss()">
diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
index 7743c265a65..821e39c81cf 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
@@ -1,5 +1,6 @@
 <oe-flat-widget button style="cursor: pointer;" (click)="presentModal()" *ngIf="isInitialized"
-  [icon]="{name: 'oe-evcs', color: 'environmental'}" [title]="alias | translate">
+  [icon]="{name: 'oe-evcs', color: 'normal'}" [title]="alias | translate">
+
 
   <ng-container *ngIf="isConnectionSuccessful, else noConnection">
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.EVCS.amountOfChargingStations'| translate"
diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html
index e73fe3f8906..cda4f41f556 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html
@@ -1,6 +1,7 @@
 <ng-container *ngIf="(edge.currentData | async)['channel'] as currentData">
     <ion-header>
-        <ion-toolbar class="ion-justify-content-center" color="primary">
+        <ion-toolbar class="ion-justify-content-center"
+            style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
             <ion-title>
                 <ion-label *ngIf="config.properties.alias as alias">
                     {{ alias }}
diff --git a/ui/src/app/edge/live/common/autarchy/flat/flat.html b/ui/src/app/edge/live/common/autarchy/flat/flat.html
index 1b425accf5e..e7f5b5aee9a 100644
--- a/ui/src/app/edge/live/common/autarchy/flat/flat.html
+++ b/ui/src/app/edge/live/common/autarchy/flat/flat.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="isInitialized">
-    <oe-flat-widget [title]="'General.autarchy' | translate" [icon]="{name: 'oe-grid', color:'environmental'}" button
+    <oe-flat-widget [title]="'General.autarchy' | translate" [icon]="{name: 'oe-grid', color:'normal'}" button
         (click)="presentModal()">
         <oe-flat-widget-percentagebar [value]="this.percentageValue">
         </oe-flat-widget-percentagebar>
diff --git a/ui/src/app/edge/live/common/consumption/flat/flat.html b/ui/src/app/edge/live/common/consumption/flat/flat.html
index 761302becfe..458deefc1bd 100644
--- a/ui/src/app/edge/live/common/consumption/flat/flat.html
+++ b/ui/src/app/edge/live/common/consumption/flat/flat.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="isInitialized">
+<ng-container class="all-edges-shadow" *ngIf="isInitialized">
     <oe-flat-widget [icon]="{name: 'oe-consumption', color: 'warning'}" [title]="'General.consumption' | translate"
         button (click)="presentModal()">
 
diff --git a/ui/src/app/edge/live/common/grid/modal/modal.ts b/ui/src/app/edge/live/common/grid/modal/modal.ts
index 899d9f6642a..4c4d857063f 100644
--- a/ui/src/app/edge/live/common/grid/modal/modal.ts
+++ b/ui/src/app/edge/live/common/grid/modal/modal.ts
@@ -135,6 +135,7 @@ export class ModalComponent extends AbstractFormlyComponent {
           channel: ChannelAddress.fromString(component.id + "/ActivePower" + phase),
           converter: Name.SUFFIX_FOR_GRID_SELL_OR_GRID_BUY(translate, translate.instant("General.phase") + " " + phase),
         },
+
         indentation: TextIndentation.SINGLE,
         children: ModalComponent.generatePhasesLineItems(role, phase, component),
       });
@@ -150,7 +151,7 @@ export class ModalComponent extends AbstractFormlyComponent {
       }, {
         type: "item",
         channel: component.id + "/Current" + phase,
-        converter: Converter.CURRENT_IN_MILLIAMPERE_TO_AMPERE,
+        converter: Converter.CURRENT_IN_MILLIAMPERE_TO_ABSOLUTE_AMPERE,
       });
     }
 
diff --git a/ui/src/app/edge/live/common/selfconsumption/flat/flat.html b/ui/src/app/edge/live/common/selfconsumption/flat/flat.html
index 87d7e770b3e..b31023bc43e 100644
--- a/ui/src/app/edge/live/common/selfconsumption/flat/flat.html
+++ b/ui/src/app/edge/live/common/selfconsumption/flat/flat.html
@@ -1,4 +1,4 @@
-<oe-flat-widget [icon]="{name: 'oe-consumption', color: 'environmental'}"
-    [title]="'General.selfConsumption' | translate" (click)="presentModal()">
+<oe-flat-widget [icon]="{name: 'oe-consumption', color: 'normal'}" [title]="'General.selfConsumption' | translate"
+    (click)="presentModal()">
     <oe-flat-widget-percentagebar [value]="this.calculatedSelfConsumption"></oe-flat-widget-percentagebar>
 </oe-flat-widget>
diff --git a/ui/src/app/edge/live/common/storage/modal/modal.component.html b/ui/src/app/edge/live/common/storage/modal/modal.component.html
index 1a69b3ebe9b..cf67aefa98c 100644
--- a/ui/src/app/edge/live/common/storage/modal/modal.component.html
+++ b/ui/src/app/edge/live/common/storage/modal/modal.component.html
@@ -1,5 +1,5 @@
 <ion-header>
-    <ion-toolbar color="primary">
+    <ion-toolbar style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title translate>General.storageSystem</ion-title>
         <ion-buttons slot="end">
             <oe-help-button key="COMMON_STORAGE"></oe-help-button>
@@ -132,7 +132,7 @@
                                         <td style="width: 90%">
                                             <ion-note class="ion-text-wrap ion-align-items-center">
                                                 <ion-text>
-                                                    <small translate>
+                                                    <small style="color: var(--ion-text-color);" translate>
                                                         Edge.Index.EmergencyReserve.INFO_FOR_EMERGENCY_RESERVE_SLIDER
                                                     </small>
                                                 </ion-text>
@@ -514,7 +514,7 @@
                                                 <td style="width: 90%">
                                                     <ion-note class="ion-text-wrap ion-align-items-center">
                                                         <ion-text>
-                                                            <small translate>
+                                                            <small style="color: var(--ion-text-color);" translate>
                                                                 Edge.Index.EmergencyReserve.INFO_FOR_EMERGENCY_RESERVE_SLIDER
                                                             </small>
                                                         </ion-text>
@@ -746,7 +746,7 @@
                                         <td style="width: 90%">
                                             <ion-note class="ion-text-wrap ion-align-items-center">
                                                 <ion-text>
-                                                    <small translate>
+                                                    <small style="color: var(--ion-text-color);" translate>
                                                         Edge.Index.EmergencyReserve.INFO_FOR_EMERGENCY_RESERVE_SLIDER
                                                     </small>
                                                 </ion-text>
diff --git a/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html b/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html
index 352d15d1357..0235fb3e696 100644
--- a/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html
+++ b/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html
@@ -1,6 +1,7 @@
 <ion-card button (click)="presentModal()" *ngIf="component">
     <ion-item lines="full" color="light">
-        <ion-icon slot="start" size="large" color="primary" name="trending-down-outline"></ion-icon>
+        <ion-icon slot="start" size="large" color="normal" name="trending-down-outline"></ion-icon>
+
         <ion-label>{{ component.alias }}</ion-label>
     </ion-item>
     <ion-card-content class="underline" *ngIf="(edge.currentData | async)['channel'] as currentData">
diff --git a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html
index 0327fd96b05..6cc42a2c887 100644
--- a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html
+++ b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title>{{ component.alias }}</ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="modalCtrl.dismiss()">
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html b/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html
index fdef929c624..6064b6c3571 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html
+++ b/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html
@@ -1,21 +1,23 @@
-<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="LightGray"></svg:path>
-<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-warning)" stroke="LightGray"></svg:path>
+<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="var(--ion-color-medium-soft)"></svg:path>
+<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-warning)" stroke="var(--ion-color-warning)">
+</svg:path>
 <svg:g *ngIf="isEnabled && energyFlow">
     <svg:defs>
         <svg:linearGradient [attr.id]="sectionId" [attr.x1]="energyFlow.gradient.x1" [attr.y1]="energyFlow.gradient.y1"
             [attr.x2]="energyFlow.gradient.x2" [attr.y2]="energyFlow.gradient.y2">
-            <svg:stop offset="0%" stop-color="var(--ion-color-background)" />
+            <svg:stop offset="0%" stop-color="var(--ion-item-background)" />
             <svg:stop offset="100%" stop-color="var(--ion-color-warning)" />
         </svg:linearGradient>
     </svg:defs>
     <svg:polygon [attr.points]="energyFlow.points" attr.fill="{{ fillRef }}" />
     <svg:polygon [@Consumption]="stateName" [attr.points]="energyFlow.animationPoints"
-        style="fill:var(--ion-color-background)" />
+        style="fill: var(--ion-item-background)" />
 </svg:g>
 <svg:g *ngIf="isEnabled && squarePosition && square"
     attr.transform="translate({{squarePosition.x}},{{squarePosition.y}})">
     <svg:text [attr.x]="square.valueText.x" [attr.y]="square.valueText.y" [attr.text-anchor]="square.valueText.anchor"
-        font-family="sans-serif" font-size="square.valueText.fontsize" fill="grey">
+        font-family="sans-serif" font-size="square.valueText.fontsize" fill="var(--ion-text-color)">
+        <!-- Adjusting the color of the Text to be flexiable with Light and Dark mode -->
         <ng-container *ngIf="valueText; else no_text">{{valueText}}</ng-container>
         <ng-template #no_text>-</ng-template>
     </svg:text>
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html
index d35a089e698..3ca808fdf38 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html
+++ b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html
@@ -1,27 +1,27 @@
-<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="LightGray"></svg:path>
-<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-dark)" stroke="LightGray"></svg:path>
+<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="var(--ion-color-medium-soft)"></svg:path>
+<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-dark)" stroke="var(--ion-color-dark)"></svg:path>
 <svg:g *ngIf="isEnabled && energyFlow">
     <svg:defs>
         <svg:linearGradient [attr.id]="sectionId" [attr.x1]="energyFlow.gradient.x1" [attr.y1]="energyFlow.gradient.y1"
             [attr.x2]="energyFlow.gradient.x2" [attr.y2]="energyFlow.gradient.y2">
-            <svg:stop offset="0%" stop-color="var(--ion-color-background)" />
+            <svg:stop offset="0%" stop-color="var(--ion-item-background)" />
             <svg:stop offset="100%" stop-color="var(--ion-color-dark)" />
         </svg:linearGradient>
     </svg:defs>
     <svg:polygon [attr.points]="energyFlow.points" attr.fill="{{ fillRef }}" />
     <ng-container *ngIf="buyAnimationTrigger">
         <svg:polygon [@GridBuy]="stateNameBuy" [attr.points]="energyFlow.animationPoints"
-            style="fill:var(--ion-color-background)" />
+            style="fill: var(--ion-item-background)" />
     </ng-container>
     <ng-container *ngIf="sellAnimationTrigger">
         <svg:polygon [@GridSell]="stateNameSell" [attr.points]="energyFlow.animationPoints"
-            style="fill:var(--ion-color-background)" />
+            style="fill: var(--ion-item-background)" />
     </ng-container>
 </svg:g>
 <svg:g *ngIf="isEnabled && squarePosition && square"
     attr.transform="translate({{squarePosition.x}},{{squarePosition.y}})">
     <svg:text [attr.x]="square.valueText.x" [attr.y]="square.valueText.y" [attr.text-anchor]="square.valueText.anchor"
-        font-family="sans-serif" font-size="square.valueText.fontsize" fill="grey">
+        font-family="sans-serif" font-size="square.valueText.fontsize" fill="var(--ion-text-color)">
         <ng-container *ngIf="valueText; else no_text">{{valueText}}</ng-container>
         <ng-template #no_text>-</ng-template>
     </svg:text>
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts
index c0c61013161..baf47a15e73 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts
@@ -54,7 +54,7 @@ export class GridSectionComponent extends AbstractSection implements OnInit, OnD
         service: Service,
         unitpipe: UnitvaluePipe,
     ) {
-        super("General.grid", "left", "#1d1d1d", translate, service, "Grid");
+        super("General.grid", "left", "var(--ion-color-dark)", translate, service, "Grid");
         this.unitpipe = unitpipe;
     }
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/production.component.html b/ui/src/app/edge/live/energymonitor/chart/section/production.component.html
index 520a36472ff..7d63121b108 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/production.component.html
+++ b/ui/src/app/edge/live/energymonitor/chart/section/production.component.html
@@ -1,21 +1,22 @@
-<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="LightGray"></svg:path>
-<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-production)" stroke="LightGray"></svg:path>
+<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="var(--ion-color-medium-soft)"></svg:path>
+<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-production)"
+    stroke="var(--ion-color-production)"></svg:path>
 <svg:g *ngIf="isEnabled && energyFlow">
     <svg:defs>
         <svg:linearGradient [attr.id]="sectionId" [attr.x1]="energyFlow.gradient.x1" [attr.y1]="energyFlow.gradient.y1"
             [attr.x2]="energyFlow.gradient.x2" [attr.y2]="energyFlow.gradient.y2">
-            <svg:stop offset="0%" stop-color="var(--ion-color-background)" />
+            <svg:stop offset="0%" stop-color="var(--ion-item-background)" />
             <svg:stop offset="100%" stop-color="var(--ion-color-production)" />
         </svg:linearGradient>
     </svg:defs>
     <svg:polygon [attr.points]="energyFlow.points" attr.fill="{{ fillRef }}" />
     <svg:polygon [@Production]="stateName" [attr.points]="energyFlow.animationPoints"
-        style="fill:var(--ion-color-background)" />
+        style="fill: var(--ion-item-background)" />
 </svg:g>
 <svg:g *ngIf="isEnabled && squarePosition && square"
     attr.transform="translate({{squarePosition.x}},{{squarePosition.y}})">
     <svg:text [attr.x]="square.valueText.x" [attr.y]="square.valueText.y" [attr.text-anchor]="square.valueText.anchor"
-        font-family="sans-serif" font-size="square.valueText.fontsize" fill="grey">
+        font-family="sans-serif" font-size="square.valueText.fontsize" fill="var(--ion-text-color)">
         <ng-container *ngIf="valueText; else no_text">{{valueText}}</ng-container>
         <ng-template #no_text>-</ng-template>
     </svg:text>
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts
index a5efc3de02e..30b801b926a 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts
@@ -38,7 +38,7 @@ export class ProductionSectionComponent extends AbstractSection implements OnIni
         service: Service,
         unitpipe: UnitvaluePipe,
     ) {
-        super("General.production", "up", "#36aed1", translate, service, "Common_Production");
+        super("General.production", "up", "var(--ion-color-primary)", translate, service, "Common_Production");
         this.unitpipe = unitpipe;
     }
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html b/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html
index 266ac898342..50ad664b8d2 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html
+++ b/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html
@@ -1,27 +1,28 @@
-<svg:path [attr.d]="outlinePath" fill="#f4f4f4" stroke="LightGray"></svg:path>
-<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-success)" stroke="LightGray"></svg:path>
+<svg:path [attr.d]="outlinePath" fill="var(--ion-color-light)" stroke="var(--ion-color-medium-soft)"></svg:path>
+<svg:path *ngIf="isEnabled" [attr.d]="valuePath" fill="var(--ion-color-success)" stroke="var(--ion-color-success)">
+</svg:path>
 <svg:g *ngIf="isEnabled && energyFlow">
     <svg:defs>
         <svg:linearGradient [attr.id]="sectionId" [attr.x1]="energyFlow.gradient.x1" [attr.y1]="energyFlow.gradient.y1"
             [attr.x2]="energyFlow.gradient.x2" [attr.y2]="energyFlow.gradient.y2">
-            <svg:stop offset="0%" stop-color="var(--ion-color-background)" />
+            <svg:stop offset="0%" stop-color="var(--ion-item-background)" />
             <svg:stop offset="100%" stop-color="var(--ion-color-success)" />
         </svg:linearGradient>
     </svg:defs>
     <svg:polygon [attr.points]="energyFlow.points" attr.fill="{{ fillRef }}" />
     <ng-container *ngIf="chargeAnimationTrigger">
         <svg:polygon [@Charge]="stateNameCharge" [attr.points]="energyFlow.animationPoints"
-            style="fill:var(--ion-color-background)" />
+            style="fill: var(--ion-item-background)" />
     </ng-container>
     <ng-container *ngIf="dischargeAnimationTrigger">
         <svg:polygon [@Discharge]="stateNameDischarge" [attr.points]="energyFlow.animationPoints"
-            style="fill:var(--ion-color-background)" />
+            style="fill: var(--ion-item-background)" />
     </ng-container>
 </svg:g>
 <svg:g *ngIf="isEnabled && squarePosition && square"
     attr.transform="translate({{squarePosition.x}},{{squarePosition.y}})">
     <svg:text [attr.x]="square.valueText.x" [attr.y]="square.valueText.y" [attr.text-anchor]="square.valueText.anchor"
-        font-family="sans-serif" font-size="square.valueText.fontsize" fill="grey">
+        font-family="sans-serif" font-size="square.valueText.fontsize" fill="var(--ion-text-color)">
         <ng-container *ngIf="valueText; else no_text">{{valueText}}</ng-container>
         <ng-template #no_text>-</ng-template>
     </svg:text>
diff --git a/ui/src/app/edge/live/energymonitor/energymonitor.component.html b/ui/src/app/edge/live/energymonitor/energymonitor.component.html
index 779a8c37cc4..5772890908b 100644
--- a/ui/src/app/edge/live/energymonitor/energymonitor.component.html
+++ b/ui/src/app/edge/live/energymonitor/energymonitor.component.html
@@ -1,6 +1,6 @@
 <ion-card *ngIf="edge?.currentData | async as currentData">
-  <ion-item lines="full" color="light">
-    <ion-icon size="large" slot="start" name="laptop-outline" color="primary"></ion-icon>
+  <ion-item lines="full" style="--background: var(--ion-background-color-card-header)">
+    <ion-icon size="large" slot="start" name="laptop-outline" color="normal"></ion-icon>
     <ion-label translate>
       Edge.Index.Energymonitor.title
     </ion-label>
diff --git a/ui/src/app/edge/live/live.component.html b/ui/src/app/edge/live/live.component.html
index ceb4687a7b4..9749758d16d 100644
--- a/ui/src/app/edge/live/live.component.html
+++ b/ui/src/app/edge/live/live.component.html
@@ -1,4 +1,7 @@
 <oe-refresh-view [refresh]="handleRefresh" [show]="showRefreshDragDown">
+  <ion-refresher mode="ios" slot="fixed" (ionRefresh)="handleRefresh($event)">
+    <ion-refresher-content refreshingSpinner="crescent"></ion-refresher-content>
+  </ion-refresher>
   <ion-grid *ngIf="edge && edge.isOnline">
     <ion-row class="ion-justify-content-center" *ngIf="widgets">
       <!-- Energymonitor -->
@@ -156,7 +159,7 @@
   <ion-grid *ngIf="edge && !edge.isOnline">
     <ion-row class="ion-justify-content-center">
       <ion-col size-xl="8" size-lg="10" size-md="11" size-sm="12">
-        <offline></offline>
+        <oe-offline></oe-offline>
       </ion-col>
     </ion-row>
   </ion-grid>
diff --git a/ui/src/app/edge/live/live.component.ts b/ui/src/app/edge/live/live.component.ts
index c91ca7c1206..81862c57d49 100644
--- a/ui/src/app/edge/live/live.component.ts
+++ b/ui/src/app/edge/live/live.component.ts
@@ -57,7 +57,7 @@ export class LiveComponent implements OnInit, OnDestroy {
         return;
       }
 
-      const lastUpdate: Date | null = this.dataService.timestamp();
+      const lastUpdate: Date | null = this.dataService.lastUpdated();
       if (lastUpdate == null) {
         this.showRefreshDragDown = true;
         return;
diff --git a/ui/src/app/edge/live/livedataservice.ts b/ui/src/app/edge/live/livedataservice.ts
index 54f1171150b..05ce9562a68 100644
--- a/ui/src/app/edge/live/livedataservice.ts
+++ b/ui/src/app/edge/live/livedataservice.ts
@@ -18,6 +18,11 @@ export class LiveDataService extends DataService implements OnDestroy {
         @Inject(Service) protected service: Service,
     ) {
         super();
+
+        this.service.getCurrentEdge().then((edge) => {
+            edge.currentData.pipe(takeUntil(this.stopOnDestroy))
+                .subscribe(() => this.lastUpdated.set(new Date()));
+        });
     }
 
     public getValues(channelAddresses: ChannelAddress[], edge: Edge, componentId: string) {
@@ -41,7 +46,7 @@ export class LiveDataService extends DataService implements OnDestroy {
             }
 
             this.currentValue.next({ allComponents: allComponents });
-            this.timestamp.set(new Date());
+            this.lastUpdated.set(new Date());
         });
     }
 
@@ -52,7 +57,7 @@ export class LiveDataService extends DataService implements OnDestroy {
     }
 
     public unsubscribeFromChannels(channels: ChannelAddress[]) {
-        this.timestamp.set(null);
+        this.lastUpdated.set(null);
         this.edge.unsubscribeFromChannels(this.websocket, channels);
     }
 
diff --git a/ui/src/app/edge/settings/channels/channels.component.html b/ui/src/app/edge/settings/channels/channels.component.html
index c0931184525..79dea6bb15f 100644
--- a/ui/src/app/edge/settings/channels/channels.component.html
+++ b/ui/src/app/edge/settings/channels/channels.component.html
@@ -13,7 +13,8 @@
 
             <ion-list>
               <ion-item lines="none">
-                <ion-select style="white-space: initial;width: 100%;" #selectedComponentId interface="alert"
+                <ion-select [interfaceOptions]="{ cssClass: 'custom-theme-text custom-ion-popover' }"
+                  style="white-space: initial;width: 100%;" #selectedComponentId interface="alert"
                   [placeholder]="'CHANNELS.Component'| translate" (ionChange)="onSelectedComponentChanged($event)">
                   <ion-select-option style=" white-space: normal !important;"
                     *ngFor="let entry of (config.components | keys)" [value]="entry.key">
@@ -21,7 +22,8 @@
                 </ion-select>
               </ion-item>
               <ion-item lines="none">
-                <ngx-spinner [name]="selectedComponentId.value"></ngx-spinner>
+                <ngx-spinner [name]="selectedComponentId.value"
+                  [interfaceOptions]="{ cssClass: 'custom-theme-text custom-ion-popover' }"></ngx-spinner>
                 <ion-select style="white-space: initial;width: 100%;" #selectedChannelId interface="alert"
                   [disabled]="!selectedComponentId?.value" [placeholder]="'CHANNELS.CHANNEL'| translate">
                   <ng-container *ngIf="selectedComponentId?.value">
@@ -153,12 +155,11 @@
                     </ion-item>
                   </ion-card-content>
                 </ng-container>
-
                 <ion-item lines="none">
                   <ion-label color="primary" translate>CHANNELS.MORE_CHANNELS</ion-label>
                   <ion-select interface="alert" #selectedChannelId>
                     <ng-container *ngIf="component.key">
-                      <ion-select-option
+                      <ion-select-option color="danger"
                         *ngFor="let entry of channelsPerComponent.get(component.key).channels | keyvalue"
                         [value]="entry.key">
                         {{ entry.key }}
diff --git a/ui/src/app/edge/settings/component/install/index.component.html b/ui/src/app/edge/settings/component/install/index.component.html
index bf72bc8faba..7724f09a979 100644
--- a/ui/src/app/edge/settings/component/install/index.component.html
+++ b/ui/src/app/edge/settings/component/install/index.component.html
@@ -1,5 +1,6 @@
 <ion-content>
-  <ion-searchbar (ionChange)="updateFilter($event.detail.value)"></ion-searchbar>
+  <ion-searchbar style="--background: var(--ion-color-searchbar-background); color:var(--ion-color-searchbar-text);"
+    (ionChange)="updateFilter($event.detail.value)"></ion-searchbar>
   <ion-list>
     <ng-container *ngFor="let entry of list">
       <ion-item-group>
@@ -17,7 +18,7 @@
             <ion-text color="primary">
               <h3>{{ item.name }}</h3>
             </ion-text>
-            <small>{{ item.description }}</small>
+            <small class="custom-channels-text">{{ item.description }}</small>
           </ion-label>
         </ion-item>
       </ng-container>
diff --git a/ui/src/app/edge/settings/component/install/install.component.html b/ui/src/app/edge/settings/component/install/install.component.html
index 39bd2dfbb1a..1c7bd5689a3 100644
--- a/ui/src/app/edge/settings/component/install/install.component.html
+++ b/ui/src/app/edge/settings/component/install/install.component.html
@@ -6,8 +6,10 @@
           <ion-item>
             <ion-icon slot="start" name="stats-outline" color="primary"></ion-icon>
             <ion-label>
-              <ion-card-title class="ion-text-wrap">{{ factory.name }}</ion-card-title>
-              <ion-card-subtitle class="ion-text-wrap">{{ factory.description }}</ion-card-subtitle>
+              <ion-card-title style="color: var(--ion-text-color-reverse)" class="ion-text-wrap">{{ factory.name }}
+              </ion-card-title>
+              <ion-card-subtitle class="ion-text-wrap" style="color: var(--ion-text-color-shade);">
+                {{ factory.description }}</ion-card-subtitle>
             </ion-label>
           </ion-item>
           <ion-card-content>
diff --git a/ui/src/app/edge/settings/component/update/index.component.html b/ui/src/app/edge/settings/component/update/index.component.html
index 2cd3b5e7223..76f55ccd6e6 100644
--- a/ui/src/app/edge/settings/component/update/index.component.html
+++ b/ui/src/app/edge/settings/component/update/index.component.html
@@ -1,5 +1,6 @@
 <ion-content>
-  <ion-searchbar (ionChange)="updateFilter($event.detail.value)"></ion-searchbar>
+  <ion-searchbar style="--background: var(--ion-color-searchbar-background); color:var(--ion-color-searchbar-text);"
+    (ionChange)="updateFilter($event.detail.value)"></ion-searchbar>
 
   <ion-list>
     <ng-container *ngFor="let entry of list">
@@ -20,7 +21,7 @@ <h3>{{ item.alias }}
             </h3>
           </ion-text>
           <ng-container *ngIf="config.factories[item.factoryId] as factory">
-            <p>{{ factory.name }} <small>({{ factory.description }})</small></p>
+            <p class="custom-channels-text">{{ factory.name }} <small>({{ factory.description }})</small></p>
           </ng-container>
         </ion-label>
       </ion-item>
diff --git a/ui/src/app/edge/settings/component/update/update.component.html b/ui/src/app/edge/settings/component/update/update.component.html
index 793ad16cfed..acae7bcefff 100644
--- a/ui/src/app/edge/settings/component/update/update.component.html
+++ b/ui/src/app/edge/settings/component/update/update.component.html
@@ -1,14 +1,16 @@
 <ion-content>
   <ion-grid *ngIf="factory && form">
     <ion-row class="ion-justify-content-center">
-
       <ion-col size="12" size-xl="8">
         <ion-card>
           <ion-item>
             <ion-icon size="large" slot="start" [name]="componentIcon" color="primary"></ion-icon>
             <ion-label>
-              <ion-card-title class="ion-text-wrap">{{ factory.name }}</ion-card-title>
-              <ion-card-subtitle class="ion-text-wrap">{{ factory.description }}</ion-card-subtitle>
+              <ion-card-title class="ion-text-wrap" style="color: var(--ion-text-color-reverse)">{{ factory.name }}
+              </ion-card-title>
+              <ion-card-subtitle class="ion-text-wrap" style="color: var(--ion-text-color-shade);">{{
+                factory.description
+                }}</ion-card-subtitle>
             </ion-label>
           </ion-item>
           <ion-card-content>
diff --git a/ui/src/app/edge/settings/energy-journey/shared/components/constant-line.scss b/ui/src/app/edge/settings/energy-journey/shared/components/constant-line.scss
new file mode 100644
index 00000000000..7abe6d79a1e
--- /dev/null
+++ b/ui/src/app/edge/settings/energy-journey/shared/components/constant-line.scss
@@ -0,0 +1,18 @@
+@import "variables";
+@import "src/global.scss";
+
+
+:host {
+
+    div {
+        color: var(--ion-color-text);
+    }
+
+    div.constant {
+        background-color: var(--ion-color-medium-tint);
+    }
+
+    div.editable {
+        background-color: var(--ion-color-primary-tint);
+    }
+}
diff --git a/ui/src/app/edge/settings/profile/aliasupdate.component.html b/ui/src/app/edge/settings/profile/aliasupdate.component.html
index 47efa868cca..90e9b2f6369 100644
--- a/ui/src/app/edge/settings/profile/aliasupdate.component.html
+++ b/ui/src/app/edge/settings/profile/aliasupdate.component.html
@@ -6,7 +6,7 @@
                     <ion-item>
                         <ion-icon size="large" slot="start" [name]="componentIcon" color="primary"></ion-icon>
                         <ion-label>
-                            <ion-card-title class="ion-text-wrap">{{ factory.name }}</ion-card-title>
+                            <ion-card-title class="ion-text-wrap" color="primary">{{ factory.name }}</ion-card-title>
                             <ion-card-subtitle class="ion-text-wrap">{{ factory.description }}</ion-card-subtitle>
                         </ion-label>
                     </ion-item>
diff --git a/ui/src/app/edge/settings/profile/profile.component.html b/ui/src/app/edge/settings/profile/profile.component.html
index 2e9b3884104..9cde0096885 100644
--- a/ui/src/app/edge/settings/profile/profile.component.html
+++ b/ui/src/app/edge/settings/profile/profile.component.html
@@ -24,8 +24,9 @@
                 {{ edge.producttype }}
               </ion-item>
               <ion-item>
-                <ion-label style="white-space: initial;">{{ environment.edgeShortName }} Version</ion-label>
-                <a style="white-space: initial; display: inline-block; max-width: 50%; text-align: right;"
+                <ion-label style="white-space: initial;">{{ environment.edgeShortName }}
+                  Version</ion-label>
+                <a class="ion-link" style="white-space: initial; display: inline-block; max-width: 50%; text-align: right;"
                   routerLinkActive="active" routerLink="/changelog">{{ edge.version |
                   version:edge.role }}</a>
               </ion-item>
@@ -58,7 +59,7 @@
               <ng-container *ngFor="let category of components">
                 <ion-item-group>
                   <ion-item lines="inset">
-                    <ion-icon name="{{ category.category.icon }}"></ion-icon>
+                    <ion-icon class="normal-icon" name="{{ category.category.icon }}"></ion-icon>
                     <ion-label class="ion-padding-start">
                       {{ category.category.title }}
                     </ion-label>
diff --git a/ui/src/app/edge/settings/settings.component.html b/ui/src/app/edge/settings/settings.component.html
index 4c22db2268f..5ee28695ffa 100644
--- a/ui/src/app/edge/settings/settings.component.html
+++ b/ui/src/app/edge/settings/settings.component.html
@@ -98,7 +98,7 @@
       <ion-col size="12" size-sm="4">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="toggle-outline"></ion-icon>
+            <ion-icon slot="start" size="large" class="normal-icon" name="toggle-outline"></ion-icon>
             <ion-label translate>Edge.Config.Index.adjustComponents</ion-label>
           </ion-item>
           <ion-card-content>
@@ -113,7 +113,7 @@
       <ion-col size="12" size-sm="4">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="add-outline"></ion-icon>
+            <ion-icon slot="start" size="large" class="normal-icon" name="add-outline"></ion-icon>
             <ion-label translate>Edge.Config.Index.addComponents</ion-label>
           </ion-item>
           <ion-card-content>
@@ -128,7 +128,7 @@
       <ion-col size="12" size-sm="4">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="eye-outline"></ion-icon>
+            <ion-icon slot="start" size="large" class="normal-icon" name="eye-outline"></ion-icon>
             <!-- TODO translate -->
             <ion-label>Channels</ion-label>
           </ion-item>
@@ -143,40 +143,40 @@
       <ion-col size="12" size-sm="4">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="construct-outline"></ion-icon>
-            <ion-label>Power Assistant</ion-label>
+            <ion-icon slot="start" size="large" color="medium" name="play-outline"></ion-icon>
+            <ion-label translate>Edge.Config.Index.systemExecute</ion-label>
           </ion-item>
           <ion-card-content>
-            <ion-button class="ion-float-right" color="light"
-              routerLink="/device/{{ edge.id }}/settings/powerAssistant">
+            <ion-button class="ion-float-right" color="light" routerLink="/device/{{ edge.id }}/settings/systemexecute">
               <ion-icon slot="icon-only" name="arrow-forward-outline"></ion-icon>
             </ion-button>
           </ion-card-content>
         </ion-card>
       </ion-col>
 
-      <ion-col size="12" size-sm="4" *ngIf="canSeeJsonrpcTest">
+      <ion-col size="12" size-sm="4">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="eye-outline"></ion-icon>
-            <ion-label>Jsonrpc test</ion-label>
+            <ion-icon slot="start" size="large" class="normal-icon" name="construct-outline"></ion-icon>
+            <ion-label>Power Assistant</ion-label>
           </ion-item>
           <ion-card-content>
-            <ion-button class="ion-float-right" color="light" routerLink="/device/{{ edge.id }}/settings/jsonrpctest">
+            <ion-button class="ion-float-right" color="light"
+              routerLink="/device/{{ edge.id }}/settings/powerAssistant">
               <ion-icon slot="icon-only" name="arrow-forward-outline"></ion-icon>
             </ion-button>
           </ion-card-content>
         </ion-card>
       </ion-col>
 
-      <ion-col size="12" size-sm="4">
+      <ion-col size="12" size-sm="4" *ngIf="canSeeJsonrpcTest">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="play-outline"></ion-icon>
-            <ion-label translate>Edge.Config.Index.systemExecute</ion-label>
+            <ion-icon slot="start" size="large" class="normal-icon" name="eye-outline"></ion-icon>
+            <ion-label>Jsonrpc test</ion-label>
           </ion-item>
           <ion-card-content>
-            <ion-button class="ion-float-right" color="light" routerLink="/device/{{ edge.id }}/settings/systemexecute">
+            <ion-button class="ion-float-right" color="light" routerLink="/device/{{ edge.id }}/settings/jsonrpctest">
               <ion-icon slot="icon-only" name="arrow-forward-outline"></ion-icon>
             </ion-button>
           </ion-card-content>
@@ -185,4 +185,4 @@
 
     </ion-row>
   </ion-grid>
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/ui/src/app/edge/settings/system/oe-system-update.component.html b/ui/src/app/edge/settings/system/oe-system-update.component.html
index a4d54cc1894..64311cb3735 100644
--- a/ui/src/app/edge/settings/system/oe-system-update.component.html
+++ b/ui/src/app/edge/settings/system/oe-system-update.component.html
@@ -4,19 +4,19 @@
     <ng-container *ngIf="!edge.isOnline; else edgeIsOnline">
         <!-- Edge is Restarting after Update -->
         <ng-container *ngIf="executeUpdate.isEdgeRestarting; else edgeIsOffline">
-            <ion-item lines="none">
+            <ion-item lines="none" color="light">
                 <ion-label>{{ 'SETTINGS.SYSTEM_UPDATE.EDGE_RESTARTING' | translate:
                     { edge: environment.edgeShortName } }}<br />
                     {{ 'SETTINGS.SYSTEM_UPDATE.UPDATE_TIME'| translate}}</ion-label>
             </ion-item>
-            <ion-item lines="none">
+            <ion-item lines="none" color="light">
                 <ion-progress-bar type="indeterminate" style="margin-top: 1%"></ion-progress-bar>
             </ion-item>
         </ng-container>
 
         <!-- Edge is offline -->
         <ng-template #edgeIsOffline>
-            <ion-item lines="none">
+            <ion-item lines="none" color="light">
                 <ion-label>{{ 'SETTINGS.SYSTEM_UPDATE.OFFLINE' | translate:
                     { edgeShortName: environment.edgeShortName } }}
                 </ion-label>
diff --git a/ui/src/app/edge/settings/systemlog/systemlog.component.html b/ui/src/app/edge/settings/systemlog/systemlog.component.html
index 9acbac2f1da..a56447228e3 100644
--- a/ui/src/app/edge/settings/systemlog/systemlog.component.html
+++ b/ui/src/app/edge/settings/systemlog/systemlog.component.html
@@ -45,7 +45,9 @@
             <ion-grid class="ion-no-padding">
               <ion-row class="ion-justify-content-center">
                 <ion-col>
-                  <ion-searchbar [(ngModel)]="query" (ionChange)="searchOnChange()">
+                  <ion-searchbar
+                    style="--background: var(--ion-color-searchbar-background); color:var(--ion-color-searchbar-text);"
+                    [(ngModel)]="query" (ionChange)="searchOnChange()">
                   </ion-searchbar>
                 </ion-col>
               </ion-row>
diff --git a/ui/src/app/index/login.component.ts b/ui/src/app/index/login.component.ts
index 63b7077c7e7..fee74455a1b 100644
--- a/ui/src/app/index/login.component.ts
+++ b/ui/src/app/index/login.component.ts
@@ -1,9 +1,9 @@
 // @ts-strict-ignore
-import { AfterContentChecked, ChangeDetectorRef, Component, OnDestroy, OnInit } from "@angular/core";
+import { AfterContentChecked, ChangeDetectorRef, Component, OnDestroy, OnInit, effect } from "@angular/core";
 import { FormGroup } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Capacitor } from "@capacitor/core";
-import { ViewWillEnter } from "@ionic/angular";
+import { ModalController, PopoverController, ViewWillEnter } from "@ionic/angular";
 import { Subject } from "rxjs";
 import { environment } from "src/environments";
 
@@ -11,12 +11,14 @@ import { AppService } from "../app.service";
 import { AuthenticateWithPasswordRequest } from "../shared/jsonrpc/request/authenticateWithPasswordRequest";
 import { States } from "../shared/ngrx-store/states";
 import { Edge, Service, Utils, Websocket } from "../shared/shared";
+import { UserComponent } from "../user/user.component";
 
 @Component({
   selector: "login",
   templateUrl: "./login.component.html",
 })
 export class LoginComponent implements ViewWillEnter, AfterContentChecked, OnDestroy, OnInit {
+  public currentThemeMode: string;
   public environment = environment;
   public form: FormGroup;
   protected formIsDisabled: boolean = false;
@@ -33,7 +35,15 @@ export class LoginComponent implements ViewWillEnter, AfterContentChecked, OnDes
     private router: Router,
     private route: ActivatedRoute,
     private cdref: ChangeDetectorRef,
-  ) { }
+    protected popoverctrl: PopoverController,
+    protected modalctrl: ModalController,
+  ) {
+    effect(() => {
+      const user = this.service.currentUser();
+      this.currentThemeMode = UserComponent.getPreferedColorSchemeFromTheme(UserComponent.getCurrentTheme(user));
+      UserComponent.applyUserSettings(user);
+    });
+  }
 
   /**
    * Preprocesses the credentials
diff --git a/ui/src/app/index/overview/overview.component.html b/ui/src/app/index/overview/overview.component.html
index e4c411d6833..7c57bd8a86c 100644
--- a/ui/src/app/index/overview/overview.component.html
+++ b/ui/src/app/index/overview/overview.component.html
@@ -40,7 +40,9 @@
                         <ion-grid>
                             <ion-row class="ion-justify-content-center">
                                 <ion-col>
-                                    <ion-searchbar [(ngModel)]="query" (ionChange)="searchOnChange()">
+                                    <ion-searchbar
+                                        style="--background: var(--ion-color-searchbar-background); color:var(--ion-color-searchbar-text);"
+                                        [(ngModel)]="query" (ionChange)="searchOnChange()">
                                     </ion-searchbar>
                                 </ion-col>
                             </ion-row>
@@ -72,13 +74,13 @@ <h2 class="ion-text-wrap">{{ edge.comment }}</h2>
                                                 </ion-label>
                                                 <ion-label>
                                                     <ng-container *ngIf="environment.backend === 'OpenEMS Backend'">
-                                                        <p>ID: {{ edge.id }}</p>
-                                                        <p class="ion-text-wrap">
+                                                        <p class="custom-theme-text">ID: {{ edge.id }}</p>
+                                                        <p class="ion-text-wrap" class="custom-theme-text">
                                                             <ion-text translate>Index.TYPE</ion-text>: {{
                                                             edge.producttype }}
                                                         </p>
                                                     </ng-container>
-                                                    <p class="ion-text-wrap">
+                                                    <p class="ion-text-wrap" class="custom-theme-text">
                                                         <ion-text translate>Index.LOGGED_IN_AS</ion-text>: {{
                                                         edge.getRoleString() }}
                                                     </p>
diff --git a/ui/src/app/index/shared/loading-screen.html b/ui/src/app/index/shared/loading-screen.html
index 481d1773885..61216a8b4f7 100644
--- a/ui/src/app/index/shared/loading-screen.html
+++ b/ui/src/app/index/shared/loading-screen.html
@@ -17,7 +17,11 @@
             <ion-col size="12" size-md="6" size-lg="4">
               <ion-card>
                 <ion-card-content>
-                  <ng-container *ngTemplateOutlet="content"></ng-container>
+                  @if (environment.backend === 'OpenEMS Backend') {
+                  <ng-container *ngTemplateOutlet="connectionToBackendFailed"></ng-container>
+                  }@else {
+                  <ng-container *ngTemplateOutlet="connectionToEdgeFailed"></ng-container>
+                  }
                 </ion-card-content>
               </ion-card>
             </ion-col>
@@ -30,7 +34,7 @@
 </ion-content>
 
 
-<ng-template #content>
+<ng-template #connectionToBackendFailed>
   <ion-row class="ion-justify-content-center ion-align-items-center ion-no-padding">
     <ion-col
       style="display: flex; align-items: center; justify-content: center;border: 2px solid var(--ion-color-primary)">
@@ -61,3 +65,36 @@
   </ion-row>
 
 </ng-template>
+
+<ng-template #connectionToEdgeFailed>
+  <ion-row class="ion-justify-content-center ion-align-items-center">
+    <ion-col
+      style="display: flex; align-items: center; justify-content: center;border: 2px solid var(--ion-color-primary)">
+      <ion-icon name="file-tray-full-outline" color="primary" size="large" style="padding-right: 5%;"></ion-icon>
+      <ion-label color="primary" class="ion-text-wrap" style="font-size: larger;" translate>
+        OFFLINE.EDGE.LOCAL_ACCESS_CURRENTLY_NOT_POSSIBLE
+      </ion-label>
+    </ion-col>
+  </ion-row>
+
+  <ion-row class="ion-justify-content-center ion-align-items-center ion-padding-top">
+    <ion-col size="12">
+      <ion-item lines="none" class="ion-text-center">
+        <ion-label class="ion-text-wrap ion-font-size-smaller"
+          [translateParams]="{edgeShortName: environment.edgeShortName}" translate>
+          OFFLINE.EDGE.DESCRIPTION
+        </ion-label>
+      </ion-item>
+    </ion-col>
+  </ion-row>
+
+  <ion-row class="ion-justify-content-center ion-align-items-center">
+    <ion-col size="12">
+      <ion-item lines="none" class="ion-text-center">
+        <ion-label class="ion-text-wrap" style="font-weight: bolder;" translate>
+          LOADING_SCREEN.SERVER_NOT_ACCESSIBLE_TRY_RELOADING
+        </ion-label>
+      </ion-item>
+    </ion-col>
+  </ion-row>
+</ng-template>
diff --git a/ui/src/app/shared/components/chart/abstracthistorychart.ts b/ui/src/app/shared/components/chart/abstracthistorychart.ts
index f4f2135c42c..2e16ca13128 100644
--- a/ui/src/app/shared/components/chart/abstracthistorychart.ts
+++ b/ui/src/app/shared/components/chart/abstracthistorychart.ts
@@ -36,7 +36,7 @@ Chart.Chart.register(annotationPlugin);
 @Directive()
 export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
 
-  protected static readonly phaseColors: string[] = ["rgb(255,127,80)", "rgb(0,0,255)", "rgb(128,128,0)"];
+  protected static readonly phaseColors: string[] = ["rgb(255,127,80)", "rgb(91, 92, 214)", "rgb(128,128,0)"];
 
   /** Title for Chart, diplayed above the Chart */
   @Input() public chartTitle: string = "";
@@ -212,7 +212,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
    */
   public static getColors(color: string, chartType: "line" | "bar"): { backgroundColor: string, borderColor: string } {
     return {
-      backgroundColor: "rgba(" + (chartType == "bar" ? color.split("(").pop().split(")")[0] + ",0.4)" : color.split("(").pop().split(")")[0] + ",0.05)"),
+      backgroundColor: "rgba(" + (chartType == "bar" ? color.split("(").pop().split(")")[0] + ",0.7)" : color.split("(").pop().split(")")[0] + ",0.05)"),
       borderColor: "rgba(" + color.split("(").pop().split(")")[0] + ",1)",
     };
   }
@@ -399,13 +399,22 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
     };
 
     options.plugins.tooltip.callbacks.labelColor = (item: Chart.TooltipItem<any>) => {
+      let backgroundColor = item.dataset.backgroundColor;
+
+      if (Array.isArray(backgroundColor)) {
+        backgroundColor = backgroundColor[0];
+      }
+
+      if (!backgroundColor) {
+        backgroundColor = item.dataset.borderColor || "rgba(0, 0, 0, 0.5)";
+      }
+
       return {
-        borderColor: ColorUtils.changeOpacityFromRGBA(item.dataset.borderColor, 1),
-        backgroundColor: item.dataset.backgroundColor,
+        borderColor: ColorUtils.changeOpacityFromRGBA(backgroundColor, 1),
+        backgroundColor: ColorUtils.changeOpacityFromRGBA(backgroundColor, 1),
       };
     };
 
-
     options.plugins.legend.labels.generateLabels = function (chart: Chart.Chart) {
 
       const chartLegendLabelItems: Chart.LegendItem[] = [];
@@ -509,6 +518,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
     options.scales.x.ticks["source"] = "auto";
     options.scales.x.ticks.maxTicksLimit = 31;
     options.scales.x["bounds"] = "ticks";
+    options.scales.x.ticks.color = getComputedStyle(document.documentElement).getPropertyValue("--ion-color-chart-xAxis-ticks");
     options = AbstractHistoryChart.getExternalPluginFeatures(displayValues, options, chartType);
 
     return options;
diff --git a/ui/src/app/shared/components/chart/chart.constants.spec.ts b/ui/src/app/shared/components/chart/chart.constants.spec.ts
index c107bc89f6c..3687e1d71fb 100644
--- a/ui/src/app/shared/components/chart/chart.constants.spec.ts
+++ b/ui/src/app/shared/components/chart/chart.constants.spec.ts
@@ -27,7 +27,7 @@ describe("Chart constants", () => {
     ];
 
     expect(ChartConstants.getScaleOptions([], yAxis, "line")).toEqual({ min: null, max: null, stepSize: null });
-    expect(ChartConstants.getScaleOptions(datasets, yAxis, "line")).toEqual({ min: 62, max: 1892, stepSize: 366 });
+    expect(ChartConstants.getScaleOptions(datasets, yAxis, "line")).toEqual({ min: 0, max: 1892, stepSize: 378.4 });
     expect(ChartConstants.getScaleOptions(null, yAxis, "line")).toEqual({ min: null, max: null, stepSize: null });
     expect(ChartConstants.getScaleOptions(null, null, "line")).toEqual({ min: null, max: null, stepSize: null });
   });
diff --git a/ui/src/app/shared/components/chart/chart.constants.ts b/ui/src/app/shared/components/chart/chart.constants.ts
index d4f111bb241..6986e0a6edd 100644
--- a/ui/src/app/shared/components/chart/chart.constants.ts
+++ b/ui/src/app/shared/components/chart/chart.constants.ts
@@ -10,13 +10,13 @@ import { ArrayUtils } from "../../utils/array/array.utils";
 import { AssertionUtils } from "../../utils/assertions/assertions-utils";
 import { AbstractHistoryChart } from "./abstracthistorychart";
 
-export class ChartConstants {
-  public static readonly NUMBER_OF_Y_AXIS_TICKS: number = 7;
-  public static readonly MAX_LENGTH_OF_Y_AXIS_TITLE: number = 6;
-  public static readonly EMPTY_DATASETS: ChartDataset[] = [];
-  public static readonly REQUEST_TIMEOUT = 500;
+export namespace ChartConstants {
+  export const NUMBER_OF_Y_AXIS_TICKS: number = 7;
+  export const MAX_LENGTH_OF_Y_AXIS_TITLE: number = 6;
+  export const EMPTY_DATASETS: ChartDataset[] = [];
+  export const REQUEST_TIMEOUT = 500;
 
-  public static Plugins = class {
+  export class Plugins {
 
     public static readonly DEFAULT_EMPTY_SCREEN: (text: string) => ChartComponentLike = (text) => ({
       id: "empty_chart",
@@ -43,6 +43,7 @@ export class ChartConstants {
      */
     public static readonly BAR_CHART_DATALABELS = (unit: string, disable: boolean): any => ({
       ...ChartDataLabels,
+      color: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-text"),
       formatter: (value, ctx) => {
         const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
         return formatNumber(value, locale, "1.0-0") + "\xa0" + unit;
@@ -53,15 +54,26 @@ export class ChartConstants {
       plugin: ChartDataLabels,
       display: disable,
     });
-  };
+  }
 
-  public static Colors = class {
-    public static RED: string = new RGBColor(200, 0, 0).toString();
-  };
+  export namespace Colors {
+    export const BLUE: string = new RGBColor(54, 174, 209).toString();
+    export const RED: string = new RGBColor(255, 98, 63).toString();
+    export const GREEN: string = new RGBColor(14, 190, 84).toString();
+    export const ORANGE: string = new RGBColor(234, 147, 45).toString();
+    export const PURPLE: string = new RGBColor(91, 92, 214).toString();
+    export const YELLOW: string = new RGBColor(255, 206, 0).toString();
+    export const BLUE_GREY: string = new RGBColor(77, 106, 130).toString();
+    export const GREY: string = new RGBColor(189, 189, 189).toString();
+
+    export const SHADES_OF_RED: string[] = [RED, "rgb(204,78,50)", "rgb(153,59,38)", "rgb(102,39,25)", "rgb(51,20,13)"];
+    export const SHADES_OF_GREEN: string[] = [GREEN, "rgb(11,152,67)", "rgb(8,114,50)", "rgb(6,76,34)", "rgb(3,38,17)"];
+    export const SHADES_OF_YELLOW: string[] = [YELLOW, "rgb(204,165,0)", "rgb(153,124,0)", "rgb(102,82,0)", "rgb(255,221,77)"];
+  }
 
-  public static readonly NumberFormat = class {
+  export class NumberFormat {
     public static NO_DECIMALS: string = "1.0-0";
-  };
+  }
 
   /**
    * Default yScale CartesianScaleTypeRegistry.linear
@@ -72,12 +84,13 @@ export class ChartConstants {
    * @param datasets the chart datasets
    * @returns scale options
    */
-  public static DEFAULT_Y_SCALE_OPTIONS = (element: HistoryUtils.yAxes, translate: TranslateService, chartType: "line" | "bar", datasets: ChartDataset[], showYAxisTitle?: boolean) => {
+  export const DEFAULT_Y_SCALE_OPTIONS = (element: HistoryUtils.yAxes, translate: TranslateService, chartType: "line" | "bar", datasets: ChartDataset[], showYAxisTitle?: boolean) => {
     const beginAtZero: boolean = ChartConstants.isDataSeriesPositive(datasets);
-    const scaleOptions: ReturnType<typeof this.getScaleOptions> = this.getScaleOptions(datasets, element, chartType);
+    const scaleOptions: ReturnType<typeof getScaleOptions> = getScaleOptions(datasets, element, chartType);
 
     return {
       title: {
+        color: getComputedStyle(document.documentElement).getPropertyValue("--ion-color-chart-primary"),
         text: element.customTitle ?? AbstractHistoryChart.getYAxisType(element.unit, translate, chartType, element.customTitle),
         display: false,
         padding: 5,
@@ -117,7 +130,7 @@ export class ChartConstants {
    * @param yAxis the yAxis
    * @returns min, max and stepsize for datasets belonging to this yAxis
    */
-  public static getScaleOptions(datasets: ChartDataset[], yAxis: HistoryUtils.yAxes, chartType: "line" | "bar"): { min: number; max: number; stepSize: number; } | null {
+  export function getScaleOptions(datasets: ChartDataset[], yAxis: HistoryUtils.yAxes, chartType: "line" | "bar"): { min: number; max: number; stepSize: number; } | null {
 
     const stackMap: { [index: string]: ChartDataset } = {};
     datasets?.filter(el => el["yAxisID"] === yAxis.yAxisId).forEach((dataset, index) => {
@@ -145,7 +158,15 @@ export class ChartConstants {
 
     return Object.values(stackMap)
       .reduce((arr: { min: number, max: number, stepSize: number }, dataset: ChartDataset) => {
-        const currMin = ArrayUtils.findSmallestNumber(dataset.data as number[]);
+        let currMin: number | null;
+        if (yAxis.scale?.dynamicScale) {
+          currMin = ArrayUtils.findSmallestNumber(dataset.data as number[]);
+        } else {
+
+          // Starts yAxis at least at 0
+          currMin = ArrayUtils.findSmallestNumber([...dataset.data as number[], 0]);
+        }
+
         const min = Math.floor(Math.min(...[arr.min, currMin].filter(el => el != null))) ?? null;
         const max = Math.ceil(Math.max(arr.max, ArrayUtils.findBiggestNumber(dataset.data as number[]))) ?? null;
 
@@ -171,7 +192,7 @@ export class ChartConstants {
   * @param max the maximum
   * @returns the stepSize if max and min are not null and min is smaller than max
   */
-  public static calculateStepSize(min: number, max: number): number | null {
+  export function calculateStepSize(min: number, max: number): number | null {
 
     if (min == null || max == null || min > max) {
       return null;
@@ -190,7 +211,7 @@ export class ChartConstants {
    * @param datasets the chart datasets
    * @returns true, if only positive data exists
    */
-  private static isDataSeriesPositive(datasets: ChartDataset[]): boolean {
+  export function isDataSeriesPositive(datasets: ChartDataset[]): boolean {
     return datasets.filter(el => el != null).map(el => el.data).every(el => el.every(e => (e as number) >= 0));
   }
 }
diff --git a/ui/src/app/shared/components/chart/chart.html b/ui/src/app/shared/components/chart/chart.html
index 0bed497b52d..f28d53386de 100644
--- a/ui/src/app/shared/components/chart/chart.html
+++ b/ui/src/app/shared/components/chart/chart.html
@@ -1,19 +1,19 @@
 <ng-container *ngIf="edge">
   <ion-header>
-    <ion-toolbar color="primary">
-      <ion-title>{{title}}</ion-title>
-      <ion-buttons slot="end">
+    <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+      <ion-title style="color: var(--ion-title-color);">{{title}}</ion-title>
+      <ion-buttons style="color: var(--ion-color-pickdate-toolbar);" slot="end">
         <ion-button routerLink="/device/{{edge.id}}/history">
-          <ion-icon name="close-outline"></ion-icon>
+          <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
         </ion-button>
       </ion-buttons>
-      <ion-buttons slot="start" *ngIf="showPopover">
+      <ion-buttons style="color: var(--ion-color-pickdate-toolbar);" slot="start" *ngIf="showPopover">
         <ion-button (click)="presentPopover()">
-          <ion-icon name="options-outline"></ion-icon>
+          <ion-icon name="options-outline" style="color: var(--ion-title-color);"></ion-icon>
         </ion-button>
       </ion-buttons>
     </ion-toolbar>
-    <ion-toolbar color="primary">
+    <ion-toolbar color="secondary">
       <ion-buttons class="ion-justify-content-center">
         <div #ref><ng-content select="[custom-pickdate]"></ng-content></div>
         <pickdate *ngIf="!ref.children.length"></pickdate>
diff --git a/ui/src/app/shared/components/edge/offline/offline.component.ts b/ui/src/app/shared/components/edge/offline/offline.component.ts
index 2f9af23442a..331e65463ca 100644
--- a/ui/src/app/shared/components/edge/offline/offline.component.ts
+++ b/ui/src/app/shared/components/edge/offline/offline.component.ts
@@ -1,12 +1,13 @@
 import { Component, OnInit } from "@angular/core";
-import { Edge, Service, Utils } from "src/app/shared/shared";
+import { TranslateService } from "@ngx-translate/core";
+import { Edge, Producttype, Service, Utils } from "src/app/shared/shared";
 import { Role } from "src/app/shared/type/role";
 import { DateUtils } from "src/app/shared/utils/date/dateutils";
+import { TimeUtils } from "src/app/shared/utils/time/timeutils";
 import { environment } from "src/environments";
 
-// TODO add translations when refactoring offline.component.html
 @Component({
-    selector: "offline",
+    selector: "oe-offline",
     templateUrl: "./offline.component.html",
     styles: [`
             ion-item > ion-label > h3 {
@@ -20,12 +21,45 @@ export class OfflineComponent implements OnInit {
     protected timeSinceOffline: string | null = null;
     protected isAtLeastInstaller: boolean = false;
     protected readonly environment = environment;
+    protected readonly Producttype = Producttype;
 
     constructor(
         public service: Service,
+        private translate: TranslateService,
     ) { }
 
-    private static formatSecondsToFullMinutes(date: string): null | string {
+    /**
+     * Formats a valid
+     *
+     * @param ms the milli seconds
+     * @param translate the translate service
+     * @returns a string if passed milli seconds are not null, else null
+     */
+    public static formatMilliSecondsToValidRange(ms: number, translate: TranslateService): string {
+        const TWO_DAYS = 2 * 24 * 60 * 60 * 1000;
+        const TWO_HOURS = 2 * 60 * 60 * 1000;
+        let translationKey: { singular: string, plural: string } = { singular: "General.TIME.MINUTE", plural: "General.TIME.MINUTES" };
+        let convertedSeconds: number = TimeUtils.getMinutesFromMilliSeconds(ms) ?? 0;
+
+        if (ms > TWO_DAYS) {
+            convertedSeconds = TimeUtils.getDaysFromMilliSeconds(ms) ?? 0;
+            translationKey = { singular: "General.TIME.DAY", plural: "General.TIME.DAYS" };
+        } else if (ms > TWO_HOURS) {
+            convertedSeconds = TimeUtils.getHoursFromMilliSeconds(ms) ?? 0;
+            translationKey = { singular: "General.TIME.HOUR", plural: "General.TIME.HOURS" };
+        }
+
+        return TimeUtils.getDurationText(convertedSeconds, translate, translationKey.singular, translationKey.plural);
+    }
+
+    /**
+     * Gets a formatted text representing the time since the edge has been offline
+     *
+     * @param date the date string
+     * @param translate the translate service
+     * @returns a string if date is convertable to a Date, else null
+     */
+    private static getTimeSinceEdgeIsOffline(date: string, translate: TranslateService): string | null {
 
         const _date: Date | null = DateUtils.stringToDate(date);
         if (!_date) {
@@ -38,24 +72,14 @@ export class OfflineComponent implements OnInit {
         if (_diff === null) {
             return null;
         }
-
-        if (_diff > 2 * 24 * 60 * 60 * 1000) {
-            return Utils.floorSafely(Utils.divideSafely(_diff, 24 * 60 * 60 * 1000)) + " Tagen";
-        }
-
-        if (_diff > 2 * 60 * 60 * 1000) {
-            return Utils.floorSafely(Utils.divideSafely(_diff, 60 * 60 * 1000)) + " Stunden";
-        }
-
-        const minutes: number | null = Utils.floorSafely(Utils.divideSafely(_diff, 60 * 1000));
-        return Utils.floorSafely(Utils.divideSafely(_diff, 60 * 1000)) + " " + (minutes === 1 ? "Minute" : "Minuten");
+        return OfflineComponent.formatMilliSecondsToValidRange(_diff, translate);
     }
 
     ngOnInit() {
         this.service.getCurrentEdge().then(edge => {
             this.edge = edge;
             this.isAtLeastInstaller = this.edge.roleIsAtLeast(Role.INSTALLER);
-            this.timeSinceOffline = OfflineComponent.formatSecondsToFullMinutes(edge.lastmessage?.toString());
+            this.timeSinceOffline = OfflineComponent.getTimeSinceEdgeIsOffline(edge.lastmessage?.toString(), this.translate);
         });
     }
 }
diff --git a/ui/src/app/shared/components/edge/offline/offline.module.ts b/ui/src/app/shared/components/edge/offline/offline.module.ts
index 5c500e85c32..31303623647 100644
--- a/ui/src/app/shared/components/edge/offline/offline.module.ts
+++ b/ui/src/app/shared/components/edge/offline/offline.module.ts
@@ -1,12 +1,14 @@
 import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 import { IonicModule } from "@ionic/angular";
+import { TranslateModule } from "@ngx-translate/core";
 import { OfflineComponent } from "./offline.component";
 
 @NgModule({
     imports: [
         BrowserModule,
         IonicModule,
+        TranslateModule,
     ],
     declarations: [
         OfflineComponent,
diff --git a/ui/src/app/shared/components/edge/offline/offline.spec.ts b/ui/src/app/shared/components/edge/offline/offline.spec.ts
new file mode 100644
index 00000000000..f1f1fd128f2
--- /dev/null
+++ b/ui/src/app/shared/components/edge/offline/offline.spec.ts
@@ -0,0 +1,23 @@
+import { TestContext, TestingUtils } from "../../shared/testing/utils.spec";
+import { OfflineComponent } from "./offline.component";
+
+describe("OfflineComponent", () => {
+
+    let TEST_CONTEXT: TestContext;
+    beforeAll(async () => {
+        TEST_CONTEXT = await TestingUtils.sharedSetup();
+    });
+
+    it("-formatMilliSecondsToValidRange - 1 minute", () => {
+        const ms: number = 60000;
+        expect(OfflineComponent.formatMilliSecondsToValidRange(ms, TEST_CONTEXT.translate)).toBe("1 Minute");
+    });
+    it("-formatMilliSecondsToValidRange - 2 hours", () => {
+        const ms: number = 60000 * 121;
+        expect(OfflineComponent.formatMilliSecondsToValidRange(ms, TEST_CONTEXT.translate)).toBe("2 Stunden");
+    });
+    it("-formatMilliSecondsToValidRange - 1 day", () => {
+        const ms: number = 3 * 24 * 60 * 60 * 1000;
+        expect(OfflineComponent.formatMilliSecondsToValidRange(ms, TEST_CONTEXT.translate)).toBe("3 Tage");
+    });
+});
diff --git a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html
index 4be476c385b..34a66cd6ce6 100644
--- a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html
+++ b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html
@@ -1,4 +1,4 @@
-<table class="full_width" *ngIf="show">
+<table class="full_width" *ngIf="show" style="color: var(--ion-card-content) !important">
     <tr>
         <!-- Name of Parameter on the left side -->
         <td [style.width]="(leftColumnWidth ?? 65)  + '%'">
diff --git a/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html b/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html
index 4e42eb338d3..bc881797a6a 100644
--- a/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html
+++ b/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html
@@ -1,10 +1,10 @@
 <svg width="100%" height="24" overflow="visible">
-    <rect width="100%" rx="7.3" ry="7.3" height="22" fill="var(--ion-color-light)" />
-    <rect *ngIf="displayPercent" x="2" y="2" rx="6" ry="6" height="18" ngClass="primary-color"
-        [style]="'width: calc(' + displayPercent + '% - 4px); transition: width 0.5s ease-in-out;'" />
-    <text x="50%" y="50%" dominant-baseline="middle" text-anchor="middle" style="font-weight: 500"
-        ngClass="secondary-color">
-        {{ displayPercent | unitvalue: '%' }}
-    </text>
-    <ng-content></ng-content>
+  <rect width="100%" rx="7.3" ry="7.3" height="22" style="fill:var(--ion-background-percentagebar-color)" />
+  <rect *ngIf="displayPercent" x="2" y="2" rx="6" ry="6" height="18" style="fill:var(--ion-color-active-percentagebar)"
+    [style]="'width: calc(' + displayPercent + '% - 4px); transition: width 0.5s ease-in-out;'" />
+  <text x="50%" y="50%" dominant-baseline="middle" text-anchor="middle" style="font-weight: 500"
+    class="percentage-style">
+    {{ displayPercent | unitvalue: '%' }}
+  </text>
+  <ng-content></ng-content>
 </svg>
diff --git a/ui/src/app/shared/components/flat/flat-widget.component.html b/ui/src/app/shared/components/flat/flat-widget.component.html
index 6736d32e9d8..e625b1fcd77 100644
--- a/ui/src/app/shared/components/flat/flat-widget.component.html
+++ b/ui/src/app/shared/components/flat/flat-widget.component.html
@@ -1,5 +1,5 @@
-<ion-card style="cursor: pointer;">
-    <ion-item color="light" lines="full">
+<ion-card class="all-edges-shadow" style="cursor: pointer;">
+    <ion-item color="var(--ion-background-color-card-header)" lines="full">
 
         <!-- Check if img or icon is handed over. -->
         <ion-avatar *ngIf="img" slot="start" [class]="'iconify' + (img.large? ' icon-large' : '')">
diff --git a/ui/src/app/shared/components/flat/flat.html b/ui/src/app/shared/components/flat/flat.html
index 11e8fcd6f82..72ebc04d451 100644
--- a/ui/src/app/shared/components/flat/flat.html
+++ b/ui/src/app/shared/components/flat/flat.html
@@ -1,5 +1,6 @@
-<ion-card style="cursor: pointer;">
-    <ion-item color="light" lines="full">
+<ion-card style="cursor: pointer;" class="all-edges-shadow">
+    <ion-item style="--background: var(--ion-background-color-card-header)" lines="full">
+        <!-- color="light" -->
 
         <!-- Check if img or icon is handed over. -->
         <ion-avatar *ngIf="img" slot="start" [class]="'iconify' + (img.large? ' icon-large' : '')">
@@ -15,7 +16,7 @@
         <ng-content select="[button]"></ng-content>
     </ion-item>
 
-    <ion-card-content>
+    <ion-card-content style="--background: var(--ion-color-primary)">
         <ng-content></ng-content>
     </ion-card-content>
 </ion-card>
diff --git a/ui/src/app/shared/components/footer/footer.html b/ui/src/app/shared/components/footer/footer.html
index 1ff1460ea74..f52298bcdf0 100644
--- a/ui/src/app/shared/components/footer/footer.html
+++ b/ui/src/app/shared/components/footer/footer.html
@@ -1,6 +1,6 @@
-<ion-footer *ngIf="!service.isSmartphoneResolution">
-  <ion-item color="primary" *ngIf="user && edge && displayValues" lines="none">
-    <ion-grid>
+<ion-footer *ngIf="!service.isSmartphoneResolution" style="--ion-background-color: var(--ion-color-toolbar-primary);">
+  <container *ngIf="user && edge && displayValues" lines="none">
+    <ion-grid style="background-color: var(--ion-color-toolbar-primary); color: var(--ion-color-primary-contrast)">
       <ion-row>
         <ion-col size="12">
           <span *ngIf="displayValues.comment">
@@ -19,5 +19,5 @@
         </ion-col>
       </ion-row>
     </ion-grid>
-  </ion-item>
+  </container>
 </ion-footer>
diff --git a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html
index bfa8f32655c..a20639306f5 100644
--- a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html
+++ b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html
@@ -1,10 +1,11 @@
 <ion-footer>
-  <ion-item #container color="primary" lines="none"
-    style="--min-height: initial !important;font-size: inherit;  font-size: 14px !important;">
+  <ion-item #container lines="none"
+    style="--min-height: initial !important;font-size: inherit; font-size: 14px !important;"
+    style="--ion-background-color: var(--ion-color-toolbar-primary);" color="secondary">
     <ion-grid style="padding-top: 0; padding-bottom: 0;">
       <ion-row class="ion-justify-content-center" style="padding-top: 0; padding-bottom: 0;">
         <ion-col *ngIf="backButton" style="text-align: center;" #myIonCol>
-          <ion-button color="primary" (click)="location.back()">
+          <ion-button color="primary" (click)=" location.back()">
             <ion-icon name="arrow-back-outline"></ion-icon>
           </ion-button>
         </ion-col>
@@ -14,12 +15,11 @@
             <ion-row style="padding-top: 0; padding-bottom: 0;">
               <ion-col #buttonCol [size-lg]="popoverButtons.length > 0 ? '11':'12'"
                 [size-md]="popoverButtons.length > 0 ? '8':'4'" [size-sm]="popoverButtons.length > 0 ? '6':'6'">
-                <ion-button color="primary" style="--border-color:white" id="{{button.id}}"
-                  *ngFor="let button of (buttons)" (click)="button.callback()" #subnavigationbuttons>
+                <ion-button style="--border-color:white;" id="{{button.id}}" *ngFor="let button of (buttons)"
+                  (click)="button.callback()" #subnavigationbuttons>
                   {{button.alias ?? button.id}}
                 </ion-button>
-                <ion-button *ngIf="popoverButtons.length > 0" color="primary" id="overflow-popover"
-                  (click)="this.showPopover = true;" #popoverButtons>
+                <ion-button *ngIf="popoverButtons.length > 0" (click)="this.showPopover = true;" #popoverButtons>
                   ...
                 </ion-button>
                 <ion-popover [ngClass]="'custom-ion-popover'" dismissOnSelect="true" [isOpen]="showPopover" side="top"
diff --git a/ui/src/app/shared/components/header/header.component.html b/ui/src/app/shared/components/header/header.component.html
index 218cce9a898..4128381dd8a 100644
--- a/ui/src/app/shared/components/header/header.component.html
+++ b/ui/src/app/shared/components/header/header.component.html
@@ -1,12 +1,12 @@
 <ion-header *ngIf="isHeaderAllowed">
-  <ion-toolbar color="primary" mode="md">
+  <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);" mode="md">
     <ion-buttons *ngIf="backUrl" slot="start">
       <ion-button [routerLink]="backUrl" replaceUrl="true">
-        <ion-icon name="arrow-back-outline"></ion-icon>
+        <ion-icon [ngStyle]="{'color': 'var(--ion-menu-color)'}" name="arrow-back-outline"></ion-icon>
       </ion-button>
     </ion-buttons>
     <ion-buttons slot="start" *ngIf="enableSideMenu">
-      <ion-menu-button autoHide="false"></ion-menu-button>
+      <ion-menu-button autoHide="false" class="custom-menu-button"></ion-menu-button>
     </ion-buttons>
     <!-- page title is shown if the current page isn't Live nor History -->
     <ion-title *ngIf="currentPage !== 'IndexLive' && currentPage !== 'IndexHistory'" class="ion-hide-md-up"
@@ -14,18 +14,22 @@
       {{ service.currentPageTitle }}
     </ion-title>
     <!-- page title is hidden when 'smartphone resolution' is reached -->
-    <ion-title class="ion-hide-md-down" slot="start">
+    <ion-title class="ion-hide-md-down" slot="start" style="color: var(--ion-title-color);">
       {{ service.currentPageTitle }}
     </ion-title>
     <ng-container *ngIf="service.currentEdge | async as edge">
       <ng-container *ngIf="currentPage === 'IndexLive' || currentPage === 'IndexHistory'">
         <ion-segment mode="md" (ionChange)="segmentChanged($event)" [(ngModel)]="currentPage"
           class="ion-justify-content-center">
-          <ion-segment-button value="IndexLive">
-            <ion-label translate>General.LIVE</ion-label>
+          <ion-segment-button
+            style="--indicator-color: var(--ion-segment-button-color);--color: var(--ion-color-primary); color: var(--ion-color-primary)"
+            value="IndexLive">
+            <ion-label style="color: var(--ion-color-header-contrast);" translate>General.LIVE</ion-label>
           </ion-segment-button>
-          <ion-segment-button value="IndexHistory">
-            <ion-label translate>General.HISTORY</ion-label>
+          <ion-segment-button
+            style="--indicator-color: var(--ion-segment-button-color);--color: var(--ion-color-primary); color: var(--ion-text-color)"
+            value="IndexHistory">
+            <ion-label style="color: var(--ion-color-header-contrast);" translate>General.HISTORY</ion-label>
           </ion-segment-button>
         </ion-segment>
       </ng-container>
@@ -37,23 +41,28 @@
       <ion-buttons slot="end" class="ion-padding-end">
         <ng-container *ngIf="edge.currentData | async as currentData">
           <ng-container *ngIf="currentData.summary.system as sum">
-            <ion-button (click)="presentSingleStatusModal()"
+            <ion-button class="ion-toolbar-button" (click)="presentSingleStatusModal()"
               *ngIf="(currentPage === 'IndexLive' || currentPage === 'IndexHistory' || currentPage === 'EdgeSettings') && sum.state !== null"
-              color="light" fill="solid" shape="round">
+              fill="solid" shape="round">
               <ng-container [ngSwitch]="sum.state">
-                <ion-icon *ngSwitchCase="0" color="success" name="checkmark-circle-outline"></ion-icon>
+                <ion-icon *ngSwitchCase="0" color="success"
+                  style="font-size: 20px; filter: drop-shadow(0 1px 1px var(--ion-color-success));"
+                  name="checkmark-circle-outline"></ion-icon>
                 <ion-icon *ngSwitchCase="1" color="success"
+                  style="font-size: 20px; filter: drop-shadow(0 1px 1px var(--ion-color-success));"
                   [name]="edge.roleIsAtLeast('admin') ? 'information-outline' : 'checkmark-circle-outline'"
                   size="medium"></ion-icon>
-                <ion-icon *ngSwitchCase="2" color="warning" name="alert-outline"></ion-icon>
-                <ion-icon *ngSwitchCase="3" color="danger" name="alert-outline"></ion-icon>
+                <ion-icon *ngSwitchCase="2" color="warning" name="alert-outline"
+                  style="font-size: 20px; filter: drop-shadow(0 1px 1px var(--ion-color-warning));"></ion-icon>
+                <ion-icon *ngSwitchCase="3" color="danger" name="alert-outline"
+                  style="font-size: 20px; filter: drop-shadow(0 1px 1px var(--ion-color-danger));"></ion-icon>
               </ng-container>
             </ion-button>
           </ng-container>
         </ng-container>
         <ng-container *ngIf="environment.debugMode && edge.roleIsAtLeast('owner')">
           <ion-button (click)="isSystemLogEnabled = !isSystemLogEnabled">
-            <ion-icon name="bug-outline"></ion-icon>
+            <ion-icon [ngStyle]="{'color': 'var(--ion-menu-color)'}" name="bug-outline"></ion-icon>
           </ion-button>
         </ng-container>
       </ion-buttons>
diff --git a/ui/src/app/shared/components/modal/modal-button/modal-button.html b/ui/src/app/shared/components/modal/modal-button/modal-button.html
index 77f3b1a88b4..0b7b8fa0100 100644
--- a/ui/src/app/shared/components/modal/modal-button/modal-button.html
+++ b/ui/src/app/shared/components/modal/modal-button/modal-button.html
@@ -1,10 +1,11 @@
 <div [formGroup]="formGroup" style="padding-top: 2%;">
     <ion-segment [formControlName]="controlName">
         <ng-container *ngFor="let button of buttons">
-            <ion-segment-button [value]="button.value" (click)="button.callback">
-                <ion-label>{{ button.name }}</ion-label>
-                <ion-icon style="width:40px" *ngIf="button.icon" [name]="button.icon.name || 'power-outline'"
-                    [color]="button.icon.color || 'success'" [size]="button.icon.size || 'medium'">
+            <ion-segment-button [value]="button.value" (click)="button.callback" [ngStyle]="button.style">
+                <ion-label style="color: var(--ion-color-text)">{{ button.name }}</ion-label>
+                <ion-icon style="width:40px; " *ngIf="button.icon" [name]="button.icon.name || 'power-outline'"
+                    [color]="formGroup.controls[controlName].value === button.value ? button.icon.color : 'normal'"
+                    [size]="button.icon.size || 'medium'">
                 </ion-icon>
             </ion-segment-button>
         </ng-container>
diff --git a/ui/src/app/shared/components/modal/modal-button/modal-button.ts b/ui/src/app/shared/components/modal/modal-button/modal-button.ts
index 9b72038989c..240610984d1 100644
--- a/ui/src/app/shared/components/modal/modal-button/modal-button.ts
+++ b/ui/src/app/shared/components/modal/modal-button/modal-button.ts
@@ -18,4 +18,5 @@ export type ButtonLabel = {
     /** Icons for Button, displayed above the corresponding name */
     icons?: Icon;
     callback?: () => void;
+    style?: { [key: string]: string };
 };
diff --git a/ui/src/app/shared/components/modal/modal.html b/ui/src/app/shared/components/modal/modal.html
index e4d22c8a660..277aa915f7d 100644
--- a/ui/src/app/shared/components/modal/modal.html
+++ b/ui/src/app/shared/components/modal/modal.html
@@ -1,6 +1,6 @@
 <ion-header>
-  <ion-toolbar color="primary">
-    <ion-title translate>{{title}}</ion-title>
+  <ion-toolbar style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
+    <ion-title translate style="color: var(--ion-title-color);">{{title}}</ion-title>
     <ion-buttons slot="end">
       <!-- Additional Toolbarbuttons -->
       <ng-container *ngIf="toolbarButtons !== null">
@@ -15,7 +15,7 @@
         <ng-template #singleButton>
           <ion-button [href]="toolbarButtons?.url" target="_blank" (click)="toolbarButtons?.callback()">
             <ion-icon [name]="toolbarButtons.icon?.name ??'help-circle-outline'"
-              [color]="toolbarButtons.icon?.color ??'light'" [size]="toolbarButtons.icon?.size ??'medium'">
+              [color]="toolbarButtons.icon?.color ?? 'dark'" [size]="toolbarButtons.icon?.size ??'medium'">
             </ion-icon>
           </ion-button>
         </ng-template>
@@ -25,7 +25,7 @@
       <oe-help-button *ngIf="helpKey" [key]="helpKey"></oe-help-button>
 
       <ion-button (click)="modalController.dismiss()">
-        <ion-icon name="close-outline" size="medium" color="light"></ion-icon>
+        <ion-icon name="close-outline" size="medium" style="fill: var(--ion-color-dark)"></ion-icon>
       </ion-button>
     </ion-buttons>
   </ion-toolbar>
diff --git a/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html b/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html
index 2a2f2922aaf..af396348aab 100644
--- a/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html
+++ b/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="index && components?.length !== 1, else simpleLine">
     <ng-container>
         <div *ngIf="(index !== (components.length - 1))"
-            style="border-bottom: 1px solid lightgray; width: 110%; margin-top: 2%; margin-bottom: 2%; margin-left: -5%;">
+            style="border-bottom: 1px solid lightgray; opacity: 0.2; width: 110%; margin-top: 2%; margin-bottom: 2%; margin-left: -5%;">
         </div>
     </ng-container>
 </ng-container>
@@ -9,6 +9,6 @@
 <ng-template #simpleLine>
     <!-- If only one component, dont display the line -->
     <div *ngIf="components?.length !== 1"
-        style="border-bottom: 1px solid lightgray; width: 110%; margin-top: 2%; margin-bottom: 2%; margin-left: -5%;">
+        style="border-bottom: 1px solid lightgray; opacity: 0.2; width: 110%; margin-top: 2%; margin-bottom: 2%; margin-left: -5%;">
     </div>
 </ng-template>
diff --git a/ui/src/app/shared/components/pickdate/pickdate.component.html b/ui/src/app/shared/components/pickdate/pickdate.component.html
index a3987add648..d3b8718a379 100644
--- a/ui/src/app/shared/components/pickdate/pickdate.component.html
+++ b/ui/src/app/shared/components/pickdate/pickdate.component.html
@@ -1,11 +1,13 @@
 <ion-button (click)="goBackward()" [disabled]="!isBackArrowAllowed">
-    <ion-icon class="ion-padding-start" name="arrow-back-outline" slot="start" ngClass="secondary-color-contrast">
+    <ion-icon class="ion-padding-start" name="arrow-back-outline" slot="start"
+        style="color: var(--ion-color-pickdate-toolbar);">
     </ion-icon>
 </ion-button>
-<ion-button *ngIf="translate" (click)="presentPopover($event)" ngClass="secondary-color-contrast">
+<ion-button *ngIf="translate" (click)="presentPopover($event)" style="color: var(--ion-color-pickdate-toolbar);">
     {{service.historyPeriod.value.getText(translate, service)}}
 </ion-button>
 <ion-button [disabled]="!isForwardArrowAllowed" (click)="goForward()">
-    <ion-icon class="ion-padding-end" slot="end" name="arrow-forward-outline" ngClass="secondary-color-contrast">
+    <ion-icon class="ion-padding-end" style="color: var(--ion-color-pickdate-toolbar);" slot="end"
+        name="arrow-forward-outline">
     </ion-icon>
 </ion-button>
diff --git a/ui/src/app/shared/components/pickdate/popover/popover.component.ts b/ui/src/app/shared/components/pickdate/popover/popover.component.ts
index a4586947d2f..41abd64ccad 100644
--- a/ui/src/app/shared/components/pickdate/popover/popover.component.ts
+++ b/ui/src/app/shared/components/pickdate/popover/popover.component.ts
@@ -29,12 +29,42 @@ export class PickDatePopoverComponent implements OnInit {
         stylesData: {
             selector: "dp1",
             styles: `
-               .dp1 .myDpMarkCurrDay, 
-               .dp1 .myDpMarkCurrMonth, 
-               .dp1 .myDpMarkCurrYear {
-                   border-bottom: 2px solid #2d8fab;
-                   color: #2d8fab;
+            .dp1 .myDpIconLeftArrow, 
+            .dp1 .myDpIconRightArrow,
+            .dp1 .myDpHeaderBtn {
+                color: #004d8c;
+            }
+            .dp1 .myDpHeaderBtn:focus,
+            .dp1 .myDpMonthLabel:focus,
+            .dp1 .myDpYearLabel:focus {
+                color: #2d8fab;
+             }
+            .dp1 .myDpDaycell:focus,
+            .dp1 .myDpMonthcell:focus,
+            .dp1 .myDpYearcell:focus {
+                box-shadow: inset 0 0 0 1px #66afe9;
+            }
+            .dp1 .myDpSelectedDay,
+            .dp1 .myDpSelectedMonth,
+            .dp1 .myDpSelectedYear {
+                background-color: #93c47d;
+                }
+            .dp1 .myDpTableSingleDay:hover, 
+            .dp1 .myDpTableSingleMonth:hover, 
+            .dp1 .myDpTableSingleYear:hover {
+                background-color: #add8e6;
+                color: #3855c1;
                 }
+            .dp1 .myDpMarkCurrDay, 
+            .dp1 .myDpMarkCurrMonth, 
+            .dp1 .myDpMarkCurrYear {
+                border-bottom: 2px solid #2d8fab;
+                color: #2d8fab;
+             }
+            .dp1 .myDpRangeColor {
+            background-color: #dbeaff;
+            }
+
              `,
         },
         calendarAnimation: { in: CalAnimation.FlipDiagonal, out: CalAnimation.ScaleCenter },
@@ -46,6 +76,7 @@ export class PickDatePopoverComponent implements OnInit {
         selectorHeight: "225px",
         selectorWidth: "251px",
         showWeekNumbers: true,
+
     };
     protected readonly DefaultTypes = DefaultTypes;
     private readonly TODAY = new Date();
diff --git a/ui/src/app/shared/components/pickdate/popover/popover.spec.ts b/ui/src/app/shared/components/pickdate/popover/popover.spec.ts
index fd6a8f9463c..d3174919708 100644
--- a/ui/src/app/shared/components/pickdate/popover/popover.spec.ts
+++ b/ui/src/app/shared/components/pickdate/popover/popover.spec.ts
@@ -43,6 +43,7 @@ describe("PickdatePopover", () => {
         const popoverBtn = debugElement.query(By.css("[testId=\"popover-button\"]"));
         popoverBtn.triggerEventHandler("click", null);
         fixture.detectChanges();
+
         expect(component).toBeDefined();
         expect((debugElement?.nativeNode?.children as HTMLCollection)?.item(2)?.localName).toEqual("lib-angular-mydatepicker-calendar");
     });
diff --git a/ui/src/app/shared/components/shared/converter.ts b/ui/src/app/shared/components/shared/converter.ts
index 6791bf9166e..16a72a5afc7 100644
--- a/ui/src/app/shared/components/shared/converter.ts
+++ b/ui/src/app/shared/components/shared/converter.ts
@@ -178,6 +178,21 @@ export namespace Converter {
       Formatter.FORMAT_AMPERE(value / 1000));
   };
 
+  /**
+   * Converts a formatted current value to the absolute value.
+   *
+   * Value -1000 -> "1.000 A".
+   * Value 1000 -> "1.000 A".
+   * Value null -> "-".
+   *
+   * @param value the current value
+   * @returns formatted value; '-' for null
+   */
+  export const CURRENT_IN_MILLIAMPERE_TO_ABSOLUTE_AMPERE: Converter = (raw) => {
+    return IF_NUMBER(raw, value =>
+      Formatter.FORMAT_AMPERE(Math.abs(value) / 1000));
+  };
+
   export const ONLY_POSITIVE_POWER_AND_NEGATIVE_AS_ZERO: Converter = (raw) => {
     return IF_NUMBER(raw, value =>
       value <= 0
diff --git a/ui/src/app/shared/components/shared/dataservice.ts b/ui/src/app/shared/components/shared/dataservice.ts
index 5f321a0a45c..5f2986dca33 100644
--- a/ui/src/app/shared/components/shared/dataservice.ts
+++ b/ui/src/app/shared/components/shared/dataservice.ts
@@ -9,7 +9,7 @@ export abstract class DataService {
 
   /** Used to retrieve values */
   public currentValue: BehaviorSubject<{ allComponents: {} }> = new BehaviorSubject({ allComponents: {} });
-  public timestamp: WritableSignal<Date | null> = signal(new Date());
+  public lastUpdated: WritableSignal<Date | null> = signal(new Date());
 
   protected edge: Edge | null = null;
   protected stopOnDestroy: Subject<void> = new Subject<void>();
diff --git a/ui/src/app/shared/components/shared/testing/common.ts b/ui/src/app/shared/components/shared/testing/common.ts
index ea9af4c8948..737ee68587c 100644
--- a/ui/src/app/shared/components/shared/testing/common.ts
+++ b/ui/src/app/shared/components/shared/testing/common.ts
@@ -13,7 +13,6 @@ export namespace OeTester {
 
       /** Always one value for each channel from a {@link QueryHistoricTimeseriesEnergyResponse} */
       energyChannelWithValues: QueryHistoricTimeseriesEnergyResponse,
-
       /** data from a {@link QueryHistoricTimeseriesEnergyPerPeriodResponse} */
       energyPerPeriodChannelWithValues?: QueryHistoricTimeseriesEnergyPerPeriodResponse,
       /** data from a {@link QueryHistoricTimeseriesDataResponse} */
@@ -25,14 +24,37 @@ export namespace OeTester {
     export const LINE_CHART_OPTIONS = (period: string, chartType: "line" | "bar", options: { [key: string]: { scale: { min?: number, max?: number, beginAtZero?: boolean }, ticks?: { stepSize: number; min?: number, max?: number }; }; }, title?: string): OeChartTester.Dataset.Option => ({
       type: "option",
       options: {
-        "responsive": true, "maintainAspectRatio": false, "elements": { "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 }, "line": { "stepped": false, "fill": true } }, "datasets": { "bar": {}, "line": {} }, "plugins": {
-          "colors": { "enabled": false }, "legend": { "display": true, "position": "bottom", "labels": { "color": "" } }, "tooltip": { "intersect": false, "mode": "index", "callbacks": {}, "enabled": true }, "annotation": { "annotations": {} }, "datalabels": {
+        "responsive": true,
+        "maintainAspectRatio": false,
+        "elements": {
+          "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 },
+          "line": { "stepped": false, "fill": true },
+        },
+        "datasets": { "bar": {}, "line": {} },
+        "plugins": {
+          "colors": { "enabled": false },
+          "legend": { "display": true, "position": "bottom", "labels": { "color": "" } },
+          "tooltip": { "intersect": false, "mode": "index", "callbacks": {}, "enabled": true },
+          "annotation": { "annotations": {} }, "datalabels": {
             display: false,
           },
         }, "scales": {
-          "x": { "stacked": true, "offset": false, "type": "time", "ticks": { "source": "auto", "maxTicksLimit": 31 }, "bounds": "ticks", "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } }, "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } } }, "left": {
+          "x": {
+            "stacked": true,
+            "offset": false,
+            "type": "time",
+            "ticks": { "source": "auto", "maxTicksLimit": 31 },
+            "bounds": "ticks",
+            "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } },
+            "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } },
+          },
+          "left": {
             "stacked": false,
-            "beginAtZero": false, ...options["left"]?.scale, ...(chartType === "line" ? { stacked: false } : {}), "title": { "text": "kW", "display": false, "padding": 5, "font": { "size": 11 } }, "position": "left", "grid": { "display": true },
+            "beginAtZero": false,
+            ...options["left"]?.scale, ...(chartType === "line" ? { stacked: false } : {}),
+            "title": { "text": "kW", "display": false, "padding": 5, "font": { "size": 11 } },
+            "position": "left",
+            "grid": { "display": true },
             "ticks": {
               ...options["left"]?.ticks,
               "color": "",
@@ -46,16 +68,43 @@ export namespace OeTester {
     export const BAR_CHART_OPTIONS = (period: string, chartType: "line" | "bar", options: { [key: string]: { scale: { min: number, max: number; }, ticks?: { stepSize: number; }; }; }, title?: string): OeChartTester.Dataset.Option => ({
       type: "option",
       options: {
-        "responsive": true, "maintainAspectRatio": false, "elements": { "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 }, "line": { "stepped": false, "fill": true } }, "datasets": { "bar": { "barPercentage": 1 }, "line": {} }, "plugins": {
-          "colors": { "enabled": false }, "legend": { "display": true, "position": "bottom", "labels": { "color": "" } }, "tooltip": { "intersect": false, "mode": "x", "callbacks": {}, "enabled": true }, "annotation": { "annotations": {} }, "datalabels": {
+        "responsive": true,
+        "maintainAspectRatio": false,
+        "elements": {
+          "point": { "radius": 0, "hitRadius": 0, "hoverRadius": 0 },
+          "line": { "stepped": false, "fill": true },
+        },
+        "datasets": {
+          "bar": { "barPercentage": 1 },
+          "line": {},
+        },
+        "plugins": {
+          "colors": { "enabled": false },
+          "legend": { "display": true, "position": "bottom", "labels": { "color": "" } },
+          "tooltip": { "intersect": false, "mode": "x", "callbacks": {}, "enabled": true },
+          "annotation": { "annotations": {} },
+          "datalabels": {
             display: false,
           },
-        }, "scales": {
-          "x": { "stacked": true, "offset": true, "type": "time", "ticks": { "source": "auto", "maxTicksLimit": 31 }, "bounds": "ticks", "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } }, "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } } },
+        },
+        "scales": {
+          "x": {
+            "stacked": true,
+            "offset": true,
+            "type": "time",
+            "ticks": { "source": "auto", "maxTicksLimit": 31 },
+            "bounds": "ticks",
+            "adapters": { "date": { "locale": { "code": "de", "formatLong": {}, "localize": {}, "match": {}, "options": { "weekStartsOn": 1, "firstWeekContainsDate": 4 } } } },
+            "time": { "unit": period as TimeUnit, "displayFormats": { "datetime": "yyyy-MM-dd HH:mm:ss", "millisecond": "SSS [ms]", "second": "HH:mm:ss a", "minute": "HH:mm", "hour": "HH:00", "day": "dd", "week": "ll", "month": "MM", "quarter": "[Q]Q - YYYY", "year": "yyyy" } },
+          },
           "left": {
             "stacked": true,
+            "beginAtZero": true,
             ...options["left"]?.scale,
-            ...(chartType === "line" ? { stacked: false } : {}), "beginAtZero": true, "title": { "text": "kWh", "display": false, "padding": 5, "font": { "size": 11 } }, "position": "left", "grid": { "display": true },
+            ...(chartType === "line" ? { stacked: false } : {}),
+            "title": { "text": "kWh", "display": false, "padding": 5, "font": { "size": 11 } },
+            "position": "left",
+            "grid": { "display": true },
             "ticks": {
               ...options["left"]?.ticks,
               "color": "",
diff --git a/ui/src/app/shared/components/shared/testing/tester.ts b/ui/src/app/shared/components/shared/testing/tester.ts
index 9a4084f6bb5..c6ed9f0bfd9 100644
--- a/ui/src/app/shared/components/shared/testing/tester.ts
+++ b/ui/src/app/shared/components/shared/testing/tester.ts
@@ -308,13 +308,8 @@ export class OeChartTester {
       legendOptions.push(AbstractHistoryChart.getLegendOptions(label, displayValue));
     });
 
-    const options = AbstractHistoryChart.getOptions(chartData, chartType, testContext.service, testContext.translate, legendOptions, channelData.result, locale, config, datasets, xAxisType, labels);
-
-    chartData.yAxes.filter(axis => axis.unit != null).forEach(axis => {
-      // Remove custom scale calculations from unittest, seperate unittest existing
-      options.scales[axis.yAxisId] = ObjectUtils.excludeProperties(options.scales[axis.yAxisId], ["min", "max"]) as Chart.ScaleOptionsByType<"radialLinear" | keyof Chart.CartesianScaleTypeRegistry>;
-      options.scales[axis.yAxisId].ticks = ObjectUtils.excludeProperties(options.scales[axis.yAxisId].ticks as Chart.RadialTickOptions, ["stepSize"]);
-    });
+    let options: Chart.ChartOptions = AbstractHistoryChart.getOptions(chartData, chartType, testContext.service, testContext.translate, legendOptions, channelData.result, locale, config, datasets, xAxisType, labels);
+    options = prepareOptionsForTesting(options, chartData);
 
     return {
       type: "option",
@@ -431,3 +426,18 @@ export namespace OeFormlyViewTester {
     };
   }
 }
+
+/** Exclude properties that dont need to be tested  */
+function prepareOptionsForTesting(options: Chart.ChartOptions, chartData: HistoryUtils.ChartData): Chart.ChartOptions {
+  options.scales["x"]["ticks"] = ObjectUtils.excludeProperties(options.scales["x"]["ticks"] as Chart.RadialTickOptions, ["color"]);
+  chartData.yAxes.filter(axis => axis.unit != null).forEach(axis => {
+    // Remove custom scale calculations from unittest, seperate unittest existing
+    options.scales[axis.yAxisId] = ObjectUtils.excludeProperties(options.scales[axis.yAxisId], ["min", "max"]) as Chart.ScaleOptionsByType<"radialLinear" | keyof Chart.CartesianScaleTypeRegistry>;
+    options.scales[axis.yAxisId].ticks = ObjectUtils.excludeProperties(options.scales[axis.yAxisId].ticks as Chart.RadialTickOptions, ["stepSize"]);
+    options.scales[axis.yAxisId]["title"] = ObjectUtils.excludeProperties(options.scales[axis.yAxisId]["title"] as Chart.RadialTickOptions, ["color"]);
+  });
+  console.log("options", options);
+  return options;
+}
+
+
diff --git a/ui/src/app/shared/components/status/single/status.component.html b/ui/src/app/shared/components/status/single/status.component.html
index 296f7dda136..eff6cfe9f10 100644
--- a/ui/src/app/shared/components/status/single/status.component.html
+++ b/ui/src/app/shared/components/status/single/status.component.html
@@ -1,5 +1,6 @@
 <ion-header>
-    <ion-toolbar class="ion-justify-content-center" color="primary">
+    <ion-toolbar class="ion-justify-content-center"
+        style="--background: var(--ion-color-toolbar-primary); color: var(--ion-title-color);">
         <ion-title translate>General.SYSTEM_STATE</ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="modalCtrl.dismiss()">
@@ -30,7 +31,7 @@
                     <ng-container *ngFor="let category of components">
                         <ion-item-group>
                             <ion-item lines="inset">
-                                <ion-icon name="{{ category.category.icon }}"></ion-icon>
+                                <ion-icon class="normal-icon" name="{{ category.category.icon }}"></ion-icon>
                                 <ion-label class="ion-padding-start">
                                     {{ category.category.title }}
                                 </ion-label>
@@ -47,7 +48,7 @@ <h3>{{ item.alias }}
                                         </h3>
                                     </ion-text>
                                     <ng-container *ngIf="config.factories[item.factoryId] as factory">
-                                        <p>{{ factory.name }}</p>
+                                        <p class="custom-channels-text">{{ factory.name }}</p>
                                     </ng-container>
                                     <ng-container *ngIf="item['showProperties']">
                                         <ng-container *ngFor="let address of subscribedInfoChannels">
diff --git a/ui/src/app/shared/service/defaulttypes.ts b/ui/src/app/shared/service/defaulttypes.ts
index f9652fb6dbe..9fa63b0f4ae 100644
--- a/ui/src/app/shared/service/defaulttypes.ts
+++ b/ui/src/app/shared/service/defaulttypes.ts
@@ -264,6 +264,7 @@ type Range<N extends number, Acc extends number[] = []> = Acc["length"] extends
 export type RGBValue = Range<256>; // 0 to 255
 
 export class RGBColor<T extends RGBValue = RGBValue> {
+  private static INVALID_RGB_VALUES_ERROR = new Error("All values need to be valid");
   private readonly red: T;
   private readonly green: T;
   private readonly blue: T;
@@ -274,9 +275,21 @@ export class RGBColor<T extends RGBValue = RGBValue> {
     this.blue = blue;
   }
 
+  public static fromString(rgbString: string) {
+    const rgb: string[] = rgbString.split(",").map(el => el.trim());
+    const red: RGBValue = parseInt(rgb[0]) as RGBValue;
+    const green: RGBValue = parseInt(rgb[1]) as RGBValue;
+    const blue: RGBValue = parseInt(rgb[2]) as RGBValue;
+
+    if (!red || !green || !blue) {
+      throw RGBColor.INVALID_RGB_VALUES_ERROR;
+    }
+    return new RGBColor(red, green, blue);
+  }
+
   public toString(): string {
     if (this.red == null || this.green == null || this.blue == null) {
-      throw new Error("All values need to be valid");
+      throw RGBColor.INVALID_RGB_VALUES_ERROR;
     }
     return `rgb(${this.red},${this.green},${this.blue})`;
   }
diff --git a/ui/src/app/shared/service/utils.ts b/ui/src/app/shared/service/utils.ts
index 09412ef8bf9..cf1f4ec3143 100644
--- a/ui/src/app/shared/service/utils.ts
+++ b/ui/src/app/shared/service/utils.ts
@@ -778,8 +778,12 @@ export namespace HistoryUtils {
     yAxisId: ChartAxis,
     /** YAxis title -> {@link https://www.chartjs.org/docs/latest/samples/scale-options/titles.html Chartjs Title} */
     customTitle?: string
-    /** Default: true */
-    displayGrid?: boolean
+    /** Default: true _> {@link https://www.chartjs.org/docs/latest/axes/styling.html#grid-line-configuration Chartjs Grid Display} */
+    displayGrid?: boolean,
+    scale?: {
+      /** Default: false, if true scale starts at minimum value of all datasets */
+      dynamicScale?: boolean,
+    }
   };
 
   export namespace ValueConverter {
diff --git a/ui/src/app/shared/service/websocket.ts b/ui/src/app/shared/service/websocket.ts
index c3640de7e82..a10012290a4 100644
--- a/ui/src/app/shared/service/websocket.ts
+++ b/ui/src/app/shared/service/websocket.ts
@@ -1,10 +1,11 @@
 // @ts-strict-ignore
-import { Injectable, WritableSignal, signal } from "@angular/core";
+import { Injectable, signal, WritableSignal } from "@angular/core";
 import { Router } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 import { CookieService } from "ngx-cookie-service";
 import { delay, retryWhen } from "rxjs/operators";
-import { WebSocketSubject, webSocket } from "rxjs/webSocket";
+import { webSocket, WebSocketSubject } from "rxjs/webSocket";
+import { UserComponent } from "src/app/user/user.component";
 import { environment } from "src/environments";
 
 import { JsonrpcMessage, JsonrpcNotification, JsonrpcRequest, JsonrpcResponse, JsonrpcResponseError, JsonrpcResponseSuccess } from "../jsonrpc/base";
@@ -83,6 +84,7 @@ export class Websocket implements WebsocketInterface {
         this.cookieService.set("token", authenticateResponse.token, { expires: 365, path: "/", sameSite: "Strict", secure: location.protocol === "https:" });
 
         this.service.currentUser.set(authenticateResponse.user);
+        UserComponent.applyUserSettings(authenticateResponse.user);
 
         // Metadata
         this.service.metadata.next({
diff --git a/ui/src/app/shared/shared.ts b/ui/src/app/shared/shared.ts
index 2f45850f5ba..26bc0432659 100644
--- a/ui/src/app/shared/shared.ts
+++ b/ui/src/app/shared/shared.ts
@@ -1,4 +1,5 @@
 // @ts-strict-ignore
+export { ChartConstants } from "./components/chart/chart.constants";
 export { Edge } from "./components/edge/edge";
 export { EdgeConfig } from "./components/edge/edgeconfig";
 export { Logger } from "./service/logger";
@@ -122,6 +123,9 @@ export class UserPermission {
   }
 }
 
+export enum Producttype {
+}
+
 export namespace Currency {
 
   /**
diff --git a/ui/src/app/shared/utils/time/timeutils.ts b/ui/src/app/shared/utils/time/timeutils.ts
index 2998327d2ab..d2ac1d7d981 100644
--- a/ui/src/app/shared/utils/time/timeutils.ts
+++ b/ui/src/app/shared/utils/time/timeutils.ts
@@ -1,6 +1,8 @@
 // @ts-strict-ignore
 import { DecimalPipe } from "@angular/common";
 
+import { TranslateService } from "@ngx-translate/core";
+import { Utils } from "../../shared";
 import { Language } from "../../type/language";
 
 export class TimeUtils {
@@ -54,4 +56,18 @@ export class TimeUtils {
       return decimalPipe.transform(seconds, "1.0-0") + " s";
     }
   }
+
+  public static getDaysFromMilliSeconds(ms: number) {
+    return Utils.floorSafely(Utils.divideSafely(ms, 24 * 60 * 60 * 1000));
+  }
+  public static getHoursFromMilliSeconds(ms: number) {
+    return Utils.floorSafely(Utils.divideSafely(ms, 60 * 60 * 1000));
+  }
+  public static getMinutesFromMilliSeconds(ms: number) {
+    return Utils.floorSafely(Utils.divideSafely(ms, 60 * 1000));
+  }
+
+  public static getDurationText(ms: number, translate: TranslateService, singular: string, plural: string) {
+    return `${ms} ${translate.instant(ms > 1 ? plural : singular)}`;
+  }
 }
diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html
index 030bf9167d8..b557cc07184 100644
--- a/ui/src/app/user/user.component.html
+++ b/ui/src/app/user/user.component.html
@@ -44,7 +44,7 @@
               </ion-label>
             </ion-item>
             <ion-item lines="none">
-              <ion-button (click)="doLogout()" slot="end" size="default" fill="clear">
+              <ion-button (click)="doLogout()" slot="end" size="default" style="padding-top: 0.8em">
                 <ion-label translate>Menu.logout</ion-label>
                 <ion-icon name="log-out-outline"></ion-icon>
               </ion-button>
@@ -79,7 +79,7 @@
             </oe-formly-skeleton-wrapper>
 
             <ion-item lines="none">
-              <ion-button slot="start" (click)="enableAndDisableEditMode()"
+              <ion-button style="padding-top: 0.3em" slot="start" (click)="enableAndDisableEditMode()"
                 [disabled]="!isEditModeDisabled && !this.form?.formGroup?.dirty">
                 <ion-label>{{isEditModeDisabled ?'bearbeiten':'zurücksetzen'}}</ion-label>
                 <ion-icon name="pencil-outline" slot="end"></ion-icon>
@@ -124,7 +124,7 @@
             <p class="ion-padding" translate>About.developed</p>
             <ul>
               <li>
-                <a target="_blank" href="https://openems.io" translate>About.openEMS</a>
+                <a class="ion-link" target="_blank" href="https://openems.io" translate>About.openEMS</a>
               </li>
             </ul>
             <p class="ion-padding" translate>About.build</p>
@@ -132,7 +132,8 @@
               <p class="ion-padding" translate>About.build</p>
               <ul>
                 <li>
-                  <a routerLinkActive="active" routerLink="/changelog">{{ uiVersion | version:role }}</a>
+                  <a class="ion-link" routerLinkActive="active" routerLink="/changelog">{{ uiVersion | version:role
+                    }}</a>
                 </li>
               </ul>
             </div>
@@ -149,24 +150,36 @@
           <ion-card-content>
             <ion-item lines="none">
               <ion-label translate>About.language</ion-label>
-              <ion-select #langSelect (ionChange)="setLanguage(langSelect.value)" [value]="currentLanguage">
+              <ion-select #langSelect (ionChange)="setLanguage(langSelect.value)" [value]="currentLanguage"
+                interface="popover" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }">
                 <ion-select-option *ngFor="let language of languages" [value]="language">
                   {{ language.title }}
                 </ion-select-option>
               </ion-select>
             </ion-item>
-
-            <ion-note class="ion-padding" *ngIf="environment.backend === 'OpenEMS Edge'">
-              <small>
-                The language can not be changed permanently in the local online-monitoring for technical
-                reasons.</small>
-            </ion-note>
-
-            <ion-item lines="none" *ngIf="isAtLeastAdmin">
-              <ion-checkbox slot="end" (ionChange)="toggleDebugMode($event)" [(ngModel)]="environment.debugMode">
-              </ion-checkbox>
-              <ion-label translate>Debug-Mode</ion-label>
-            </ion-item>
+            <ng-container *ngIf="isAtLeastAdmin">
+              <div class="page-content">
+                <ion-item id="theme-switcher" lines="none">
+                  <ion-label>Theme</ion-label>
+                  <ion-select #themeSelect (ionChange)="setTheme(themeSelect.value)" [value]="currentTheme"
+                    interface="popover" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }">
+                    <ion-select-option *ngFor="let theme of themes" [value]="theme.value">
+                      {{ theme.key }}
+                    </ion-select-option>
+                  </ion-select>
+                </ion-item>
+              </div>
+              <ion-item lines="none">
+                <ion-checkbox slot="end" (ionChange)="toggleDebugMode($event)" [(ngModel)]="environment.debugMode">
+                </ion-checkbox>
+                <ion-label>Debug-Mode</ion-label>
+              </ion-item>
+              <ion-note class="ion-padding" *ngIf="environment.backend === 'OpenEMS Edge'">
+                <small>
+                  The language can not be changed permanently in the local online-monitoring for technical
+                  reasons.</small>
+              </ion-note>
+            </ng-container>
           </ion-card-content>
         </ion-card>
       </ion-col>
diff --git a/ui/src/app/user/user.component.ts b/ui/src/app/user/user.component.ts
index a360e9741c3..c8df21bbbeb 100644
--- a/ui/src/app/user/user.component.ts
+++ b/ui/src/app/user/user.component.ts
@@ -1,4 +1,5 @@
 // @ts-strict-ignore
+import { KeyValue } from "@angular/common";
 import { Component, OnInit, effect } from "@angular/core";
 import { FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -6,10 +7,13 @@ import { FormlyFieldConfig } from "@ngx-formly/core";
 import { TranslateService } from "@ngx-translate/core";
 import { Changelog } from "src/app/changelog/view/component/changelog.constants";
 import { environment } from "../../environments";
+import { Theme } from "../edge/history/shared";
 import { GetUserInformationRequest } from "../shared/jsonrpc/request/getUserInformationRequest";
 import { SetUserInformationRequest } from "../shared/jsonrpc/request/setUserInformationRequest";
 import { UpdateUserLanguageRequest } from "../shared/jsonrpc/request/updateUserLanguageRequest";
+import { UpdateUserSettingsRequest } from "../shared/jsonrpc/request/updateUserSettingsRequest";
 import { GetUserInformationResponse } from "../shared/jsonrpc/response/getUserInformationResponse";
+import { User } from "../shared/jsonrpc/shared";
 import { Service, Websocket } from "../shared/shared";
 import { COUNTRY_OPTIONS } from "../shared/type/country";
 import { Language } from "../shared/type/language";
@@ -33,6 +37,13 @@ type UserInformation = {
 })
 export class UserComponent implements OnInit {
 
+  private static readonly DEFAULT_THEME: Theme = Theme.LIGHT;
+  public currentTheme: string;
+  public readonly themes: KeyValue<string, string>[] = [
+    { key: "Light", value: "light" },
+    { key: "Dark", value: "dark" },
+    { key: "System", value: "system" },
+  ];
   protected readonly environment = environment;
   protected readonly uiVersion = Changelog.UI_VERSION;
   protected readonly languages: Language[] = Language.ALL;
@@ -76,6 +87,24 @@ export class UserComponent implements OnInit {
     });
   }
 
+  public static applyUserSettings(user: User): void {
+    const theme = UserComponent.getCurrentTheme(user);
+    let attr: Exclude<`${Theme}`, Theme.SYSTEM> = theme;
+    localStorage.setItem("THEME", theme);
+    if (theme === Theme.SYSTEM) {
+      attr = window.matchMedia("(prefers-color-scheme: dark)").matches ? Theme.DARK : Theme.LIGHT;
+    }
+    document.documentElement.setAttribute("data-theme", attr);
+  }
+
+  public static getPreferedColorSchemeFromTheme(theme: Theme) {
+    return theme === Theme.SYSTEM ? (window.matchMedia("(prefers-color-scheme: dark)").matches ? Theme.DARK : Theme.LIGHT) : theme;
+  }
+
+  public static getCurrentTheme(user: User): Theme {
+    return user?.settings["theme"] ?? localStorage.getItem("THEME") ?? UserComponent.DEFAULT_THEME;
+  }
+
   ngOnInit() {
     // Set currentLanguage to
     this.currentLanguage = Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT;
@@ -87,6 +116,18 @@ export class UserComponent implements OnInit {
     });
   }
 
+  public setTheme(theme: Theme): void {
+    this.service.websocket.sendSafeRequest(new UpdateUserSettingsRequest({
+      settings: { theme: theme },
+    })).then(() => {
+      const currentUser = this.service.currentUser();
+      if (currentUser) {
+        currentUser.settings["theme"] = theme;
+        UserComponent.applyUserSettings(currentUser);
+      }
+    });
+  }
+
   public applyChanges() {
 
     const params: SetUserInformationRequest["params"] = {
diff --git a/ui/src/assets/i18n/cz.json b/ui/src/assets/i18n/cz.json
index 7b90e504b9b..1d948ec5469 100644
--- a/ui/src/assets/i18n/cz.json
+++ b/ui/src/assets/i18n/cz.json
@@ -537,7 +537,7 @@
     "currentDevelopments": "Aktuální vývoj",
     "developed": "Toto uživatelské rozhraní bylo vyvinuto jako open-source software.",
     "faq": "Často kladené otázky (FAQ)",
-    "language": "Zvolte jazyk:",
+    "language": "Select language:",
     "openEMS": "Více o OpenEMS",
     "patchnotes": "Změny v monitorování tohoto sestavení",
     "info": "Jazyk nemůže být trvale změněn v místním online monitorování z technických důvodů."
diff --git a/ui/src/assets/i18n/de.json b/ui/src/assets/i18n/de.json
index 8a4b89d1b8c..0cc61c2e78f 100644
--- a/ui/src/assets/i18n/de.json
+++ b/ui/src/assets/i18n/de.json
@@ -579,6 +579,17 @@
     "CHARGE": "Beladung",
     "DISCHARGE": "Entladung"
   },
+  "OFFLINE": {
+    "EDGE": {
+      "LOCAL_ACCESS_CURRENTLY_NOT_POSSIBLE": "Lokalzugriff derzeit nicht möglich",
+      "DESCRIPTION": "Sollte das {{edgeShortName}}-Gerät neugestartet worden sein, warten Sie bitte einen Moment, bis der Neustart vollkommen durchgeführt wurde."
+    },
+    "GENERAL": {
+      "AVAILABILITY": "Der Onlinezugriff auf das Speichersystem ist aktuell nicht möglich.<br>Die Daten werden lokal gespeichert und gehen nicht verloren.",
+      "MORE_INFO": "mehr Infos",
+      "EMS_OFFLINE": "{{edgeShortName}} ist offline"
+    }
+  },
   "Index": {
     "allConnected": "Alle Verbindungen hergestellt.",
     "connectionInProgress": "Verbindung wird aufgebaut...",
@@ -863,7 +874,13 @@
       },
       "CONVERTER_RATIO": "Primärstrom (200–5000A)"
     },
-    "CONFIGURATION_MPPT_SELECTION_NOTE": "Weitere Erzeuger können im Anschluss über das App Center konfiguriert werden."
+    "CONFIGURATION_MPPT_SELECTION_NOTE": "Weitere Erzeuger können im Anschluss über das App Center konfiguriert werden.",
+    "CONFIGURATION_ESS_LIMITER": {
+      "TITLE": "Dimmung nach §14a EnWG",
+      "IS_ACTIVATE": "Möglichkeit der Dimmung nach §14a EnWG aktivieren",
+      "INFO_NOTE": "Um eine Überlastung des Netzes zu vermeiden, erhält der Netzbetreiber bei allen, seit dem 01.01.2024 installierten Verbrauchseinrichtungen, zukünftig die Möglichkeit, diese auf eine Netzbezugsleistung des Stromspeichers von 4,2 kW zu dimmen.",
+      "IS_ACTIVATE_LABEL": "Die Verdrahtung ist entsprechend der Montageanleitung anzubringen."
+    }
   },
   "LIVE": {
     "PULL_TO_REFRESH": "Hier ziehen, um zu aktualisieren"
@@ -1016,4 +1033,4 @@
   "APP": {
     "FUNCTIONALITY_TEMPORARILY_NOT_AVAILABLE": "Diese Funktion ist vorübergehend in der App nicht verfügbar, verwenden Sie bitte dafür die Web-App."
   }
-}
+}
\ No newline at end of file
diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
index d607f0c53c8..541fadee934 100644
--- a/ui/src/assets/i18n/en.json
+++ b/ui/src/assets/i18n/en.json
@@ -598,8 +598,16 @@
     "VISIBLE_HERE_AFTER_INSTALLATION": "After your {{value}} has been commissioned by an installer, you will see it at this point.",
     "FIRST_SETUP_PROTOCOL": "Initial commissioning"
   },
-  "LIVE": {
-    "PULL_TO_REFRESH": "Pull this banner to refresh"
+  "OFFLINE": {
+    "EDGE": {
+      "LOCAL_ACCESS_CURRENTLY_NOT_POSSIBLE": "Local access currently not possible",
+      "DESCRIPTION": "If the {{edgeShortName}} has been restarted, please wait a moment until the restart has been completed."
+    },
+    "GENERAL": {
+      "AVAILABILITY": "Online access to the energy storage system is currently not available.<br>The data is stored locally and will not be lost.",
+      "MORE_INFO": "More Info",
+      "EMS_OFFLINE": "{{edgeShortName}} is offline"
+    }
   },
   "INSTALLATION": {
     "ATTENTION_MESSAGE": "Note that the selection cannot be undone afterwards.",
@@ -870,6 +878,9 @@
     },
     "CONFIGURATION_MPPT_SELECTION_NOTE": "Additional generators can then be configured via the App Center."
   },
+  "LIVE": {
+    "PULL_TO_REFRESH": "Pull this banner to refresh"
+  },
   "LOADING_SCREEN": {
     "LOADING": "Loading",
     "SERVER_NOT_ACCESSIBLE": "Server not accessible",
@@ -1019,4 +1030,4 @@
   "APP": {
     "FUNCTIONALITY_TEMPORARILY_NOT_AVAILABLE": "This function is temporarily not available in the app, please use the web app instead."
   }
-}
+}
\ No newline at end of file
diff --git a/ui/src/assets/img/fenecon-logo-dark.png b/ui/src/assets/img/fenecon-logo-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa662b4593a2a965886eb55b8f6267411117e911
GIT binary patch
literal 21590
zcmeEt^;=Zk7w^y|AX3suN_Urp(j9_yOLw<`Al*G6QqtWFjC8kj2}5@`+{635f5m<7
z5A)1<X3pMc<!7z6*E&B`l%z4yiP1qI5T>k*lo|+x00V*Ggi(=!Ut}wNyn!!7OL0YU
z5U4s9<G~mS1VWd!l9W_&QInRSl>I2l%OSwa%fiXZ0RqYV0IPdwCteeXu3npCYe~$V
zRHxbofvBj<Q2Sr&{Cb@LG7fqD=0i_tIJy=dK2Da5X7{(h=rZ8&^`GyXEX5<jzeH;4
z@gGqv71jHBA0Hmx&)&CfXKg=>dW~TR;=G}Y-}+?@5>N{j7M!DqRhH=<fCR$h%d8<%
zzTO(@v_$Fwfld&-JpEm(#2(-(9YF9P$G@yJZ~Fc{2e+uueFjm+gVw0tY-7O1se$@g
zHTv;D{ck~4>a}L*pd=8;*2`Cd3RHp#I=GM(MFPzgCoU0!=6;bDqk^L0K<V$LY2ZJ!
zf{ZkS)R^I+ouHp(AE;Onp%rj}It`rC@PQB{kb8`F9QFqzP++<Q^Du~#A08x0jyr-t
zsetg4eX?V%*w8VwNd^uC9ZDWam7nCoYf2s`_BcCPTYtCSX<IE}Ovv!s0u4r$m6}P7
zE3=KDF!~AvBEFsY^TaO}x4i}Xw`H+ydwkLJ>&fQCflBn<>FQHk6g(p6wbIz}g5l=o
z41!}HT$NjgO|dR$K@0SC^;Vy25$)#}^l|UoNH6|}59HaoD*eJ_r05tJhqNZS5cZ8o
z(PyrI4r`JASHQndi{2+7r;HEj<<Pv~M<-)@_X@R`?IA=74*TnE>ZiWYfX5hyiFNL3
zJ!brfQ|%v3DpZPnUd?LpQtt+m*Wc_0aGp}6JfbCfV1mlND?^nUQ0j+lq5em3@R3;B
zlkT7o{^u-F#2E3Q*OuIzUe_Q{V#jUl2PQbsNNWBD2-LRoR_}Kbp+YYz2qg70h_Ol>
z<<%d&GALHoAF?(mA-plN)Q49zP~q1S$gn_C^xU^8;zSxy!8yeGDg@%6I2r$5*Ztw(
z$J}0fqZhRANQi9oHoNm}+jlfX@qScX<9CALI3_W3RHLYb=`n~@#xmRqf%%lX;drW4
zJ^jx4@Wm3=@%l2<XDrTm0?~RO?&22vDLEq^BHE-ml7ebf5vJkYJ~aQPAdcw$=`!KU
zjjbP;^2=s|xQ<*Tu;EwHg#3=1E66V*#x!t(1Ir?6-dHax?4!{SZDP7U0@F=x9<5j&
zQ!;HncYG3Pw(&744SZxE?g6Sn$m>qqZ*g(b+6vl|ziAJs>)y1Wentxp;pn8NO8l){
zN9+COw%gN0usTlrQyJaSJMwqgv<CE8xQ2-`G*|-(FeUVNv~irW7_v4pi!v<v>iMFR
zudT8a==S6623BCGHGyT6squ|**m24U_XAz9Mm)iu@O1^WUo>j@NpIwM%*8el3vxIm
z(tnnyjudB4qn3mV=6sR0`{}O2rXE&|%k7pyJCaEtIh4<m_jf$Q%F^okE8DJX3)*rp
z`N!1p)JdBil-=#!;0upenBOsj`(#Ys6WI{?5EZ>`Bw|ZfC`6h{P4CxWpXDS;w@kxM
zbI{agykhjlj~{%KESRj7?4P_{qM_-cDfZW^1Vf`#6T8$v%dha0X06IbG1@di>EB{9
z&DLVxicvKWwOExgRl~e?!^dxTrkFL~LqGleE|aHW+Sp4J{f?lQ)BIFhV#ZkuVV~J1
zP0>WR=Jr6r9qFFLoy|u<UDBn*qRb-R0=(rk0*BRGy>=onpCvc?ZWMFWhXsK}jHP<U
zy4<4NznpKud!c>7<k0z$;BbH8*v%3A0n7}(6tok(c0+67ZBcCrZCP|1+Y_BK-S^r>
zyBxg4+FhQIzO=i@yCmE@o;jYN;A7`T<&7h<<={6x8ICjEu}QOPnm7sh_Zw&EYfF6h
z*SrbYJo+ZOqcF=29#2A1i!ujNlQQlV^CcT$V-qXR#r*F49#}iWNRmy4Max9pl<V+t
zKl4)AT-m@ujKJS4n{4Cu`L@M}=+J_XSv_)*ypeq=3n{)sNGXab*JWv1qFP>Bms+!B
zvNL-7%=>mTpKVo0K4-ql6wDlI_+6e^-tC@gw~Dup7t1ioaH(#;z;W<!fPRp1fP5%$
zWqd_@Wp_13Hca}4Y(~gc$k*A`ZP?w`v28#9A9q)AcX8M5XG;>xTo>>;4`HEv+|Zj;
z_f$f4yP}99`yB6~<W1tEmdX05%e>6i%%$>qyXoa&ksiO&dqvhvk^%iLkz?_TlWXmD
zr{N87QD#x+dE7RefxCf@!99drxi*U~dxqVvf3aJ44Kn0oBq%CkemA;{AlfSmpW~eq
z)?V07wJOq1?LXt6?vL`2eJ^x3^cZ{7@z3jw;8Y382<{KuCLAP)IH(rE27v-G9kBp~
z2Pqn<6`AdoD89riG)x@|=R^l6;Tg%TDc6!EbH)VzASxLD3&|b(Fr5PV3{K4VG1S%9
z{tkt=3cJG%sNrkUw&6__Rz&H9w|;mGjGQH`d#ZKnu1>Dk%rj*$oqJ12%xP?KRI|{c
zb%V3JWtp|Dnyu+UW>a8ONmGz#*v-e&)HklUG-!uEVBK@wB0n}<;J0lvxUygw8Y!-(
z6`M=HnhCddM~AXKgmrjy;(Yl-)83@kh;0T_N~o~CRo*PJS0uwd3&{*s{@DI2`j={T
zW0Rb4!WLL7`HFv8$WQX_>v!c(ZoOP+%4$qr@k9yD)aQy?QZp-MWAje)ECNYcNm+Sn
zm{uuuOtb8b?;DjZn3xhVVP0EygCvPzgV!+XTbJ`ieA`fkiM%?s3Kc8@1-9Qzp1N;!
zJ)2}8GGC^-RxO_PZmBW85%@yls#Kb)YUi3fbxzl)IzF}%P)Dj0da!cntF@SUTAfV#
z4SgM|NqJOR*H+U!v-Vm#i%|=nEGUp<`u3SSxj1QH$iCv@OS37yak81_v32TSU9A8{
z!eqlT$FkoQH&vgSw$?u@8UFRX^s-x6SdnWSJlvPr&)>H%yVmKbl!I7{{~iB+f>};-
z8ofzkXeYPgn(J+S88cEhGB|?3W6X1?JKRvVc$UkXcjXNZ&>zxzEH7<rpQl@x=~(vg
zImZen!xvgPPC96-XY%}P1NrE8X+L@NZ8?_Mgruco%YV5^+C#Y~JJzSb2j%MH@xHaI
zgY8mfM@J2sof>a6xs0IWW@eznLgrzHN4?`0MyyWp%|G<3g}y!;Dm%HOT}xdftLXua
zm#F(PUQCmM9d2bTd3HZVav{e%QF&l812XCM#%KRyjtx_{KAzam*+0SWMNV&F-x4>9
z%!;zXN@60@=}TVM3J>Wv`l|X6OUbcpF+$fPg+{~cf%BE^SpAbW#|x@!lSSG_`Erp8
z5ov$N$A2=Fx(@s1*F%S&g)3Yy6!(QDj;8|dtf7BhW^ZO$^>e%+$Grz6jrMfQq)oIf
zmpATLhlC#JM+!^&-m#vQ5A6$&dnk9<djWM%)#gyUwHqU-(O8!b_AwS(SoTxW^HkWs
zN$Fwfzto?oqhrAo6eO6$kTbK<#D7IKMYv;w{#wso`!1#1tB>pV@?+W$b0-+Lkz*Yd
zUd89m$EC%Uf_>C|6m6qkBBzB9<)e#!$4$pAt9=lP^!E=Ro>a~!?o9iN#+9!{w|$=;
z*sep)?^&ez$ABc0(o{xG5d`w41AziVK%hI|r@$Q$$c-HY+A{)y1k*quLdUEYRbk){
zG)Ea77Z8Y*`sD-XSs>;P<f<OBQsNq(S%=FWX<+m8o73a;Yz1#@G(=QN+SmETMutgL
zEfJ8a2&VTD;lE67bv*Px&K`ZKF0;dTb1R?I!oerlRYQcArTicv;mzqcdK_!{>3dxI
zu)y(o1J~-98<=TeSoqp!dpMoz_;FgU{>#S%8rcLI^HPRm#Fq=%jBw_D+Lw#LAf)F1
zei5jmOntdvKp}wrck?Fno8HSsKB;z`{L4iW0*3R;k_2ZXan_d$HLU-?$^T<A2~KIl
zRbfp5-NVTT`2}r;%yza0m3lm`SFSc>^BJ^f1Y5Wt+!Z51y(Fvef~>nq7XvY&jX`4A
z0aaf@TN~WZZ|RT6cJId)^jrB5=n<HLS_6f`p4#E(@HoU?EJm*TTiYoaJSiNhz{U2v
z5URGC%t|meDP$kT!P}AEZY1{RtOt4tJ@}e_w6Y(l9w-mTi2qxI@nJLQu$8Ib5{`n1
zcGO+M$)CxQ+7Z){tV%RG|HX=}l$rZU#{NKYgXlrA)KTAJXLH;iKj7bVpfqshLA+*_
zAwMo6PmL*ze^a8Q&CCpAlDHon?Yo0AgNRyhm+(3j0ym+N-$iGTmOy$)59Bx01UoNw
z&S@gP@-`b$7}rzK(G$$^1h3b$kHXgBz!b1JJ>svv=<zshza3d*HrXGbU}tBtIYX`m
zK;6J}LwwF2oB{kp+xMneGVd&u14LE?f4B$Y8{N*f|H#!KfNi=lJKl|N{1jZMM7AgL
z)<f~N@i4sT(Ix*`0I#TM{CI^bwBKX_A$KpAWyz&{-a5oS8O<X+zN_z`R2ULVXV*0%
z%1ty`;IH6HXBT-&$_+3?)`Ry&nbY>TdLg}zB-xs0OH^+VS{wKop=f6ANPO)qx6d3}
ze_)K;P)afPXF#kuxnN4@t2Zp-d<=ejI!zMtB&YrS<gw_3@>^?7xroiwdy%?u>e!mj
z82uTIn!JAQl`qcCmI~|3{z++l*~yY5CybpkSI_KECJ&-(=OI-7hHC=QK2(y7!)p31
zG5as_F1U4gCz_lPNa){1@1~m+l-_e7LQ&ur!o;$xm>%Y%v{TzrxB?sB@CM(%J4yO-
zo($}rua93fJ;^#sO*(%`+o`m>amuvT1APinJ;-_OPDIgYGjqIFRLWa@JnfE*!T-ag
z>Wle6l6$-NK7#GuZe{%~W9PXSx+Cbsy|=^QVIKMnFGd~J@`7M$`po^2`$!>Fr-{&&
z4cl|gHU2f4&X(<LZ?>m&lH($^pp-(BcBv9*)D^+e{7P3}MTeN|Z=oP;oEdOONY%!j
zXBPSc+>Jx0pxcWvm&kIImj5_>-5Gx65hNX5JK}-%@gEafYXQCU-<HD%-%E?D%!Sdl
z9iLYU#D};HbBFcFC7M^6D}Ng8SD_+{KBjux9f5ryHY9s;%gpW9GsyvzpWt7FONWJV
zW+D()wSQ~1@o;w^MEGX(FS!F;v-E1aDS}_{Uy<k-hiEs5(_6Rv06BRsZ1-!IQ<i-b
zgX6^ztQhRs@hvjwGhA4Yg47Go8#R<{--$ws$8ySZM=a6$y!GF3#jpHf<P&X5^h(t2
zBPK(+L9C+Qs_#3AnGoerDd%)hV+t^6jSjk@N7j>h%hBPKWf(x}h<ma%_d^EQ(ONiL
zGP?s8_2Z=hK;0pf2pT&nQ|R$?5Ned1vYh485Sbiu4p{{qAY5?8fER7X<@oInbfFG?
zcb!)$=pqQ3E%&9a4M!ZuU-XffQJxSy5BV2;5k0Alw<J=w>tFQ5h=XzF3&!wm`Ci!p
zcOz}&Cb;`S9qCI3<HoX%AFZSRm*%KhBm6I!j2gdY*Rjt9JL&9KiMD6O5~~^>h@t{e
zJYKYe8?HWcelBax)Ej_C`Z1!X>1wAH$`KXt`0xZEOyZ>63omM3I&s?@E+OYVefucT
z0jQDS?r-E-Kot%o+p~=b9rUCh>0dSruoTaRu)$Xr|J!GS%T85eEg4%4G%dFCyD12%
z-F)$Bv?|K61<RmX>zg}6oERSU(<Nk5?2EtSTdmOI-F#}`j$&Kp{@QcnPJxXLHw*y<
zm+YlUDIXVgV(IV#i=ST#Ak9ApSkgPP96;GBrkOc7G17^EDRBSMiL=}&hw1|R+B+|x
z+Wrq@2J)K97hx%M0NxmH&SVR-J_kUDtZiM0s@OyIfMqnvGF~MWXM%7|zk7Md5P0+B
zhSFvZ4>piG+Q1c0e<tx^`j5fF&#8^I?WHM1unAv`8+S~@RdMYYN?@@SJd^TYO(m}1
zkdu~h_HqGrKHIqgSpYA5JT7WH<rY21-m!)JVPwvp?9DiYWL=#vHl6<Ya`h#0s{rc9
z<NL@d@s90fn{Oo=@^xBGAr&BU-LBbHRAyy{R8_yDLO0)wyZarY-!-ds?stP4(XrzT
z8peMc$QLr1vfTQ8M+JOE)pav#75=^Nto~ZhpW{ded4UDA-fzMp#~@KaJOxmF23U=5
zhc+Z#dBs!gbH(E5uTfqLx4Ln|NfTdfdG$~h2twJ?!bmO`{plSw!AVW<mPLAJAKFKE
z7A(4hg_rcj3ci|Bx$j+w{-li)&PfBFvsVbdZp-a>{q^ZaGKrOqy~)5dZ^?(eHax};
z>II#TLO%23%VWj&!)y9|%v<9+i8XS@EbJYCjUw>BFZfUD_(@1!g7$e0@HRs1WN#Jd
z!C`v7`v|_Ug?sJAzkPWYuHy^S-A2Lf$Qg{rez#=0E$J&W!_8rAYtcho^Ggp>YqLBJ
z&7d1?^yU}iWPFctcC(jW;!oh{gx>tHY?s;Uxt)A{QtHE7+f)mlPyD5zEC%mMUBxzz
z-R;X!4^M*Dn)*yB`!l5wJ=5n-r@20?@0cg~nzS~pk0p(mc7Wp{zN*WgWh<fU=nmLF
z;mlZ^d{%EQh<I@c;UH0hHQ*X7L=HRryfV_z4u_SoB5wW_#-Hn5xH-FDFzsG8NBv6K
zw8O=Q?=e_&<v9%^uwC`VB6;>eWo?Ui@d3}%;{TFO87mUGkKtC=OzBNP?Yq%%+4j)L
z^wpulv42=r<A+)lLKX?_;7yy5RUjj~N_maz7ZeP-#<P|oE$4v<6zY8565ZdAH!V|v
z8|wWpX{#EXPF$Z0|4A0{Vi|lpp;+=-3#JhN@tGzmJ0y6Xti0MoWz05=o2p$2r9`u^
zzTR;>3Tx$V`!Aq=T&9bow)z;}XM7P1K;yEZX5!?^A|%fGZ$%>C>3XBQ?Bd$M%Tby~
z8y&saVu~`n_a*o*qYHg~4J05A<Ec$>#AVh2uA-!RL^OoqKba9{A$gGwp$XZ{nvgll
zqBnz17I}1=+#j)06b|1%&aYeTP`sL&t<-Cc*5!3C@G8EZo!F9`sEq@}t-((KbJEk0
z&Qz8jGYMJbb(@%23dy{Rt|)$kevYrJ#?l{vy!6>Lvj-Zf_CL;pwBzU-@%W2l+%IiG
zeD)sphZfHA>eDX$#1oX7_N!TU2lrz$6I+JAEZ+g_6{|4!C;B*$+4+Bp*jDtw)X=Ff
zPh}_{vC{u#tYB@w9>Y>h2)oSU2mqZ-{}0L;fk0!n1;<vJw>(R=eag<%;970r!<MM4
z{&=ON#C5|eIE5};ULFeg#r%R$+zc({0pUre-~xo!o$AGaBD%f_r+bgCub@59xKmNv
z9qd_38;Y?cb60k@Xyl14rPRSU^6^zyx8~Ff`AoHRS1JFU*fKLRK9B+y)8Gdqd2v=2
z=Z(Y$X<&C8eYN^koM6v`<%`!ue;D~nK&%`J=t5BupRO@q6!J_6y%Jpbdrtg<iW=}N
zUi2y^MIe{`uh+|SKMwY)bQ0$SzMxzmADCPCSg)?51e%9@bE5c({p;x6EV3;XDdzQT
zxD$nisj^sXrda4lu$`5@iMH5@*tCD|O=;kDx3ct$sjV>g?|ZnD*|h}9o6^^mGL$O{
zTTO6_x@~*`uqAGNz*08|yNE!<JQ>~gkZi3RVj1@o0uOr1T);Sk1k%H$_WW;~?5rAt
z9IQ@MuX0udwbe<IHCZ3Uykd!r9?#uNERFQPE1l|uibHz|&ls;}CXRAU=&1m4Fa!|5
zF1@hE4WwJArTfCjI*b^lhqH%!kDkg{br|v2+Q}eURgR4EMIL5u^CQrly|33MMsiCU
zFQVKW`PL@NR#LmnmS@57{b~!H{+KJ+P2W#Pv5z&GahywK6A5K_^ltLfbx;95n@j*3
zSR*S?OIf*Wwzlh5*Gh7u3)Aa$U0>gQaR>IDwo83GfI;XkSyq#$_e|=O9r!Stgy%me
zYJOQZ5W)kiAM{nP$lG#1OZqtF^>fH-zjXls$lB|ip8S;I0K^Kq19HRCL{#d{7gHe)
zLGn7>BLb2Qw`u0y-CZAL53*ZU<WiM#Edi(FVd*|N<iKaZ4r$iV;$7l_1xeHxXA58r
z%U16qMtbMX7CQw8htZA6(7zf%S6g)cp0mMT1&-$6!#%&l7iJhKf!j&p4|Jtl7X$Ct
z3u`P_ThGPY-4=tHk8FqTCPN#4*G4NZH^n?dJmkq!8~-bI&BP7zaQAIJGy#%~eO5uo
z_d~>6%Jy!lm&;%6OV}&(LK`1;?Hew!%=~U`ejf{;bp`hPU+Qpy$2~}b4=W-wdiZ@$
z7JPId<zcspx=x9g(!^z2I@|@(x_rm5u32+YFJlBpd9Ym$F&EAYrMK0T6dhQ5Z2b-q
z>HXPD)diWAOD)+5MasWct$j88f;F+SInvoy??4{*yQ6n!0p+#J8^0_72Olg9b$oS9
zYJ^ke*lmi#9$7_Hc73acRtE!r_(6)IP@K0+=_m=P@uIz>%os?D)#P!5H8IYr73{5k
z1yl{TK09Nt3Z6ol*&aWy^|;juiM}}TrV$pq!wv^nMM?=yFi2}pcY((M|0mH6oug&M
zZ1L<0GzjW18DJ>knQeiaU8M9gTE(^T^klmP-W6NKJIF31-HQb6o@g0k38@Uxp5m@4
zpHwF<b`{O7p%vGY(t^tLwr6kTVN9Py!1fAO7IDfDLOwrdSy~U$4RVX$5FP$dKRCHd
z_Tafm#|rV`0<4yLWGGtW81?oaRL{t-TaUZtA5J(!Nc{JI6eW!R3N6oADJY(nG&*fO
zVSOm5d`jx>w>L*oQLC>m;PfRaNQ$j?Hbf*(k5TN&jssYcxIDj_6?RhRr2bO{FE4+^
zhCd7;8L7_B33BpZmQf5LnL3p8;=x&|Z9(HJ<%>;7q^m$TwpcnDGog=t(6J=V2@5k=
zw9E5tUwJ@Atu#ih+`goK(x)MV#zUPu4c>>nMj!48xsDLlmwrO>;xfKkG(`;-lZHo$
zvvqC7OyiBITvVF#yg}}aFAJb*qmUbnL%O{o`wUq0Ec&di%NXdm!yEIQu5nWDU1a@+
z1Imijd+o__qz90v0K*D1pQe$P4-*CC$v?YpmYc5LjI*nB<yWzUC(9GF39EPiDHIot
zPb%!SV5Wt7wpD-)nt-J-;|bmx8kEzB0Xy0?S(fjgh^=&YS|2<c9J!*WQc2XaNEy-`
z+7jHun;YxyHWOXchX@sw=@uc2P!;Y6p_86|ufNu;xl@nYonw!pk`#;el&kfLXyhwi
zybA;+e>p@6hd?Kv)}|N?E!(iDY(wr{*Q%ipzEeb+76^2$PQ)jqYgQquC&CJFG34HD
z&O4@jpbn6~)ceUud-8YJeYk?&)?Q-7PYbPRU>rk~nfy3Y=2gligsYi}2Fx1-N3H27
zywDd3>07pTd>k=(wc6q*GV3t+hvU4^tlIs-b!}Cxy_aUq9BQ$4X{B#gg^nSl+icv0
zRiV=X?qefWE^;>U!1?sN-z+OYfN_>~h5SV1iF5Kh%SDzkQgx*d!4iIqF6w)#K1S|I
zgl1g8Yfs$}erY&1#1#e4isSItTn$(fmI`m~`(*N!#^{;JyajXDl;jC4!Q6=fmUDO#
z($n&2WSQo1mo4o`P=OGiOku-&QytL@Pm+I0KiNQr13Y;XU}WFO(-GviL!4_GYs=92
zkj}Pna``k7)yfL(AMYz_qV8aJhI_}5;RCw865wzGNIXiTm$DOkK7JQwij33<ywtC@
zT!}4_dz^yBM5XmfUHcm$osbV2MoG4G*j^*IW9uosjs6+}<hauL{M&De-cszUtc`{6
z)PLmqaQ4l@CQ8cM^^K#5BicU?9U$DKoVCo`(?^Z2%D!J2REv`21=Du1Qa-eM@%6Cu
zdbp9En0Intsk@Ate?~zNd*{U=swQ-j6B4scCD#(gHAeJ~I2cd}Y5dQ_h_5<Pk}mFH
zF~`Gu5+OWF#l+cRp4Sc8b!<Fp5HL@e^oWUxH?y(8Kr8B06L$j_+WxDYOb;rCw=|=}
z->}xYaMlk-N!L2mB1GcrUPnaAqfrM&)5ZF|Hjr!@yM1fCS4F;y2CWa-Br-pI5J+O@
zI_^M|7mT1B(a8||qtpGL=a8oVJRH=PJ&=`m@8O?rH>f(9B}R0|GV>O5@c|!Rp<DrQ
zig=E`hTi!_^>DrqbqfD{#kY7TTdHMj!sRq6lm-jY9+vA?6a9Wj2M-0l13^@JE=#fX
z`dw$svh+4shGy*DLD2cPtn(d^k`l+$tIlhs!4QD`X(6iS6vsBHy@o5SDr;SAaJj$y
zzE)_=mO@Sk&Gr<1dOb%xB*VlZL6duxPT}L<Y_g0$JffL@c!($BLrmHxg#K~PgF>qs
z|BOHrxmpZ}cyM?>wXz>esj(B?uo@SCHo&5JR9eSC4Q);mENwg$Xc~1d?f>f9=-?O!
zlxoaHWqesNDd-;d0~g(C-qQW=NXhaRgt2dYS7ej=2~kN5cv={pc-;q0cDtNAN3V!G
zZbOz6O%HL|Cm<L%SUpQqKgq3@xa;8p-Yw%SQF*eR3}jV+|4u(&Te^}dIugKqc$4ou
zxQESLNsWMjk@zK}-@Vt()XKi3s+oQ${bou2QAmj5Emu665%~$EE%AN4I-1ak5~5;v
zGsBp*v`mre%vMnd4&(>rA(_6I#0LI*tBcO(?~ZbvQjX*&l>&NvrPqrt>HNnOgYihW
z*<>=0BKzrJbI;=#QSyVMB8WgO&Ka|zP`aLt<7+xg7v$S2JLscZgQEBJxYT)c8}9pf
zg0)O9`uJR}!Ftgr{<SoKgder1%@Lc?A=Ed-iU*xXHX({jbO|1BQi6GYp&NhpWzYn;
za##7*;2}L^f=xa*-?z2mzfi-}U%SNMDn~$QWmQsD?m$^;y7B$*qLmBcCL`6^#oJDS
zF5;X<IIeRgDpT`&{hcpoA~w_=yLHi9c%54@(eJkur*wl-rK3L6<rF!gptI62`^BrN
zH)O^MPYdajac0%DAJ@4THt<fR>T`JMXc1Cn{mE>RWl>zJ%}cGY-F~bD;<yI!#?k>Z
ztoc-7zV5X>BYlQ~&p#^ulyxwg9(SebdO3;mhMRDhBVtmo`)fzl6<OFpkr#d3FYGOF
zAaN!jJz9qTeQ=CkEmGnlzweA0`OcoQd04`7)7u*p<k?$<lZ86ANsS<smOFmuD>HzW
zBERPN1ZEp;VwT8Wo>=ylyi)=2_<Y{F%{0!Cwn3@~ynu`;?|f{aLI8sWvsTf_HFXa|
zEiLr^Oo@ut5+37RNg{ek^7z_T_FDtC6d=nCCda$U`G>EYbim10?+4xukxIHHydz2e
zUZE{b-N0z*UmVjI>nilW*2&vs>_U-4(RJ^{7yW*jPc+djXk6y2kK_>1MxHU4{yBZW
zCe?|o=G_#Wo<^2Z9V_DV&QSuE=HpD^i1N>4<I~T`<!4`BgvB6mp07W1@CTuPw=I=N
z3KVCgdt&5`T70-M3Xt>@;c^;b?8lJZYt2sQ==2bgxD>2ScbfSu!e{%n4d~XZisX6^
zgl!l&gg6n9-XRcJ42;x=rLJHU*O>!}go+yunJwDv%{-+7X^og7a;5M~wUAU?LgnoN
zA9J^;{Z-m#BAH1YZq<B0uI6M%m(L;R$htv3Z+iJfKT+k)ed0&1K^^;BWzl(E$#yKY
z=ZfR#x+04={sYiiVw%u*W%%|t94lY%f(#MF5S~z%ByRo5#j>3rm;&Wdw=-s)J1)a;
z0vwRZF|v?_Q(cv<Z$Z%llAE?`hujvH!Oj-qq7CWOt9ecSJMrl=h3J-Kg0WowwckR)
z<r+f`jGXj94YIep{SjqkVB<{ILRCBNcs@RULo=xIjeS%F3VA+1k{3oUb(KM6&?EIG
z=Ya>b5tT3LT0LvqS{wJDPYcfr#ds%XYuC4hs{G0kq?K~-!&#A@dL=s+BQL(#)6Peg
z>OYE2iX82Vc5a0j(tAmpWGm4_R(r(gNqMgCQLB*y#V|!yu(HJY)kUK_AL=D%-|ye=
zea%4adjh9=P+1ETz)W=&(q=SbSwb?$6u>oR$V1y9^)MHqFLI6QsxyosWP7n-u~79?
zSWWdsFQVN(7{Z~d5iV5zjJ}2sJ;X63kUb!&B}7>LL8=~m;j}j4MX$;p_A$y0=|mYC
z5zY}=f$J$RSB-+YAN34oCxaYJE^uEcbmCZB-6H4KUYJ5j)WV;YI*(w{TbCil`<X7I
zl9;`U%e@Wn#TSQXVq>Q#mb&M|Ml2;i8&=;PVU(y9S2dKzrixi(9V#{p8v{Z;2nAc4
zrYp8>v{uk5Y}-$pkgk*OpGh$H);iOiBmqzqhh=1+ug!!ic8y#7HjI6_i6^w_SyFrT
znT`7s$J5tNoP3T$nqlADFR-RoF4Qb#L6YtEcvnkp*zThj{m))gK*=;nUJ3DIQrR7@
zyz+$&we=p9m3VTdHV$I<3Rc@X_alQ$p@-8QM-HO7JJUyQZyZpTQ$I$in{iR~G-t3w
zKF{B(tf1lbYjlqJzpDI!S7bXm*R&@It+gr}jsBef`uqpfjiH-tXd87u&(s>}iNksL
z7k_H+p{<G%bAKN%oA~0=%qUPHtVc<YZ2md&FDi@8MYr8K+Ft4+WG@wI4B9H67P~C|
z(Ug}FZ4t*m^r_+}jD#>oy^Mj1P&y*-R0xaDgJeeOQGVo83(AdM2*0@tbCm-uje@F-
z!Jd08mh|}5T1G!d-@be|MRI^F%=4q_I|bd;UqBJ0n}BncmRUM|P<>uBF2ugmYj65n
zt7{|8s~TB-FTs`X390(c#Bcv>4|t*<_1itk@#_lQVl+`Pk4>XjIgx4d>6+nF%@-Xw
zCP@=aRDJhw(K=B%5=$<{9VotBCT-qXvP&c3%2X@1$#X|kwof;Of{TXX2viaM-+XOl
zXL8NGVe=JF8-;EPb`I}y%qKR-HG)QG=tMmgqfBLR=Tm;#mDMK@FAu(iAOj;sAlgog
zKsTp5L{GKXragC)wA^;$r@=1|uchu?ka<vr{o)rfDPue-2|rB;Z`RAj_x#fB$)SnX
z*Xfsacg^Kk9QQw_SH{RDYJN}9GLgdqwCv3$VBA+`R?HZ5^=H7r-g#H6v+f!80Qy;)
z$i)KWlTZt-q7cI>QRhbvU)U1Qv{=`kX}q)QXzh}-^DE=pacu*|tkHO?yRh(TQAsEN
zu?J8SwMkndRd0k9IlI-)u~-RLFVhLRLcDfdEX#nBp=?B%RJ-dC!f+-`0Jfo84lRoz
zU~T6~RXh!|lO5-6T;8FJ%YI>*?x(;pjhr>?2T1HUS8rY*E;Wp5XG|!Fw40gpGiWvT
zZKcc=iFfx|e0a6Vjc2!ZpL7)dlo@%3ahh2%6om>#1(bogXlW@wAGc(@reT()d`>`9
zggI+zp=x=OL$kE1sWw`ya=CZxv%@G;G>yoHEHC-=jkXaZ2G^&DM|re$y(D&QB;3>O
zr&AnLo^_(>E^=IsnH;ns%?Q|H_kNsUlnE9o_xZTbQNeTo=VW@5s|pUlqdfsTz4-mG
zbic<1=1Gvvk@-<R!5C$wcmaIvg6<8J$7Y9QxPXLu;Osk1rK)TXhx2)!O`z^xlndSo
ztb6|JFDp2ua6B7?lht?={E2EDQ$K2xGVKOXM-*OZdehiv1@*8eQpEN&%9uQu-0(MF
z*D24hezGEa%QV02b6T8OW-C_zbdK^CmChOg<q3VG)8lur@A;Kp3MQRbIZb-cyJCKK
z5iy~G@8TRqS=J`ny<Mq_G)}Vl{2%LuP0DgUM&YYNibM{ShPRmt8K|G01`wS_J5`-&
zlNSFC(Xxve-z&_5E0*W`_<#;l(3H^5n0-<s0zb)I<_(EJJ&t?HGr6M=Y%Z2vySxS%
ze==;}gfno2+6wA&9+t{+N*Ht(8zortC6E8%eegfQT*IBd=JKa8PI|Z=n3_a%(&*L}
zi+)=Q0QgjuX;bpL;%ADh*6`{SfU2n|oB%`lrq!}*jlcj}Ta)*HdjRHTF~ADa{T*)i
z$Vc-tU1tK|S7uzoqDV~{RX<cRo<be-9Q`r~i{XLeRLA{7@WWm9h_FwG!u}G?5Q#;%
zoP=7%0xCF*+7H>&1AHp_iZt~-wIWTJbi@?O1BY4})t6Vy;duLlGES3@D7iAxrvW1D
z5>ea=%bTkd`A^>-Y}d+Z7V|&jrm4?JH|}Fwvy_Bv1aPV%RjgJ8?;f(~;BSB&s2)v7
zJFRbM)PM9=5*JoF><s$4EYpDb5(BTaf5;5}tr*G|O{Scw?$*UE>m{_AzW(GaY)*$D
zPu<(X3rxCo?`hBHnAj)qd!+^#qAbNx8bH8B2}rkZ1+O1y^Y-YwaL%mj2frVQ3hHt_
zx|7HKtG^mur_%gc-u&a<<I2LRIlcwA4lGeKN-f(n(K6IQf!LlwX^`;E09Tsnw6M&O
zj6q4Yhq>P&>MaxIXQ>D->^XY1va|*F^J+et@as=T{@<=Lpv?W!sb-j7$K%voEQ<J?
zE0n?mE!&+2rOog*ttM<?t9dkpSy3ddve729I3zOezSFAE+BbEx-BoyLWDGNx@#}bh
z+vC?Y(55;g4`#xvBedg`=STWj^PW`C(2ZBIi!BIXdGcy;*sqUY^*IgvOR8ladLFLO
zL=w#4dajn?l)!3zE}$y*b>}mwCBM=7mKKv>qkI+lmg!Pa+l9cUcV!v+7;jQw{;^v-
zlDap-yiRxfnlAj7Dq{Zj=eJr)3jIlj{d6{|nUMPZPbvw6R*p%r0qo+#v`{Owh0;@&
zh_^Ow-P#}VY~;=|08P8Hon9flU)MOAK=$#M+CeR!y?;~p7tvf?w1vhp&I9-PEjv#|
zJ_+bcoP6}5#o8I-VPck5MK56~<*L;Cb>ev`#(s}CY-6GE>t?jF^gB!^dd`0Vymyt2
z$RhBy=kb^211&ALsLMugMx!l|BWK|;;qYW>_e>Heu>E1IK|e(Y+7WtXk$Chos!lq$
zGy^g0_aDlnxH+`BV^{~0F2QDP#kyEE!q%k|(t#e0_H_hDHLN`CHZr_&Pr!`v?|<El
z{igU1A9<oZGk;e^;nCYw&oqw#-%P>KMcg_u4Cw()1dOu@+WGgTnG>_{g};1^;tFj&
z+=ptq-c4=Sl!{FaiJ#$w(hM=tBugi#o=FBKn$rII&PlD7^~*smW!iS#EiiSndEqsK
zQknik?S(+X<1-oUY!d*stOLJo3&(5<)Qs(=NpyWsYM2MvMi1nS_f+;WnDE^%Fl&Bu
z?FPDyB#`f?cy&&`tq}=yGHFI`VidoRGy$IRrc`@@^u-{BO<Y~NwXNhh?R@fU$j37B
ze~U(%(eqltTMY;W!P|@o1)Y|F*aRJU#S9@otlb+sfqp4Xd%9zH7p0R!_e&Mfhz3b2
zUYrnvF3GaA-9QC&^z8HV$@oW9YsSA4`^~PUAv26cTj+qXADTxSq(QMLPj6W=do@#V
zhVvP_nTUBmMW}0VSmyN*dnxIb9b4&Kx7@xushsYJx?F}LoldIe)c|%?Ji{X9vYIaJ
z|Bu_=(-Fl-*~*kXv-9DzWbC9(g@!iJ{BlVdv3$1DVU3ObrBV6!jW?zv%luJh6}?>u
zxbd0qSjwFP?Z%_CEcTZhUOn73C}&hC9%xlQVS6fo55?d}aRHhxt&IeFGJ`bUy?X0Q
z*2EyuCfm)#O#-2eZ8nrIi{Gy68Fb<NXHa09`E-dJu@^ft{}dgPE(_F3GMEE^*%f5E
z-?nsZpFbF`jIJLP>7}m3Ji%GiH=eYZn=hi`y`Qj+N$~btL5o^%#H*xqD4NTI6M7#Y
zj^&7zoA{et8et6HpOg*!-F0w0@3%d*lDKH7S>{|!lIyMJL{EnMva%QYRDNF#R;Gey
zdGhA7$YdXC$Lv)}o?YlT+Fe2#TJdSqcYuh+<~x|5h2x+omktC%zmK^hSKbU?+HiI9
zE7+peQ;tE1OK#RH|NYDs_ybybzfh1&1;P^$M3sBwq?+f68AkEeN1hl=t2HCFYbRRX
zkI4#Gw-=G&*`(-{vnq^V^@J3FCw~Jd^?7i6>tPdPZl13{kanTT?ecT_!pyKv*zlN8
zvUjpuEgtQL@@@B31EO6js0i4*U`FX}PvpCquhuUh*h<wSr(33j&63ng`Ak<ODt><r
z+!I}#^wIK@oL8;S!?)sxuJzp|$cXCM>DLO4CL3M8qGPeh$H7K--!ysU{2$v6P=_~l
z&njh78rB@wlvWowXWG}p2xh)nHt-zBp+g2PZS>-cpVyjU#FFy?{F53fd_&Uw*WpO6
zm)I8d)w;!Qm)M*I1wUM{*)|tWjSKwB<>Y7vnqgu8nqd((l*fo_1U7kt;3UgI?_oc<
zK?4_GEKhcEpE26m--AzG@r9E|dXF$j;VE`xQSE~283)g2#---^%xxC%2;7wX{b35X
z)3Q{J>RIdy@Axk2<90Zv_^M@jt#=G#%)@D9C>*iTLqn}^>O?TK-vYP<oMBER-$id+
zN;CiTfvTQW9~@8^ebMEr913t<!m*dVl;f21M~z8Pb}eY19ndZlD&buA=^L)c`5rDR
zT~iOEh)E77mQP>7t4Yb18HBv@pEQ{AT<^3hn_t;~e`_ByaY}CBKE6a171N5Wrv|Zy
zXH_0wsfXd}4r3V~^Kz#w9Y<4pd3<YN>#Bz>U}BshU+tNn&oA(evmXa?VCD$<kJfm3
z6~WUAn<%U0w(*EBZbCOqX{lr}k1(KHh=<Eg`mshYxIH$4w_Y(+GQ<FM&VOJOImhO~
zu&4Bj9cO3A4P4i3ud>y`!G90A;*+|QC1bt)sMN?ADUK2P*k)Wb3s-NCYMx{?*T~Qo
za)R?<3m@|y9P{4|oRYD0FGh34&yu$XDlR{23|(C1)Q~+Q4BI>Ws~>VU6cQcgft7?U
z+t%9*2?gOn7{wR!f{Oa&q|(FPo(ax>*L-@`pV{eaIaC^6<uVuW@e>wBDU%z2s*OKW
z39bUbC4n!75os4r#5{*c*mOX_LyuxouefUOIBz4gnJ*{71D=uA!=_xHnhm>|=*Irr
zl_4N&PMm#0?P2{ol1C36<$Qi{QjrV$mXC!Y5Z+F<5bbhMNMAGIB<EzxMzhLVenc5p
zY6CE6)UZ9yaJe=;s6^6QA0b%5#%AlFYik=kC?gxdp?u+BvmlDG^r3o%O*csQOv!}L
z9mMvotdeQ+9O+%o2yiS`(+I~_R(oi&h6JTOon)w22Ce3$N&jpB%}Ph$pI=KK$zQ4w
z>^EB%3L}`94{%|Nfo5K>2<@Lbgj@qE;8TeHrQ%=|tIHl5pe+m*Tj_{KDD+@w7vHYr
z`^;FjG&wSao!!;0j#2IItDS4W<{dHyYTN=#$zH&TjSBrhv&BE*S|f66c>c`XAEuA>
z0F(@zuU*!DGUv5lM(~(Jz$bdi#^}CfSjFP&qrLAVJm3t=YY)$ZAV7z%Ag`w8^;`Xf
z>~RA0tH|BuKGs6DpzNSehU@h{_(qn`l!qh9R9QmprTGv9-8{40iGxfJc-l$C;bGvx
zN8b?buo0g)w5Vu5hg0)&zOH?L5cRe++@w6{C|`KHLpcVoDD2xXarA)=bOG^@Eg~sQ
zZWI7yp*MAQ1xD(PF=-;{Q$V9qU)Serg+d$AsA4iYQ=|KNiR3o^zok=sT5$0s1uceb
z^crvHdoRe7h!z!NC|NgC5<1T%Gtwe;k5!)Vm}VJCAsJ0;C2LJ1?bmzG&iBo9{Qm`a
z-(TtQSN_>PH}HaA7+saCfK02ZxG@JQQP*oI5978y^@4Dvd*3*oJB5$-s}JbpK*sC$
zO#^PFiZy^)04gMJHb>MKFOKF)Q{O2kC<=Kb=>bP6GBx8ZKj7^VU4StPVV3~~ExY|f
zEBNRHK263Yp!Yb-oH<t4Ad&T{u{0md7kwwMq~>Rj;-CBz!WWJ!O?djL-%{!&t_IAG
zM!aQGtWKeHQ;nMnQ#)Hhv@`7O)}hJ+j*wzmcUww2@nIlK3f`PTxzP4MKRDzJ;CQbt
zYJoA0O2Il6q0-o-x*}f_UoP6eR0G_D!GX9yh9W^ixzg{DcT9m}Gbor;L>ZfGIlNsF
z&Wg-S_w{)NU@!kAjlF2=mLPyhj~v2?<Sm@HQ;yK8Q+z#LACkj{^J)vK*sk+43%S=n
zF(f23W8L_DyP}9p3X5=%%;%3bh;yJ>>9u#E?vY)Ll5sMD^hT7R>!tmC6o6*QH2)4k
z*UiQIFj*`csw*ja0G4JmQIqFdyhkSXK6OHx8(;1NdW>0KGPwcQw0`BlH1h)Z9Jfw{
z)Ke>8Si@HK)77UhZ-LCm4!%JuqCOy>-zu{HbhJ>$DdNDSb0YEb&K9^0AUse0OB|tl
zR}A1Hj-xfVWeYP?<2D0K_}Z<tv5lhMY=sR3&WATu`P8s#?*m$%6q3MW`mfKoKwdab
z9*$R3wcklaL}{?y^9x9H3HE)6_j$Bjx9Ps#`*s#)WCXql$Q3e_^j;?)2AsWARn<n9
zLlC@*5+Z=N#|%Y_5>v@FZgf7#VmR};C30t+zp2wl&B9^A!Jm1IUuUMd<;ecn$f}mb
zi3elpCV8jqtmTpZ@T!Rkh~vF-Qky0K60d|D7JVF`qMcgI@H!2uZ3ZTJSQMlA<P3_T
zEnvU4nmP5qVT#Ig?W$u}Nl8nOP;4NYj=#;Z=`<xI5ik4Z3l}XWM{bkv;RHzN%ZIk*
z4pTR?q(4G{B$KO(x4!yz*r~h-Nf5KCN_{2_Tx$z=uWYmZ=jiGC9hyT4^ik-Z-&u*C
zO{D51ZzHblyq5=-(0c|T<2Ag2=-{?@&=X>{<|_~BsCtK&ieSHaA@&>g((7v<qH{n{
zt8hoM<4<{}zN7aL<d=Hjdv*;Ldt+Ycc`6(12w7KNR67)<_0Ds9B65)PE~oCim+z~r
zsm@0r;9|#|of;&J(WyUaNk?7&25O-9GcJF{PiHY=dDL`Ec>ss|qYH2mJrNL-kPRyM
z2BeqEGa-laPQ9=ptc;<W`9!aurIqhK4P-JpUSE+bE%_i9F{j6S2yXBIVUO{2G%k6%
zDIqF>4bh-2Gxpjf%!pcByls_Q`o-a7XHbr<b%2E0Qz4&USEk|KlgKa349u6uf`9hd
zApVlM@3IvUaU{s-`nZG!h?<exG+gs`zrTf29_*07I;Hy-!f4zQWv;&LQr+5O$woWi
zpKKr=uC`{z9zsQ!iT@~d#yoH^$Kn<J*7_8sd9l5B8oyo!-$LEPnE0If^RRaQu{WT7
zl@}N$o1k587999(SvV@}$=WxP)9EMVBQGMi@)C?2?3Gpn2>M3Y9wLH_)nyuDY+v33
z=-mb)FL^h$!#K(ba<%Hx8-`KU4>tMQA6*Hn1k}n*0e|cwU5k^c)&f}NT}7Os{~GYe
zUbKN$To^wM>2@a}CT=Vy;Uh9IyV>>>ep|LU|9S6`q!k6(s#wEwo5P%65q4Y%Iz(GI
zHZ!>rmM>Wzffk@GbU5%)$hW|iMEvWOaVmt1jl?Sr_YTsf?(u%rvkbaH>u#lPV*pIu
z+vi)u_DTO}dH#@<=8Nqurd9b_p*sg|ABkn+5-6CDTp47@^SeO`iaW`G;klzp9cJ(h
zptpLN7R)w>(FE($LLe~9&5?Q2NcWR;)#I3gi8-`z9(mNVc-O4rO?uqry0xnXeFk@i
zraOjn5j?wCDbD|=G<%oMt0{*0^ZS1r*SP^za$``VmEvhzn`6*9aFUloEzcu}HNf{Q
zzu-h;Wzw9?o?K(lden5}qhi{W?a6n~76It1BIfOWD2{25t9Q3HM@}WDppf|DHHd}!
z>5x((m{IdjS~ZwP$iRq~olA{1{l#|xtNRndvRpt+>i}fHF7kYp{AT3$3U)(6;4ic+
z{rY08#agm4Ft2y)9^D-faobn=-6XVz5^ZEHkvnWSrXpcxLo<^nuInRbdIQ~p!M+~;
z2*6t}4eFkrMbTtGF$aMNnHi*rwxImW3`qb=l6u?&o1tp~@=OD`hKs9OBWI>ce$ONF
zj`qMUdfOZr52KYy3&oAWw=2u&8=pL-+%lkqz<R>tnCbW!rOC|)kNqj)FIE-~gBJ6)
zbd;NUx3+nTndC_P)Qrg1f0kd737eXcua6-$nlF=mm=br<sct6Cg8{*~wDI!fJ2gSg
z?^@Tqjgyo3LT};Mv=|IAe{#bjjvo;1#>h^uKao|Zha=sxQTKW?Mz=OEQab8%dmjII
z%Tyd3-s=D00r>Sic977%tq(Kyp=XDH94{j&Fb-p<H0N&|MN{JrVEFLCR}0<M54n8$
z06;B({g~4iMuCn1AWv^vzi57m3aa#wj?aVZqI-t&?XUTP167Y6*&;_d7gsB(RNU+D
z&tlZQj2XbWU45EaCQI){a{sA6xqv}BgjRg<pX%A73C*wd(_SlE8{7sq^W>(nX?KHw
z8woAD!`xzM9xPaMZhC6WCuTYGYHPARiIB#&gH?_|jr1_7j@tQK3%mHD1Lzqui;yAp
z7sE1EF3u~ESj^kw4{Ovo8~6jX-6ChldC(`EjlUcCP&Ay4M+!%WZcp=T$vv^eN9NA4
zEj}Q}qGGVaPmIsci;c`Pix2(`M0H3}U3GO)M_e9k<R$01JP8R^_gb0EzyGz#xJ&Ge
z;oS3PU-~gz#wn@&KJa*E-ksH0vc&v!^2e_q{MWqFAH!8Y0sWZc5hw;#AM>}vZi>ff
z0nBzS6p&#w>G^&92G2L|*#thgF~saQ9EA9Qe&!M?#uNqb(ldc+x;Eom2`vYvt@mE5
zYm|=&!EL+!YS_J+GEc-#gDoaME`y&EfCooE1FgyUOKgz@!Jw+HQ>k;N^-A?e)|0k=
zj>t8e_zf21r`G~oo}}n{@e)hkLifb;*N!uR?p?sa{xz*_her~#^Vy)}mh<$I(v0nK
zLGcG3FPDN&z;T3qo^^zsDy_VV61(9O*le1_K2g0nb$9TiGsY!O?m}Oa_M*p`!0N0n
zkgXqYnkw((1o<+AHmxFvc6W_wu(syFlTh{f!W)-di^gxnY-w}~{Bxn|dqi_ohNVTX
z+W{S&^_RZJ<Sw+pAb3Wv_$0UQs4Hc~{|+Ux`kyV*+zj6bOB=4|<Fv^N)VB@cW_<Me
z&^wuC84izwXP%Rt@YAFUzHRUaDcvBJcoPURKbKk==dHG!6B|ud-;zw;CWZ35EhlKX
z@B?@7+!n&K_*|B~8u}@Vp!BukLD@Jf(9lV7{W9=o(kpLh7!9N7tPR1UwuVxDmPxWN
z3+%V!dj(#|_7Id6VKlzK5BJz$=viX%5p-lZAzJhNNo``=<3S%?tD};97fZMRt^^sP
zkW+A2OqA0?X1mlnzuq3B`n*nBrVm`fTUSCB#ax1G!{FyvTcUr}qYu}{t2V6vNZv$S
zFc-aE2E0R5%{@7t%S}V}F6WaruB&v2p7S~I{>tf;X6DWwMLtBJ<5wHJ?ZJ_yswIg7
z^EFU!1BuNT<!1#C90PR@<uK3XaZ|D?<Q=#SY2S8<Inv_TYN2qZklKJo%twJ45>;Gd
z%+r&)&FXe{{v#3S{g2wKrm|6#(SD&HG8M?#q#P?mlChd0reQO<2DSKCZP%Udo%_~h
zv)3m!?p(Q&#${<EANX>)+|7p3$3JN!_;-;z6USo6USFQTa{KH;mhaf$DwI#Xt>)2u
z(=M(|_ybQ?F8n(+uEanAba-voTvuv&0wL;bG4R>^7yOh3!qP32!8S?DY-p=plIKcN
zJwV~x;Dfe5A&A@k-cP(8cvIyi<mN!E$c8KwEq-Q<U0li)bV7u@Z~9N=cWkY~2gu}c
z8w_y)h<l4z0k0(g?#eeI=Y3oQHhVS3S#(Ho65EhaJSr<a*y`pUOC+K!njh)*5!#XP
zR2UEozao0k6s(f8s+0!TkT|}}zT`A3w7#k-!668x77{{6tHmwCIa+PN5k&BKY{BZZ
z**pq)4hx{g%e5K{_Z=QLo%<xQtwQ+kc9+gpir;Hz?3SiApuDdjWL|Zl79-FQ=$}XY
z0eou_?c=RDnh7(l!U$u1qp&xdzvJvD-pdOvNO^jh{MnXVD9@sg4v?vSrqH^$zjKoJ
z-ui75hqtIKQ$)$ua{unUv7XACBw97@`MXM6{U%rjix<epSl0@m{=nG4CNx(%#Xw0r
zAx;YWL~gAkp-4SZM>3Ym%WDNKslOlu0*^HygtJ-s?mLlsO5KjEAWQRWi-tzWe|gs?
zmks2M0%f$vWTa*`hGK*wtfkS?>az-G#ipgEG*r<iWSu(+bcH^$23dH2l-9z4x;b%<
zOnwaLd4F}6ia00hM7F}6*J(<s&~g|Qf&=D~Z?ntg=0pc}ymQ;m;=D+KQQXG=)6RMR
zHI;RHJVi=SAfbbi79;_Y0Rc&*NehA$0Slra!Ac7WpoB<CG%^8W=t>jDq3Ng~Iw~Up
zVl<%01QZ1<1Q1L>Kq4qc>T|*~b3gYFxG(SPefHXWt-a4apMBQvyW+oeCY^r>I0*>1
z=klRq67WZ=B+UN!V%}15-af=^F8-ZTs`HFV;Z6Ko^0Iphy2p?R5xj87(%?^VDJo=p
z4U2*qkhb`$2P{nKLwT}VXXQV`TvWE*HaB0T4X`%}9U{v|3i2KItNdEbcdkYhwGlr&
z@0!;Vl9MKKa2w6qCygf_*+(S{i;^LoZ>YmAfLi6;Bz*|Dlb@H`O6~(0X}U9yxRjQH
z&TqU)myMRy;xx0a(4`-c2mHa9zM{qkMKeclRNOtKcfe_e<eV}Zn*JzSJ!XNbd&{jC
zvky2a-4Z|Lh4pCu)~0m6Di&@Zq8tZ+8Juri++oT1g{e1h_2%00A6D<yJ)`!c*gR?g
z&kK$8(m~h%$Q=yrv8_AQq7+gRxs)~L%QGd^ja}XK`1a<h6X~A9tYc#hzPC`|UWvNf
z?Z)`lC`<sL)480q5a=)xay~O9(K&*uP?^qa<q+Sd)`zv7R~}qWni66E6xAxlB+moF
zbk*s<RV!I99rhe=i<<8Ge2Neu$@5H^i70v?GG&)Lm5ho4yr)<5tB%9o5BU^_Thxpg
z4@Yrb#;!6G8ug@>5*{E35&5?4<HnG5@fLMz0(3m%((0?E%>?^zLuzLn;`e5lELDs@
zcgT~MXbqp$J={_9Qtr5G>&av|`^_m~uQr>YtGqW?)qx^1QK=}IH#1P)66Km6Txe1K
z@~TJE2sKuih0%`RTz1Z}uQs&mCxn21wK2F=;6aujX&ndFB#3kX>;)P^mqUf8T73o%
zhLckbLR=SK97fN+thjI@;CV%y;m_B@DAd@sc54{ck-&N{+rI=51u2>1s0UhpF)hpc
zWU>7*Ro(J2b7GlmL$i}v-9oRTX8;ETb31gE#i!^Ax`y>`ZfnZ?44gyG$tJNG9)%XK
zF)Gj<>g`Qi@y4&Pj!@}dp*KcboVUX4oC#*TOidq4eBuzegv9D3_vz;(14M!gpow$S
zRu^Qg`UtaZue;>0;0v$RB9EK~u1A&C{BFd~LoAQi@XKCIf@{4+3z(uW=qf(7K+~?)
zS?xX6JTlQwJ4%0H!#RO^?}|OUux>cNJkjh?46M7?1yOtN%5zm38s6H!F+ouCvSr=4
zpV|B%HzzpzHUs#Ip(k|dy`*=K^k<71)AmORw)%c1?-vOn?r}4fTvf#wa(C?#%Bi^&
zKRej^9yJ#DG%YNB*N(}C3~y)gp(B0+a*KTKaok~-xD-z2itj*t1Ww{T+=@)VT#Sc*
z0avU`RcS&GCE-tRB1G}7F$4oHqA~&MsdP|?Fv7>G!q40uLgKzGbF;V+V@=uB%(kVA
zn0EP4bYN?EU=3=*^x(tXaMfs(uF2HOJD(8Mu$xLFS6aKjKS_%kZ$x5CNOL5eJE~-2
z{_LHSF?;hc_l)_uX9fB{s<R~2EuVk#D-AX7HkfLtuctj{tcocs4SzFM-^&ljGd6u_
zE5!e9Cl&OJl7>sT!HS#2i3we1nT`sf#B~C6tRiKbB#AdiJ;lapzA?zuZ&0Z4rBvv9
zQIrLpMwND4J9pf&R+G`M$mo{=l<xYVp|i<bMx+DA3+qXWgqe$Vi1dg48y7xMgz;sW
ztwfuVr>sh-L5(Z>2yt)GXN-8~B*7Fq`RmH9{ux+&Q|W+6ooZgdYEPpBIlJ~gUktL;
zdw*^N^btz*=K8$6NZBb=5!HVC>2zMaaq2JBfy9wOqtu~?>O_BY_c*FzaNMEH$nOYZ
z*B8Iy_Zn{22Lb|}%HQwkBr|$qc{5MGrpK2l+V^b45bL0f7N>bsxq{>RV($>*{_aJu
zmdp(MSd`<*qA=$Jn>pz>8RGjnk{$ZUg}DaCVv#XU1IykMtB)V>rdsoLG^jYqcTRy0
z!F&X_qi|2*Ryi$YrxW>8&Pf{y>&|Q?BsOR=R94Dhn~ooB6%<6HmeLy@8pcEQtC1ZY
z{&Kad%V`|BpN7{A0~R&bdjkJS(lfwp@1AsrkrTH!*dOxgo?zT)^X6Q(dgGU0y)D#3
z=VzJAw;#IP!@RU0g%R6)Z&rBhKG>$(X07W`2D?Z_zw~iq97aI8b~kZ+bSt+R(@_E0
z$`GGYQPmV(Ww5zQ*XHgOSSf`Xbxpm)7yotd>Yh}h$;#eS-Uy9r$#*S?CI^8u&z%zA
zmwh9cLmggBavDPikm-K{{$Ti&?8-b@+;pS#HSNRexTShFeDnq)^7@C0%XgLmH4lIx
zR%ZfleEI=AlN`j*F>mlRaVb~{)qm&c18@gHSu$n5GUJj}J_Y${=<&Yq4x8OrTa2Hs
zu}L7Uu~GY7SS8~uB_O46teXjcQZ)x)7}fFw*YGl(s)9OC=C#=<Ie!*h9Ds;i<I_Mg
z2Ex*f)vL%aF}+-eIP)&xqbW~Uw8neT<Wk~@;64+U^#yG3m3@|CPv+M}MQa(YqA6oR
z^6OCwSR1zuMIDfjQ=24{|Enoo-KgD$K7sgn9VuYKt17X(P5-A`Br9k?P1}oEmB6${
zeN>77G~BY`lz8VjXC|46-}bWX_~xxg>F&l)e|pOz2ebjuxwA_)d=x(12-qADYMBXC
zQG6L>vKL+yeZMqW<#>`I=_~_#0FrYN?#2I;hV3W}10xNL*uXQ@5Hf?~415B1?*81!
zeF<177V4S_`v0+D2v9qV>D5>RriK^)6^vsVbj!didky&93D878F6|=wLoRz}*L<X?
z_NW;N3}}nSPuIq_0(u?-A67T((?;<Ft$h`QNV7hE-p94r>HuVxvw@jl6yRr~Hw>AS
z+f}~yA3lrtZ>u4YVyJ~u;KfLzzGZGW;v?n=8q&trn0&##Y0Q^7z1NDJi|+N~Oo-Og
zlRdI)mQw8iC5w#}&}5>SiyC`A4ZS71O!5|zin_h%_MX|NZHV(S*wxO~>sdkb#wOcH
z&X5PIW(pa=i9`+`F>YToyOW*ULEa#_!u)Cp4%e}+c=g7002+a>rcBc0@*-t?i#f*Y
z*=Unq)AmS?Hb{(T)g^`b$Se%~V_^?qVJ>O-O5RatAp4x)%Rh~f^fA9ag7MP=o))hy
z*fYc|CEas?xuy06ttRiNc}23?LmdUI>P0dzK$IJa;aHDW%N{S@4)TKcVQylD9s~QF
zYR@V*&&%-PQV`N8XHwNYr&t8)2j{Sn2fjDcq<k#*W-!wXFmU5HpgrDfq8#O{=vX90
zN&fhIk)B)w|6$In0L#WVRRla}R+k=ABA3yIpxpsR58A~x)xj+2Qlbx8M*C_OqQ)i;
zDs=5On{PvG*9hLO0$RC95~k|4f;gr%18Yun0<>yWtYrHu1A0HSzmB5(cniH79B0NK
z+BJaY8hFTDIY;iKQdfXWCSRI^j-8(uYBX5qO{*>`O1Dh_0+w!mq^tx-X)e+zU?`2t
zD{LTdlx%kc-#GS;mSKd9>C2zJ@2to{eTw;)7yY&g3P@98mf=z?DFxpjV=D&5%gz5i
z9NIq`cm^=_igCiV;?jCrMz@6826o<!>9KoofqN0gmx6V}?rDc?xYa#QU7P;1bB+#2
z)(JYLr4J!PrWzvqld03cJHRMrBRYSvSq;k?JcP_(zNyvv+1O<W7FQRuijZ29%q0Eg
z3D0_u@$i&7P+i{ODQUd`>|EJ<e=TlIxs-V#SminH*ETh!Z!ch|`#;2`epD5O3MEH6
zX~W=$)ZURN+zU9dj6=R*2oTfu3Qe%$%4B1ADlG=)b$xKxxK$H0r0isnU9?f`(|JsU
zF5%vvpSX{4qCamofKLKvEHJ6+j{uI{p*9@tMh^FI;+jWnCUy5z#?YJT3Up=ei3qe+
zaf0RTo#>IjN}*lQdE?mZ2MkiUR4pQ~GsWbq0r#&I^cqnaV)1P5o=y{M&z{SEE_XBs
zRAM0yKw<7Vn@}sUdJAU__PpJU*DUtX86+Cr`bt!&RY~Kh7t42nYBwymu$<*MMl&YB
zY)mwB<WgF9&?_MU0-S2iXd3q{Agu<17i4`fSNn-Q%!_n`%mJVrq4(N4*4J{>;h<lj
zmYohT&qjU94y{pHr02Pa*~k=2$?*uPFzdSI705~W_7)iqS#6DT3%77FL=K+z23k&N
zL+T=|*AVA&q|q<+Hnbc_B5*4`y5J<C^4`wMY}pdox!V2qwDYuX@m1!T7^iE!V`d>N
z+3WKMfMqtu$qT^#>(Z~ro9m4PGiv09x*XQvwNIZ4zbD|7DK?U7j(Q1=N^bxeC=k1G
z+JKkd%G`6D@(R2TF2i4#<qL{|U66|DXA=Z#6fd;V@Rx^BdIlsMGF6#qc}b+o?We~>
z!*F65{CER^eC^r2G_ks1+e{bk%H4&Hk|W%VQGA?iwm~Ocg%lA44XuL&$ZL(2`h6V)
zEvZOx#B$kzW#+CmcIoyetUeY@aU^L}#I!=1@~t*6C-AN}0i8{b1DU_bk_|x75vOlr
z0%NpUG*+_L=MQf5@O~afdYb#a$^DTmis$Ya_8%JtMNITmE`k?9yJ;!zIlq5~=!5#e
zF*Kl%3C#0{((sq1ptX=U9?XrgC{T>)ISE=1LrvJgdWFDp<dmuS%GHA6+;jHxl2T}$
zd&-pvul0U|jYA*NMc3MXfS~RMli&x?L%-_32e#sOu9h3Zc~-X7ylamBTU4iX)_<qW
m>*}m$|6hUU|F$a8ssS9oZ24_)k_FUd0(pD-d(^u{ocj;SnUJ{v

literal 0
HcmV?d00001

diff --git a/ui/src/assets/img/fenecon-logo-light.png b/ui/src/assets/img/fenecon-logo-light.png
new file mode 100644
index 0000000000000000000000000000000000000000..18748c7813151e4e22ca90f2762028c6d36bc976
GIT binary patch
literal 17727
zcmeIa2UL?=w<wwrib&I~(wiVEN~ob%3nCyO0i=cAK_C!%O*UImkt%{xl`2S6dJh&r
zX$nFp0#T4C5eQ)D<*wlV_dWOCbKW_xj5ppJ<2r_Zfvj)Nxn^6lE$?18)L}c!dl&+N
zu<2gCjD$d7vk(YW?GPjQjc#Rl7<e$FuUcXt5J^$mUua07W)K8&=#Gb}MSz9DH5Dgc
zZ%GGdUq=_o5N|YC4S}d>hM*msyj%i=9bMc!eAGpjn%hN$J)G4=%;gQF4bYcd+&!*_
z`Ma2e8JaqUc{wRNi)d;HtA(fl0NySE4#FYcH+?WFA?hLra8<x(+OMTVgb$Vkc&UqA
zpdl2tFt{#!$=BaSSXojA?j$WOE3Bw2=_)6WaB+2#5SEpem6MW@k&;%1%gCxAq*Y`U
zh5!B|0?_$8yQ&~BU-=su_(@&FJs<$BA|(|Z94r|uC+X|&CMBb+tSluhD<vxn2P@#1
zP@e#Y5V#LU^j{DzyI`FBJ<tIjzCOY<hz^dvfdT3wfYjf6@J9aw)(7)9p8&_CLLAUi
zGLq7?Jsm7`cKT->I?(^-0di+2DVLir-Yz}?7_e66pS5Ur-vD2XyYGJh`k$}=2Lyn(
z1_uA&_;+dX_WlP2CO|s~Y~yc+{JX0$rlDvTDWnU=H_+e7MLP(PDf+M7U;>aX|DB)z
zh1bFIgO|}Nm;7BE0(|{VeSL5KOU&2*wO?Ubc}axuS#u8`XWw9qI1St1FSuNG2yjss
z0U}4hrDfsLN~Y4vDzZu{GK%M=WmKf4e=jxgb@p%#{a=>KNUKQ8smLk+4@-f<IXeV6
z{HKeZom5<X{k<Ikw>-QZ++3v4K5iny|Hwe)lJ8Ale}EWJCwD-Ffq{yy4<^9D$H_(a
zvbqS^f~1FsvkF4SMcKtwSqbidP?Co`$RVWRj&jQKa3yJ383%cJ1sQ~k!oS|X?CTUr
zQw!SrzfHv1*9pM*?^qR_TwR?V<Q3t{4sr@`2N#4B+)>F{8LlMfEDdxT;VLI9|1W4p
z{vN<e9d7<xs5Gja0Yqh4X-8Rk7e~0Pyn{2`6@dWsDJn?=V{<|%E6B*mNGmDPOyNMg
zRIYkpfapU1HZBtvzrR1-^bkH!C=~}MnxUwRIMIac;w<v_uRZ=9e*Bj(|NVZjy9)sN
ze<1wd*fGAY0l^ObE*IPY@BUNelKPK`$2bK2C!{;bILIhEI>VjhWgOs6N(e=`gS?C@
zTpln>-oZi6K~_QOUt9lQNdKRe@&5|xf3wBO-NDDr1-M-)k^gWrPQE@tF8=>U7H9{5
z2jFd8{4wexuKvE>!VYNkO%Eprn&6~@e4PLGVgIO_aDcDye^>nf5RbEqzsJ8}+rP!~
z4++Bm590ezh4f#ux8L0Ve^E$Mv_s^#<w*U{M)mvW%fC5!g(jN=KdbWZn$Lex2Z7^N
z0nXzeck+MA@c+i|`+wJg(6r`Y<NxL~{nxL+5l#E}PjCQ!_$Rz@@d3*14}ypMIK3DU
zci8A&zF-=XwJ;glaLO!le|f!%P4#s`s*bVo5rzxe9~*q%h~=$vqqGp7$MgN-jH3-d
z8T0sYt;=^dynT|;!1&>gG3wZjqYTC!PA3n~yYK`(nid+)e_dAJ+%{a?w7naav#r$o
zd9}PUIBaXmDBFZ2VbSO>mU2or<&;N@g7_qs_DQ$8TT7DmL_!(;Y0s3y(n<QXrzsYP
zqCE@fSZ8U^Qzz_&(`nBV2&|Fz)MeoA7Nb4S;r};?|KIYW%JK(e(c3>6SoG?ToGbLy
zx3?oghzWQB#{K3)A%6W-a|J8scPpYe0<@l7X57HOaSn~>;k0XdYILn+oNhx6eTHa`
zm%_4OF*uBW1(|(273hZR`1^<F_3J;VGWsVYYsJyR=%tRXR`*xyMP!~8XZzQ<h<7Wo
zbh(GT{C7F&;&3)Nrkk^vbvi-04Qlqt&g;}tO=vMplP>B|gcK<(=A<1>|E{<Q=NgNf
z1=9<%sd0xKsoFjAIvSBU5ITOyyVfr{O=3FEB~I!yp0sngfpyeHJ-SVl@}YwXB5p>4
z?6XA(Y`FGQ<z*K10H};W#uc6vWS}DPE`A29nrJbniCZ6-S-s7?Va)0ModZ+hd$lC&
z9K|DpqAnCH5YckPA{iMdTg9(*lC)LI*?IuOk8wpj9a($6?<Up6BZo<-lb;fq;quuH
zTKo;QFI&?g)6=LSQ&>vJ&bZiVmo~q|bn~Vt)*IW!p>d<Y6wai<n3aNAfXUEycH2=n
z7b$MW1eJOcIu-s!Eq0PM>u|);jnn9$ern%jfJMLk*k(PG5Tw9#;qof$Rz9{Jx;A?C
zvA4UAzuE~U#lrbX{2BiW^MJt`0Ii_JNjO(l+$<KNkGmAhy%vqv!41rz>_)WhBGWOu
zIz)QnU#X=A*h|><e9N!xlUHsp=~Um}f0SBUPq*Z!+)M)zFOy_+H?>q1=3DsqOLih3
zb^zkr*Qn84-Ff<hy%~NTyHse}dPM1u5b?hLRlb*UXbH+-YAFG_)YI7ZV#t-|6%5J@
z^c0^2Axk;IQkD&wRhAh=s1Rf^2@{#>5b@f-qO!kn??~U{pGNdi8i@|7uqFDaETnv|
z9s|v#$i30h=s=dT!=mVRM9G?R5rO**pXEtgjmm_^p}C@KfG^5~t|1AdXpO$x!F<(H
zXh*%_F2;dpG}kql%hP@4y54Y*xLIyN=v?SPC~M>K5dVH^zJEpZhzBOx*s&ytMCfg7
zlOb)jBDy*wqjFy7T&Z535N#%3qX8%Y`v(kxc_f@vb<DZcW+-=l?{R;IRlRTgW>`9e
z6i;?kCZx}zG;yx!)Xkq|ZK{;v)KVv8>0EWj1sZ@<xg?{c)Y3ChO~_gfDajlfosHSu
zUTm_e<e;<T9jdK>Bsh<K<?9S+)$D29JB2o~*Er9?3DL(^7Mm`NdN=_XDPg`HG%H${
zKEWwr@xfy^wNwl*v%2%k3kUY0IpLtcTJ5~qp*8&Fgb#gN&&#*b^AujbhsfGHuFTt)
z=9FjEh{no<_Mc_qfT1Niy*XZTNlZV^B^8^(AyZ8J>H{auA&I?>d$woTJX(>Zb&x%_
zkoRh_C`PqYq^+*WK$;M#F=H5SNz0`d9o3ye4h_<KhhB&9C=&=U9cV7tmJQao$W-8y
zjX90nt@k`D!XM>kV;(Oj(i!EFlE~Ot5-R#k%~3XQwCJ}ud_GBe_AqfThgk|}n1|~c
zDpPKDxAy*K?D9i=^6llQ?#4D|CH{?%YOyytcFgsLy_?B2OG8d`cZZ)XoDaqC^Eq}8
zW|0R1hZAq7V<P3z+<ksGS6`e#BlU(2e-m6{#5$|~07(@lW?y36<fUx+G#T>&QGMu5
zomLt+xedu(%c31~9tr^Hsls#6edb=pB%5oPmd6}UzdjLV{v@!<%w8wf3e<`ounmBd
zd30izwQAzX>pcz97KcD>fs!v>l+qiLly1ouxgsMO?EMo5<H}x$GJ5)?#(uss!H!(Y
z^Ooo4O3-mM@KPEX$XbjJ9DviEhr&WR3QQ-nzod!p-#v}@x;Tr<<!A}KbF!XJ<Abs4
zf!Og{wxjkXTd}yl+uUpKv&cOvp1PBkj5}d>2BI(O4LjJ#ACM*i3k@A$Sk!n!%H@bC
z$hZCUw8PlFlGlH<83=PRPl$%k1#Zze$krq(VNqrOT}Irjd5He!LM(SsNI%srw#|ZB
zKW*u-8s8`%_Z|yE^E_6n`sVUofng4yM9gRfbo$BLt>UDu69Tnhi>Kmm0bO8R5f)`!
zS^wCZG(fP#UpVI1JC^dT8CDD(epIocmj>4ex<>F6EA*71Y@WQ0V)^+1qu%QuOyi_E
zP(aMPu#@6u;X}QG95V*Tj&|}%IYc<{6Kf?b+a|dy37yP{^P+QJ`f8c9z#~J2am7CY
zsvz)nRf_(!Q%RUpu8f^8hRE*JHh0y(!k2MMcD5=XS-M94d#~KxELTgK<j@;Qucxvx
zkxpE@&+ZsOqPf4WDnj=P^KEIH05Oczj0<c1yRkrgSCfaf*euG9X=ftoHM>zsQzX~!
zRe+dR6Sn!N&~%bf$+6oZ_g&*24bn3X_RY;qI;n-cqcq0OxCsljlRl~~sojrW$~*e-
zAtn-vo=<w6lY^`^`5TNBY?Hgt6i%NbGh4;Gk;^`AtQq0oJurP(sWk4&0Y}qu5iL28
zpR%)$jM##{jRdF&HbiyH3>cK~?h(UjXj&bGg(~xPxK}qRlAnMcN7EVd_>X2|nSwtg
z00;##vPp@$dczCYZ8qhfj>KqHcQ^hh^*Qn+{j7|g+<UGo+^e4`k_WgR;vyn)WM4fx
z1`dkb!Lou&5J{mK>J;!Bud~RLXYA;1?}poEA#2UJ`VN?o*r%r`eJO$8q4(|=oBLo{
zyW_i+@WHIcD5eb2<|ecl<plAP!0-~PpXzH;+E35U>o~fGcft+?4bmcjf_|RvF5yDY
zX#44tv6GO9>X@KTx3RA*ShsW^r;AzLXdFLL_aJ^Oxce=Ix*W1|$f+$8(<;((j5<uv
z;l{Y@4X1s{J|Kk!wi%)p^q0&7b=3-oNR9@dZkY)P$HEgX8jGClg_kV!hRbo`_oaWS
zer$c#4vrRB6ynu~*LmSI+e8R5t}Lp1{w1R*ZKX8i%=hhdZ~p7%B-%Hev~O<yB~wg7
z*$GVD-CF!~wDad<WFU!RNaI;xzt+@K+EEz`K=0>;f4t01U794(g5CmVXW^xhNo=+b
zH_4yMlZuHHM}ItYNyqZmN$_Hc^uWobk+an^km6fGPjy$?@!qlgt9Sqk=<Q-2Sc0$y
zMhdHAtfNyXRvvRXmhls<j$R<nFxoSqL;I=kWheC>^l43%Z{L@mQz5#2jCXg;Vo-DF
zmWjhg;xMn9lTUeE1YrdIAARu)lUM=s?a}+Eulr~g1!<&U)Zb4@XX}?(K|ZrLoJV(c
zbd_T#aq5ghEU^;dCVIn#__z2arv31fXbp-9@pBfLPjoB2C?3~hy)NL;3l3PtTfup{
z%QHv2COKf676qo>msZcdcfGm6)U3_7Q4MDj%HP|(jbbhf<7nh*aHNE{zi-@|xg-A?
ztkhn;G`+U-?L~=MwG>~qeAQbu4PWYbeiM6xYwf=61-WAZK|*Z_^X;jn-kUw)Z-e+Y
ze=*?MSI??WN1uOfMYV;ZPoQ1;si6X>GuQNn1>B?hRgR1bHLz5<y~`P)z^_b{$)og!
zIT4y?)F2I-Xrr&b*KWSId$rSq%0&ipQq+mjSQGyW(x2hnnH?I&+t7N~nkB+{>?%0-
z1;#C6k)?uM*XO$MQgrjzPQXHSfb+;}oKPyOj<Npe%tKw;KSI2e9RGb_KS79@pY=0r
zG;X=C;_|jC(P^fIX#Z~JHI`{8Vt0)ph}Vrn;LxrLyU%qsh7kHH#lCA(Rf@+XnPkz2
zDa##E$6M2oRGy6Was|Ww#;Bmnn%=;j9925rz=b~27yh<REZp;lM8=Z|z8F6KL^?qh
zwL{PDDSX1jtfzHBjPgRG#dpI#|2Y@_qXW<4;rhvlA%RIlm3hgULaHS9;7HJB`cK>9
zXb=MxPmJ)!NYQ@^kwK%hvP&F=m-^543`6^w7xHSvdd?Hq5W$AcXfd=x59jm;<6Xbz
zq`8V8RdT}lZBsS3Q%eP~`B*n7({WG%EHqW8SK?K=zuD(LP>@<04$D1r+JYaV#v5X$
zH!O##&=k5}tsgGE6UE~-4$n(AE(DP%CT7kOp_qC6rZmf@G*KB*x#W;;Jdl-II`M&i
z%B||lL#smX!)j=X9}pP{JL6vw-uz;jn0&`~aL@JY{32__xx#sD7TKJBWSCwiDVVe<
znn0%h@gmgvWdxMslc9RYrbohZPYE0<k*tJyQ(zUTrMYrDy>B$c%_cxVJAA=f&VdrY
zri}=03znGZbJi<qlA@f>C`=y5rj{PwIG3OO=EX@>NLR6`x(aFQ4RM?f7#*YS;g-KP
z;c|o|M*Xr}Xv_UMOE>S!dc%TvWJcx0oJ%v$_#FNL?o6?1Hhqg4X{+p&dU=o6UACF$
z;h}oNx0DG&-=DRG^*RkSVTgBT`V(*FJt>ySk!J5>l<WfWSWQcgPAHoMe(ZBHka?Wz
z-8nv)`yB8>PY1nWKg57OZzqYge^jW`eC#jR&cg4kD+s-kt@9b{_Xx6+4lSeWL#d^r
zAemZs;+}q%TFM}9wtrRb=_>zesr!{bt`mQymIiYOntZ?2VX&RA+SWV4l=$AG^O`>P
zM?MVr%wv=uqK01Rr$?2+O!nZktUjM#k)kC1@~&kvk}8oQtPHQreZkxNKI>xjW&aCb
zf;vxna^M_{Ot?o3@zyGBo!4|r!W8<vB9{hR?{|!@zX!+ZCB0!qtkK|S_uK%&%^j0*
z-IAsgXjzKn>EP%Gfn)R`8faI&;f}&go(9#)>AxoKxjJgeb!tuFI*@OS6~Y?MlESQV
zZb>eG{$8VItuVj%fa!{Y3=6W<78>#BU9Rz2k;3^Agrc0Q2S?1vw4zDrTEUn{o0pM6
z$+#~o;c-~Z`aO=X;o4_F76B`Ualj|_pOBj*a*%;WL_~($&*EVLtcgi!j#bmq4BO5x
z=;?a5L|h9WQ-YGDj>6Ns^7BWzgIN|F-vjODP^t?Mdf-_Vv!#1~DK^z(FwAW#)C$rP
zc8!o>)n*=WzHpw3$mBB|V)ZR%<a3M4{AjrP7-0<&68e1nyvN5!6*Jpwtg=bLPM-=Z
z8U3L<u5bJnS5%E+`nsl!n-ZDVWisR}<XilrmICVvZ*|Dc0Fd^SpR3`xXz|IOQ-H71
zloJ`>`l@F~Q%j>ILw5aq{#w{xyASl<>61Oe^T<#D54E#*Er#^21{xD@sc}!=NC!9(
zXM4XN8VITWy8CBAZcd!0wC0`fg6>~$x~rRltkp!*RdaQkhhmJ<Duesh7kHe6mpY%x
z&E`v*jU0d1*v7fBd*}7!qnk6fckGIRK6*2>lm`g$-m8Y^hcctP1`V#|r<SHeq|Q!u
z0TRb?r|%DJ4eoIin+jMo-Ibw4hTrDyZuTP`?c(XKegEva*p<kIzP~!|6ZG}gWxnLR
zy{T5OWRT^}Ge~SGw2Z3!{*&~&V|BoHp>*%~_7U{<pusQvMdGTsnRU8Pfm56Bz!6wz
zRcfg=zCx5e_+8Tt9%?P|X8&z<-11K!^}ZbQCfuvjfkE%b(!QwOUF^S`OP}4+Z&Dfr
z)#$j%pUi!_aDEy8rEvRu@&v3$Pf>;u06YW>ZE3Z-pIu}ySs{t;JHb#f_R!c||L2LZ
zH^;*qe=wf5)EibuH|`fiO$XGuC>cpk;#0#EtK5E^?mRWiztVAy5-#EyZ!bnsC7wYv
zH|-C23b{e#ug^D3aTS;fT>m~k^A*U5o0Nd7cC0+wWdqXZuI?*`xA|vwadQ%B@V!kC
zwbsVz@YkC=9~(MV=!q#J-=FwH(6|X&>mQ;wO!luBfKOh{WlMXmSrs5O1onVKoagBL
zagMl+AO+?c$t}P5Gcfksd2A-EqEWeu4Shiij*WJVP?V8`7}7^UvY1gxnAVQfPbQ@b
z3_h^WCzSr0L;Z^R5q09tX+)yNwe58=pz~Oq+LWzmLS~UPdk?3S+q)I>L4LPEDn>(-
zKH>WY?~KAc*`c!gbW!hxfM&UcZ+K-ybTH=4jy;$7*VxyRm);NHsy*7G#BPlC5;*h}
zKfEd(OY@7()5RRB^3bWR%x8|}8d@^5dAiRCsBnm=ZaI(Lha@nyJ;c~}GS=62I3?|W
zT6Vbs5rXc4487|$dp}6zHin5aJ@}N=QgvLud(cNCTx-RTFXCqF1C4uzv4pcUWwjSh
ztS8)=**h|JSxUk>LP9^SJ>C`etYR^>!hY<lzG|t>;4@rAS8C}3rlRuDf~(5s+L#Q&
z5P#e+DDh_&x$PFkJ(#&7ShVk>&QgD4kV(%ny3S>0ZRyFJGX6QX@*B!-`oeD8wslh|
zhwY>oUKO`)@NpeaqEihp4Hu(m*n9L-U6OBMDx?^v9wDhg8T%ZSOm%TBou0PLYA^H0
zBfo5~fi%9Wx$n+QkyH{4kf@F}{-JRCdM4quw|msa5L|o7a9f}FLYbh+Trr^^BQWnP
zV6nnWOjaiBAG0vwBi-!jTo6DlY2u2#Z~j=S(E~AAOWtdJlo96m3?B$n=P4>qAlKrd
z>?FM3XWy8pa7$xS%$<6Sq%vga@Ng^=Wuvo^wMMjn=+h$0bbayX0w2R6w|ouKv9Ms|
zvC2O3)5B!Prpp>J^>iVh%Klo$+5AaXpO&`0ue$Ct>VvC|qT`o;?hrvdiN^^HYw$Jb
z^i$6li{Ix^yX})Bu+M-V@RM8>EW<Ww_NA;zsukxqMFNFC4mLgE^u}+9%Gx;YDR)U@
z-U~erXDy@FiMR8$OD6Z6j)q03Rps2C>2KxZ+_cgRx|05^a&b&xSY5CI5L;7mC_Icw
zUW!351Eap?6vU)hn4?ww&bCIBDYM5w4s7EQP}uS-{BFX8`SBLPE0Ju5&E9lgk*BIg
z3P#ncMxtj?)7%zDuQ7ElyLE?3F>uP*6RTq$=*5j0m9x8+L~&(8<P^l;S=>zZ$Uf?q
z9`UX+;jN%3|K}{LYdfVMY&>o_{+fJ?w?s7WCw`@XG8WTXevWh!lU~XA<B#phMkKje
zUR_WPL}>QLJKpFIfq%=(BBPq_GOy<kvR%VHa5rQRnYlBQ?fqklr$1pe<f{+5%%73+
zt7CC$XkO+`^yJh7Or##V?<r6*I<?A}L8I?aTx&pp!$Ci#`gMZ=-!n6AY{%X0v@qpZ
zCO2y}^i0uXyoJ5iPZK_gKfd7t3a%IWsgLp7)~QNrh3CRZ5xZ}tfZ@RsIVyq$Ow{Ds
zGIW>-nfW@3ME{CJCPOw!Rc6)lCB(+G!g;rZYbE!lLXfw30QhmopAQ{u+^z11UGe@k
zXWdk&`OwGya4+qjpNFESBs@M<f8>Jnyiys=nA20d4$35J_)9T8ZE(_-TZeqO3)*%2
zX@|=+5EB=wx;&b>BK<Uxai(;AVTgOT^H<TE=mk?CsvDWY2y)MOO`X>je!^U5l0tv<
z^96(L(1n?*A<y=`fH;-dLQn;&<0&6PNR{LyG979Dxn+dUgpsMkQJ+_)gRKb=p+jX{
zj_CKDKRR55j-aH*=c6lgJ&e07SHzu!6Nl&60whbB4dTyV;pf_nM<F#A8pbO%4XRUv
zO)EXd;%X#6X5NfcB5kb@Ga`=*oNG_QOcEmRY4D?#a2?dV^1aouSPzA9zFXC^CY@S>
z&kc@be3R3w^~rBL%{n{yYkReQwS!|~e=IMpdUpO|fUs}1-K$f|ry8ct#E`XB1n;Q%
z&Di2<n<yl{5@iAxot?LF4<O7@II$KJ_aa}?Xyg|!m1m_K1doRoE+eNUu9jFurtL(+
z$;$c_(jXRvY%`_pEDGa${|u)eX=2=PwQs!+a&`JPK8qDlgN)2cwWzLFSeochF**th
zEmQEN`x|JM9y$$`!Jt~UrQJ{E!0meh#QxeUNu#+kMu*CVtz$BOY%`{*iIJL?&PyAy
zRs`FlTd%5CEKh^FqOb7)Ao2yRdf!_I?_Aqu!-VLk3DLD2ex}m$J|0iNI$6|(j4Mod
zu4cHeTBRa*ILnu(mmnI$c~f54u3B!X@;{V&SeBobSFW90yV6+?^9mGe>S`XGHiJ%-
z?FoTA5X1pp-$^Nz8Di04&2^?3G*vi)m|vNVvU(X2O|-_pl0hv9;svmxo#=8uPt5Tg
z94aHqOC!Ty4K0DrJW3WwLk3>&r}8X}r!<7ymuu2#GM5qDwiyW9QRr65EJI9~?x%#E
z<nyd~-f75M%YN$oKwmU#h(NyPT9~umundq!&7$Gk24{7E_>*g>zmR(3@?XnlIj>T_
z)$`6!JHO0xI@Pm~FCy(GMUpt8x>YM&406TH|59Zd*>dQoK5I5M%1~t>kazoPv&de!
zT*kD|XR2;+`6QnJ-nVG-_AL#44F=ZP7o71b==f%rA^Su+!sk}JeDfz)<~?@4{o}gF
ze6|C3rebjlI+r#j8bvPO&KsihqS_oT3v}oY%zPL$6L7=6+?r`*{#DbBGwrcKiQ-!l
zn|}ch>i@WE>lGmn5d$#MX^g(SUp>nU!V#Z0Q^z$_t8PrkZ#BGYy4<f4ywHNTs%I-3
zzEvBg0cybll)Ier*<!h9#uW=e`NB4C(hOb7);AkG8@y9hzd~UVn2&53)#f{EsC{{b
z4Y!3C$Sf*w)Xr}U@Gez-jSjG#y0MMovZ0y<_KKB}+ElZ_fUz)}_Qx2TA)op{pmF(e
zS>JBGJDldN9kmc8VDa3Gi;)l)#TFz<+A79#S*N1YBK`#KC4P(Aa=M1aAWmTbr<W1M
zH~uh$2W=8J-k;)Snmj<U&A~)!+qX{9yz1z~G%m)G`El(I>ee3r=2lDHw-C2?XHs!$
zX{y%ek(o9wlb;MS9AZS#8e<2X(01l-k_KGR&OMHC0J^Z77L+(v<}rY`a*|W>AGBQI
zaTZQ58v1jP?drKj?kq9FhBjl*_s2sT*2hsxiXBuH;DO}~&L+M*TQ$<4tgjKnI(q?G
znw8vA_=nr=DHQM%-z3R{_c3XxTR-_N$Y1eRk@aUArgHxz2QDPyYB?E3c+b1Nb9;bO
zGtA_9=b;+IPwWNNMFw=oqslQivI+?~_|q>9HN(l%O#<?s%)?tL&Y>y~l_|0(D;@!_
zpX&fLf^a*Q3>-IZ1}l{K!|FVa>*dYmVW*~?QwH>I@65DjlT98d^h|Vuw=uZdP8Z3l
z5%AH8B(eF^kF#9pin?TZdm6kgORQ&!Z3m9tX0Hr@Q|v&XaU+(HbfZ34Z+J*w@decU
z8!EaY;27UBC`PqSYgs2_A}{|q{U<++Uw8G=_*r)S5*2sKrM$VNJE^5i4}Ba3Z9%i4
z5FeJ@<<rkFGT*F?t3ADZ<+j{x{VywG73WMM=xzn}Q%?y*D^|14`l+pl8i0--ETScV
zPtNmF*U6IXcHW3z!`fQYu+7){iqae=n4k9jRFI73(&voi^#b?tHUJ?P#1rvr(y)Wd
zI-75K+`<cNuA!G<#Ok=k^E+8&Ib>;D_xGm}a>R%DkA5~K=Orx@X9&p1mw`VRPf_m;
zq&&xnn|+)PpZk+cwVXX=Ic+Xn-t!PhhH>Ov$wKw)0LVQJuAZ4sJ&8;y5GMiSc>s?g
z+X$g52kKbL0?q8p{qCw|yPaDxz*o;^4)vxyCl!5VIIo+c@ZQot5WcnCdLBR?dls%%
z)^jRn>e%L^4+!-u^Aek^wDvXv22_f^sWAYC)a_3hV1$KgHZ<mph=u*gJ=MzC@boRv
z-rAExD?fdhlc!gUmz5?h=Oi{kG`Rlymq2*YA@4Tjfk8}g${Z+<ixBhSJxcl&)Uk67
zQ?<YVBxIB9j#+r2L~_FuBLv%(+};)E;?(*-@h9h(NZ(a0)8kE4BuX@%el5YUV#&4n
zIed0?Bl3&HCN1vrs8w~=dsq!(2KGX}Bt#@AT*X(<rXXap#BzN=k72YW05+e^K>MyX
zODz4<ndHZ(Ru0u__@zbY@pNxH@um}=WyAFpg*{Zj;lwPXpZP}H=Z(T$yZY|@_eCo*
zNI*<Fu0^xR6L$F4Xj1?zr6{9%_8w>JV~by>{USLxYcmTgC&~c0!=ayVWSsym<x+)w
zZRq_k@2eyWLNp8ZGv&1xHzxE!XUVW+>ntUU)5R91CRvnUvT8!qDa?En%R=WB`Z?{>
z)89HkuNL&?kLRxM5);UJ-aOqgAhb(D4j26e!XlH*_&uM)<cnTg97G{Kpy!I|KK6n+
zpqA?J<1{@2=z#q%J}fP^Kv?LNSgR<LwzL5PbahRN+)8WsAMHNLnoLI91#e#57wmre
zSS<QA@uL_OBts)+_&U)9fxxUH^Gs4n(aL5?PJ;$1444oSnB|F|_lRN111HvPW(htt
zAm_D<!;m7REhcfZGtk%si&vH_Igj6{x<`)8vEfOPHAM=QcXc0$J^aL>p<i+KV`5(K
zATuKQq<;_IYUYp7oh2%+cFWVFXIVpk3iL)Syj{iAV^Ln7$GWpmrX!>l8!FB!6U>>?
zQOAMq&e3@-0GEvt3D03E8wOm|gcy1nzY-vXzX5?uU)k&_NhxGKXDzqta8K>2TXB!X
z+RaVnGTf5~mJA)M_=i#U<-nRdU5xF^8-Y)&tD*VX@K*=#7U+-E(rERV{%{%j<cZ}9
zLHk$UU9QH9USM@wCQDf@%~?tuE|cf7cwP?_3KYgI6zjN~&(dNqZFpzh;~y!AOyJ*z
zGLV5+0a}an-}bx&$o2+}{6PCwKlHmT_q00xC5ccD5aHI2oy4T2xp;_z;E1ly-T0MT
zw-}p?wEkXlnoAmEP2M|KVWB=0x)mG@O?3c0px>4S#1o;{Re6&S;)xm>_FHv|?s<th
z$p}7Mqvq_F*<u7CnAZZ2#q%ZLA0|~AYzd_YF7$NAVA@PBXvRMejmSB(5kO;_fpG9`
z)N|`k{w;E|DYw%wyVk@Qc#i~|yY>Te3f?N5<^khk$OgT#vmhJA-olCHx2LsoO6#|Y
zQSJdS+s6U{7_W-A7O=(}gf%LdazT_TevxRrvYv^zI(F>b1gLMrUXU7=PJp8_oPp5O
zLH$h!xq9{+;6bCajj<KON*1~CiN>kEM}YB)H)jV#V`8_&WLXy;A?5YEUfBW%S&6r@
ziDUm$j;lK+M{Ga+Nf6=`EgBqHSmYhKRdgYf5Hpad@A-T|Vl&31RImo8shDI``CS^J
zUmcWe*Q~qMv~a?L+>}M0W*W&nrEi@OeMN70>S(;X(t*--uOA{`9I{{MbYh!Lv0?^1
zj=U_Dp~OW`m{4r6&D~Y08qokjF6WrnECHQI-<#t5{`P=au9vYjA4tT9UEMyyO-k$7
z$d@1Z)N?xR9~rq-U^x<$wi5-CcI$!MzS?Kc1!>{Q3&q>(9A(47$#S#dMjtF^lcT%j
z>QRwwfFMoT!gJ-M0o2$hT9`Xs%deR$%7ow>FMIT8xX>zvj-fB5(zoud(9fcYP+aZe
zQ6SzZK?|>AL@Yim`)bMf{ZXx`DEsoe$9_p{>W{3twfP1E$&i7_BNI^1YeL~Qkpg;y
z=e*tC34taJQ6*}c25NxLt8Xx27o_09xx_FVr8{$@<!3e7%H&Icn(nWIrf1pAx_U?P
zfo-~-&OS*v7hcCb5mb2l6x5-5cE2WJI@8P2WH-pwzC0ULAXz|&N`fgejaW~Mibno1
z>GaDW{_ZiLE^L&nz@0raxThzKbr#2{V_-9#_oh6?>f`KltNVfPnhLH0%5oneYv&9)
z8#$?;qW8H_OO-KXDzcwC{H8)O<h#9YNUpj_!xRtDpkc7B{gZ{BtMXC4AZjg-1v#+`
zytBgh7(-uD$K&U!HD^E0$)DA&KLSuIQ#ibKrciNV^X+ojhd8Pru;3*_j<Q-91@P`E
zt(PQt++qc!u?l<=M)6q76?I&@&CL3o)u$mw?(P|zLC2q`vUy4tYg%Q7Xi&+6K(xxB
zG*`Yhjae8s&IPF~a~7yx0C9t0l;EbxTCqM0{G_1K&()caK>g}#zHM-U3_|156p(I9
zob`SAB$n}Z_VE@*F%LMjdbSy2gj#4PS;-gZQp)jGpwq`RLasK6Aqz~+I0fb&MJ=g<
zZCl|bHaozqOC=4j%HS3tu2y;fgO((=t{PGu#aLY6Q<E(gz3AB<ROGT1dA?x^6UHwg
znr-m2J#pbKM_W0ls>4F;(U!2yaUkF5U!LtbUY7b~2jRqZGN;qJg_CZs>yRzH(>4>c
z@WO4r`Bov{2MS~L?2@<fS6hIXElQoxmOmATx~F>A5bDEPRxd|+i4SW9$BrD@A3bIc
z+E@Z08!qgiM(O`_`orX;ecFz$xLF({Ks1>&@=i-|DUZ{M3lgp)pLe&`DDH)~ZS-J+
z#JNfAm9;DO+HuR^v?Gnz4~Baykg`I+>;Y_F0JT;KCYM+%#&qmhDuT}wPjtxBs=L>T
zG94~Py^RT<uc9*~yk&yCh$S(0%`Z!Uu7-H0vkbga<n^}5%#@WhC!A7x5&+{h05vOo
zxK(OM80ba3$uXHUZ|nc^7ctBlnyXimv1X=VClVA0#qV2t-_nzbdEl%uc;Ux4flpb7
zfq<4k{fRk?`%}sYFnEH(kxB6a76Z`iF>ntyDe4nFHrVjFJpktUt^B?Q(6~Mgp6V*M
z_rM~8;FFgfa+!P%RfI}Ymc-3683_yV9UpBzK4(#YrGa@BepK)jW3*dt-ei6#dF9MF
zL%(HJO#sYF6X;1sP_R7PY&HDj;-(d>vB^KszWfXrV>)hO<aAtGe=68JZMM<}O6jE)
zc&duurK_IZy-a*yqG7VP%<j3!5CJ+TKNC$@Uu|^VwJT+(JkBD2=hHM1vrj__$R;s?
zaigOfW^sRPU!msR{j|2U-;yL*P^+z>T6cmnhY#azSE!zi4A!<Uk2WmP!%<HgXU?oB
z%<AGx#Lc|dY<^S^z|sS+uiN4|OiC9&Uswp_y?J;|n<y?|^A)tVvlaC96`uskB?adj
zoE_IJ^t@nkCIb=dr97ooQGvShb8yJ5$h1|y(6bt!!TUfwSFByB3N%s(CZ(>S)CmGE
zH^_852X85ER+&?0;z{dDYkW4|jKmIs_6ImjwRH%fKYl@Pc$$s`NnHFcJKf)?QJp_-
z^44-?4|E!4c0g{+;3G7A=d|I30X9l-@K(+3EOI8+jxl}r3=#C%K#_XVr7HH%(_J<F
zDLT`mpP7_Y3+H#m%{X$Ct84aeR;^OWDlKm=5^M3Hppo?9^-Sw{2ou^{r?#FhfkE<G
z$rdTKbTaR7v8ne%B-NA{Kn!_uue6oDE65_87Y?7qj?DF5RveF#(}ZkjUlz?!@^<Ye
zXOW-3Qb`_Ji>^^k^R-!nPAP9t4aCi&9d}PIsSq<xdfLfx%h{RBw5w}PJ;dzxot!r;
z1T!qi(kWO=OMp~|A*jz@B!2Gz(U$q(&C9iOG6srJb9UqPu-g;U4v(Ubfp&7#@{wA_
z*$|=`KI#H>L=3vbkN{?F-VigUg|f)%$^I2m1|?xqeSJL@pYP2b%~LEe&DN`au*QLv
zW6~jbe<E7$H4olwSf_M!1x?n3v-EGUgE;+nc$c=Q9qk~zbS0C=-~Hkkmk962S#AkF
zuT|E@>Y4fRdYq_AS-W^u4>5nh@a&{kV#|pTjVgm5SLm`Y9J|-ddVC@frTNOz_!j8n
z8<vC}Mf;ofv5g)L=^)O$Of6md`1#t7a^K7$^A9__Q#A=M%prV-DWHX$Mw&@fCLG;9
z$`9KS=$qlN8D|aoK!kxVWe=7Gr}-hG@5ZEr&DGVdNuJRMbFNqKcERoD$7Vz=@8Md^
zS!XBRRWC&)CP^YZ*q=<czsuE@7b)*b$F0xI81g>qv;>hyCdjtv)EWb%hQRC=8RTiO
z9O=%UMLM-0ij0pGV}h6UDN>kZ;k-)#CTP9$*CykSb}*V%A8_nJH&C|a*i!ac)IMiJ
zjrQGe9bifRS9_M-VgpW=cM)3`_zJhLFI}6dp3OZ=Yo7>GnnB;_N#fV=rFqGx6D~W|
z_8vbNe{q3PimWlmpA}%fhvpdlrqgBy?z>+czf+&?qqQqrs9KSGHCQ!fpbP{sFr)L6
zT?IT6JyGYTda-lKe~S87fSy*e?py+Sm)6C84DYJXh7ZqrtOmFJ;npqBs7yEmElyj!
z)GB9IJsSi0RXP}XEx#kYI|V#5vdH?_*LT&U{Qqd}HIRQT0W_EQfE@pbi7})>Qiq>t
zy_fOVoh)+6rh`RmFk*Eg9wq0<>-G*bw!x^`4~-(@ekvc9BW=-Xa26HKr<B6xtESio
zrigayz-C$8-fh3un#z^~F&Fysu?%hwZ{@w-JEsdayBqhIDT9NN&w`6Q(;|pGh=J$l
zrdH2Z8;@NE<DY^`_r_Sh2|;W@H%+_-ctl{;Kh(x|?O*!pnVlHEAGYKG@5((ocne{q
zOjvp&R8*VMA+f3CRw<H@I{u_X_Dk1b)^xcRsKh}B7^jd;>ADXvyW&J&?#13M-8vxY
zMnON$N^qc3omxiTNGAn5Q{v}h;XO5M9vS@J`xTKz=3@Nu&Bo-kDJV*#$g5Vl&v^=P
znk$4AJ*-rrs1HVg=1}ddA%}<RoAOM++*<xv_*_?E_>T`l*mfSZuTK^w1ZHaYlsdf(
zSYe^{<2i}$!nsh|46e^m-Ww|3<HEw#RfUG-4FqwxFx*&k7BwK#X1P+`86d!zd3BPj
z!5u}&5(C{3=x3O(B!?Jj3q`cWXFhI=RBwauCt-FU4#r<=27Bh}3TPba3dp_-gnwf~
zYp)xeN|#iObJdH!Z43d=$@b$i@1Xr{G8KOb%feEh9~HvV=VWcu#JOSBMQFH{MHYfF
z(d}#Wll$*wkyo)ykbzgEH4-Ruk7tq7VZpFA)23XA8(m_5qiq%@((i|>Yj@oDsE6;z
zlnJEZi1@p-VV-r5gnZuNe#CSZVp4D#s1Bbd(o3084B3Y6)1z)Q2%JDPTnJH`)R@`r
z?2scnJ;bPkeqaDm11~<)wpYXVnYe9ET*JrVrjPr0ID)ypOiUzqpX}Pc^NMS4J4_AQ
zux+p0)_In+bulB;!6wYIi+Uyv*K!FYhY(VY#E?Q+Nf%>R_O4lvETcd5BIr*j6MUI`
z*!VBV#r&9$r_C5CP!2tb<Eh}F>k7CY3?vy1Sa<}CYiBp4s(&K3&MIZhXbBmu+RA!B
zt3eG$Xbz=$ch0yW9io{xIeR@l3fgjXRFkv?RVL&H&(!&YDN>l)gAD_TN~VPV#<e@O
z)X}m4m>iK0zX$Ks1n%Ni+XaL2uEE95(LQ{=qt)ZE_A_&_u5QtaAX`=;4&jSI#*p{e
zK<!8ai-E<oz-Zdb>6i*=#RNXrt_vQ0wlQOF?$rrA1H3X)U8eG_t*<P|&cJYY^9TNq
zztHx+_Ro*%O<rAHTGzpMfleu_*UQ2V*)=Yx6euZjDLr!iL0NFOB~Q>z9QUf)6nydG
z;bF}4-L2CZ+0Eu3{wmA^KA7GRVh9ok<`6{RdLI+CIh9<t57?q#{qCzOqvF00^XF)a
zU-3n6n~T*(_<Gy}rbO{;_s-u5onEBIgHtK7$TTv0uDgqAuqDx3=3)sMn=!Yv^;($_
zh)N%F1Jk#2Er(dZ@GWTxl)?{ZjlSH0VJg}uU)~M_^Qf6Ms+hfPWx{&=yiQ6%+rhvU
zPlHh3xm&xqW;)e}KfTzb1bbK34MEohp{Tp0cdUQCsL{CTOcmdPPugA-#ZRWMO@sv1
zgc%C)i$3FVI~a(a+*ar-d!GjPRExZ>V**;rQW?!V-VHlCDF_qB=Zpga5j$hT?o*6c
z@q+k-n8XG58*UQ(5%Wbc)7H7(*gnFlTjs~Ih=v^3Z>)&wV#UhkP|~1DjLy0CzObk|
zFtPve^dn#Pn?}_szEm@V^P4@(x6MEFZrL72saOmPdmQRdVzQiORo2oQ)<p~q#?PO#
zPt5Wf_?{&qZl;eT)JR}*JN!<7sXJulV|Bt@k<ZM>AWn>RM)nzbF=VO2Q|0!?cunX&
z-|y)}aB*a2`7M@LiuKvky$wG5$~5`53{0enmK1<MyJwOJ+F(-HA?q|{z|RZNg=a#x
z{MTnTu)GJ~%OoWZxWPPIPCdDOSihu6wa@quZxl3(|2Oc90Ql-HEN`N2323`FZaL^`
z#Y?gEho#X5`<}ASI;CJD1<^r0vMg8vQ%(Lw#_E|km|i2w2Efh$#r5T_dMq!kxb(+$
z9ha7qPdb-y$6)icdBbzvS{k;wkP41xt3|1$RH29pTfLGnZnV2rNg@d~edM|hScJU5
zxFSO<49E<mXhM|EJxS;U!a7Nrdg3p{TzW8|D-7G*(7sht55iq;Q~k+s9&|BQrI>w9
z^kDYz3!s19Kv?AZ!r>OVCkZN`0U{)$`ux&oiGvCJS6~NeASI#HJ@E(QFk#5+@IVkQ
z>J#Pgudx1H&|H>h2S}J$XI&!rH*Bt#a}=3QN<K^b+RAfBMRm^`oEnV7G(LhBUJDqr
zB4dLY9!>~afB{v5>*@@;B`SYxbUpEp7MUAWqs>vOI|xgWBJtlY)UwlSWFx;#yBUG-
zl4FB_Pgw$!^5?2@0IY&ntms?7%R{>u(;_4&BOt^!26K8I3H1{q&t?nXET{_8#vjiB
zqQK0*w|y&Dv1zLeXcea-YZcLltMu*12&$^I`$h&ru+R%&k{nXWEV;dsS_+y?@Iw{P
z<AF7EZE#*^NZUO@>A;84HW2no%XX?A>c&9WaU+_Dn;q5h_7DW4eDo2yqtfh@L9n+N
zFWRIyZMxba#;Giat&CN2*O}N3au=40=kf)ny8>w0s<REh%rO<|Oa$6|>ZfCjD}vzo
zK1$hR*V{jV4$>PIRe7eq3Q}qPk}Z0QvHdD>#T+)kQt^9yo^^J2S&#UYeSVQWD-}sq
z7&w<Gr!?}DmDrsixjdgmj#DY6O?a0uah9QYT9IK2aElL79JQ&Xv5;v<(|FPX0ng%J
z(LQRtTLNy4uuxoyODZkBia0PLKmGZOJdL+6WWy`^v;<FyB*DP+2}_Ge!RS^tYs+a6
zx(e92d4jx@MNKG#r^+cdeG7)x>JQ|4E=GIL@%LyyGwW<7te9^7uy})m9sQKMv>h0;
z6u`QDq+j;CnY2EdMV3nZq5{}7XaQ{3RhZ+C6Wvf`sSnG}on?A0><~5>*2U3(B^RU$
z!B59b7tY$F2Bw5EF}v?&Y-qPCc+Xdp#zC7!1V(cYySV++QR|CrjdV)T4Fn|~#Gsua
z3ty3?e^4$H#qk%M+IG@$T?69;+9-GR>z|DZu+XIMTI@++rYQrBdd1&YJ-5%0r4~Pc
z0O<#mpH9u6;#YsMJd0gTm=vb{luSdJEqB0?g1CeCE)p9I?{SbWg4vmY`dnxhXaTu=
zOt_tdtc5fP7<_M2MB5SV?R!!pp(NNk$P8=HLI4J`_@A2(fUT``N_EvN_ZQ9a%HYzH
z9lM4kog^5Py7{?}Hcjip@RRwoV8d%-^b-BgfsGu7+)6tL2e5LG0nj*I@tbjjF2b?4
zu`AR@=!O6#JmcHabBzl68?1XfhwX<gC!X(zJuJt;M>eQIi0bjU8{4DIquD-*qH${&
z;>p{7KuP)z|K?;9`z*Mg6wMI<87)|iE7328CI&oi0*GAi(njr@nNu*k4n%2U>0qn7
zvt5y8kq<ZR0-kFYF5(pkQ*XImdbz5%p7*qj-c|=w^H|Xoe0i$TS^d3IT3MxJp{I4m
zH?q!s>MP#2g?KQNawgs9GGNHLx4(tq$FyRGEX`qV5g2W|3LAg)0PA*bMtKpe7?l3a
zGVuciIY*4dJH^RAmES!|yARf-uP6f0P;tL+1Bk&k&w;x}Fkia0bD!T!STjfPhk!=z
zlD;C%JyHL@GZ1-*wo?`y3ATR`bEUqM<eVWKb>lZv+hl$VSqc~N5GX8;Yw)ktY?gYt
zg*IplxNns@7*BJ`kuKnP#Hn4KrlaATfDF*v-q#-!ojfGLGzCIBs~@g30k!?DFqH?e
zz~DA?fQ}tjcXs0An<mJ{A<7ac$E5mP0q`=8yAITXe#9^JBpR!@h|G9LVh7&UMRmTF
zH3GUJL7B|*+W$yHed)JdI;YTW&Lc~M@{}bPjw0l~H>WK;<MLtL<JwRGqwqSn(O|zN
z0>34DTK)hkv`Uk51O$k!xCu^gPqhkYKO_ng!K4HN;gy#M7ea>q7KX>6Suz;t<3mdu
zT%YD>IA0}IW%jPksvF-JlZbKub0ZPlNs}0V2=<8h_FFiQN3_}`W7xieiOJgCwV3@@
zdGvXEMSBkWVEZqRteaUIj&Hyz;ZGQ&*mgWAexMm{=ClYX)cu2TB~T`b>2aZ!h8?K?
z(ZykDSN(>G(TWUp`C~sK$)TxDJPmXWPzxwZzq&Vqy@CHxPh$?tP1?bUls?!W_yn#}
tROy0N9t~uM_W!;*`v0{%u=_$~E#C}YKFo2X{TC;?+J=`aF53V3-vD%h<b?nL

literal 0
HcmV?d00001

diff --git a/ui/src/environments/index.scss b/ui/src/environments/index.scss
new file mode 100644
index 00000000000..dfc6563b0c7
--- /dev/null
+++ b/ui/src/environments/index.scss
@@ -0,0 +1,259 @@
+@import "variables";
+
+:root {
+
+    /** font **/
+    --ion-font-family: "Roboto", "Helvetica Neue", sans-serif;
+
+    /** Box edges shadow **/
+    --ion-color-shadow: #47577a;
+    /** Custom Colors **/
+    --ion-color-normal: #7692a4;
+    --ion-color-normal: #7692a4; //normal / general icon color
+    --ion-background-color: #fff;
+
+    /** environmental **/
+    --ion-color-environmental: #8abd46;
+    --ion-color-environmental-rgb: 138, 189, 70;
+    --ion-color-environmental-contrast: #fff;
+    --ion-color-environmental-contrast-rgb: 255, 255, 255;
+    --ion-color-environmental-shade: #527029;
+    --ion-color-environmental-tint: #bbff5d;
+
+    /** production **/
+    --ion-color-production: #36aed1;
+    --ion-color-production-rgb: 54, 174, 209;
+    --ion-color-production-contrast: #fff;
+    --ion-color-production-contrast-rgb: 255, 255, 255;
+    --ion-color-production-shade: #226e84;
+    --ion-color-production-tint: #41d4ff;
+
+    .ion-color-environmental {
+        --ion-color-base: var(--ion-color-environmental);
+        --ion-color-base-rgb: var(--ion-color-environmental-rgb);
+        --ion-color-contrast: var(--ion-color-environmental-contrast);
+        --ion-color-contrast-rgb: var(--ion-color-environmental-contrast-rgb);
+        --ion-color-shade: var(--ion-color-environmental-shade);
+        --ion-color-tint: var(--ion-color-environmental-tint);
+    }
+
+
+    .ion-color-production {
+        --ion-color-base: var(--ion-color-production);
+        --ion-color-base-rgb: var(--ion-color-production-rgb);
+        --ion-color-contrast: var(--ion-color-production-contrast);
+        --ion-color-contrast-rgb: var(--ion-color-production-contrast-rgb);
+        --ion-color-shade: var(--ion-color-production-shade);
+        --ion-color-tint: var(--ion-color-production-tint);
+    }
+
+    .ion-color-normal {
+        --ion-color-base: var(--ion-color-normal);
+    }
+
+    .ion-color-white {
+        --ion-color-base: var(--ion-color-white);
+    }
+
+    .ion-color-background {
+        --ion-color-base: var(--ion-item-background);
+    }
+
+    --ion-color-pickdate-toolbar: var(--ion-menu-color);
+    --ion-color-header-contrast: #fff;
+    --ion-color-active-percentagebar: var(--ion-color-primary);
+}
+
+:root[data-theme="light"] {
+
+    /** success **/
+    --ion-color-success-contrast-rgb: 255, 255, 255;
+    --ion-color-success-contrast: #fff;
+    --ion-color-success-rgb: 16, 220, 96;
+    --ion-color-success-shade: #0ec254;
+    --ion-color-success-tint: #28e070;
+    --ion-color-success: #0ebe54;
+
+    /** warning **/
+    --ion-color-warning-contrast-rgb: 0, 0, 0;
+    --ion-color-warning-contrast: #000;
+    --ion-color-warning-rgb: 255, 206, 0;
+    --ion-color-warning-shade: #e0b500;
+    --ion-color-warning-tint: #ffd31a;
+    --ion-color-warning: #fdc507;
+
+    /** danger **/
+    --ion-color-danger-contrast-rgb: 255, 255, 255;
+    --ion-color-danger-contrast: #fff;
+    --ion-color-danger-rgb: 245, 61, 61;
+    --ion-color-danger-shade: #d83636;
+    --ion-color-danger-tint: #f65050;
+    --ion-color-danger: #f53d3d;
+
+    /** dark **/
+    --ion-color-dark-contrast-rgb: 255, 255, 255;
+    --ion-color-dark-contrast: #fff;
+    --ion-color-dark-rgb: 34, 34, 34;
+    --ion-color-dark-shade: #1e1e1e;
+    --ion-color-dark-tint: #383838;
+    --ion-color-dark: #222;
+
+    /** medium **/
+    --ion-color-medium-contrast-rgb: 0, 0, 0;
+    --ion-color-medium-contrast: #575757;
+    --ion-color-medium-rgb: 152, 154, 162;
+    --ion-color-medium-shade: #86888f;
+    --ion-color-medium-soft: #d8d8d8;
+    --ion-color-medium-tint: #a2a4ab;
+    --ion-color-medium: #aeb0b9;
+
+    /** light **/
+    --ion-color-light-contrast-rgb: 0, 0, 0;
+    --ion-color-light-contrast: #000;
+    --ion-color-light-rgb: 244, 244, 244;
+    --ion-color-light-shade: #d7d7d7;
+    --ion-color-light-tint: #f5f5f5;
+    --ion-color-light: #f4f4f4;
+
+    /** text **/
+    --ion-color-text-channels: #4d4d4d;
+    --ion-color-text-menu-dark: #656565;
+    --ion-color-text-menu-light: #91939a;
+    --ion-color-text-menu: #01000c;
+    --ion-color-text-percentage-bar: #000000;
+    --ion-color-text: #444444;
+    --ion-text-color-reverse: #000000; // lightMode > Black  &&  darkMode > White
+    --ion-text-color-shade: #a0a0a0;
+    --ion-text-color: #444444;
+
+    /** item **/
+    --ion-item-background: var(--ion-background-color);
+
+    --ion-color-toolbar-primary: var(--ion-color-primary);
+    --ion-color-toolbar-segment: #fff;
+    --ion-menu-color: #ebf4ff;
+    --ion-segment-button-color: var(--ion-color-white);
+    --ion-title-color: white;
+    --ion-segment-button-color: #fff;
+    --ion-color-white: #000;
+
+    /** chart **/
+    --ion-color-chart-primary: #444444;
+    --ion-color-chart-buy-tint: rgba(0, 0, 0, 0.2);
+    --ion-color-chart-buy: rgb(0, 0, 0);
+    --ion-color-chart-primary: #444444;
+
+    /** background **/
+    --ion-background-percentagebar-color: #f4f4f4;
+    --ion-background-color-card-header: #f4f4f4;
+    --ion-background-color: #fff;
+    --ion-background-percentagebar-color: #f4f4f4;
+    --ion-color-background-menu: #fff;
+
+    --ion-color-emergencyreserve-primary: rgba(1, 1, 1, 1);
+    --ion-color-emergencyreserve-rgba: rgba(1, 1, 1, 0);
+    --ion-color-grey-primary: rgba(128, 128, 128, 1);
+    --ion-color-grey-rgba: rgba(128, 128, 128, 0.05);
+    --ion-card-content-color: #737373; // #f4f4f4 in case the percentage-style class is applied.
+    --ion-color-charge-primary: rgba(0, 223, 0, 1); // Base //
+    --ion-color-charge-rgba: rgba(0, 223, 0, 0.05); // semi-transparent //
+    --ion-color-custom-links: var(--ion-color-primary);
+}
+
+
+:root[data-theme="dark"] {
+
+    /** success **/
+    --ion-color-success: #20bf6b;
+    --ion-color-success-rgb: 32, 191, 107;
+    --ion-color-success-contrast: #03130b;
+    --ion-color-success-contrast-rgb: 3, 19, 11;
+    --ion-color-success-shade: #4dcc89;
+    --ion-color-success-tint: #1a9956;
+
+    /** warning **/
+    --ion-color-warning: #f7b731;
+    --ion-color-warning-rgb: 247, 183, 49;
+    --ion-color-warning-contrast: #191205;
+    --ion-color-warning-contrast-rgb: 25, 18, 5;
+    --ion-color-warning-shade: #f9c55a;
+    --ion-color-warning-tint: #c69227;
+
+    /** danger **/
+    --ion-color-danger: #eb3b5a;
+    --ion-color-danger-rgb: 235, 59, 90;
+    --ion-color-danger-contrast: #170609;
+    --ion-color-danger-contrast-rgb: 23, 6, 9;
+    --ion-color-danger-shade: #ef627b;
+    --ion-color-danger-tint: #bc2f48;
+
+    /** dark **/
+    --ion-color-dark: #f4f5f8;
+    --ion-color-dark-rgb: 244, 245, 248;
+    --ion-color-dark-contrast: #000000;
+    --ion-color-dark-contrast-rgb: 0, 0, 0;
+    --ion-color-dark-shade: #f5f6f9;
+    --ion-color-dark-tint: #d7d8da;
+
+    /** medium **/
+    --ion-color-medium: #989aa2;
+    --ion-color-medium-rgb: 152, 154, 162;
+    --ion-color-medium-contrast: hsla(0, 0%, 0%, 0.801);
+    --ion-color-medium-contrast-rgb: 0, 0, 0;
+    --ion-color-medium-shade: #a2a4ab;
+    --ion-color-medium-tint: #86888f;
+
+    /** light **/
+    --ion-color-light: var(--ion-color-toolbar-primary); // Background color for header of each widget.
+    --ion-color-light-rgb: 50, 63, 75;
+    --ion-color-light-contrast: #F5F7FA; // Font color in the title of all widgets.
+    --ion-color-light-contrast-rgb: 255, 255, 255;
+    --ion-color-light-shade: #383a3e;
+    --ion-color-light-tint: #1e2023;
+
+    /** Custom Colors **/
+    --ion-item-color: white; // this sets the color for text in History, Menu bar and Menu Page sections //
+    --ion-item-background: #4f5f75; // background color for widgets.
+    --ion-title-color: #dff0ff; // Color of the Page Title.
+    --ion-menu-color: #ebf4ff;
+    --ion-color-text-menu: #e2e2e2;
+    --ion-color-background-menu: #1d2c42;
+
+    /** Charts Colors **/
+    --ion-color-chart-primary: #ffffff;
+
+    /** Text Color **/
+    --ion-text-color: #d3e3e3;
+    --ion-text-color-rgb: rgb(211, 227, 227);
+    --ion-text-color-dark: #000;
+    --ion-text-color-shade: #a0a0a0;
+    --ion-color-text: #c8c8c8;
+    --ion-color-text-percentage-bar: white;
+
+    /** Percentage bar Color **/
+    --ion-background-percentagebar-color: white;
+    --ion-segment-button-color: var(--ion-color-primary);
+
+    /** toolbar **/
+    --ion-color-toolbar-primary: #353a50;
+    --ion-color-toolbar-segment: var(--ion-color-primary);
+
+    /** Chart **/
+    --ion-color-chart-primary: #c9c9c9;
+    --ion-color-chart-xAxis-ticks: #c8c8c8;
+    --ion-color-chart-xLines: #545454;
+
+    --ion-item-background: #2b2f42;
+    --ion-color-emergencyreserve-primary: rgb(160, 160, 160); // Base //
+    --ion-color-emergencyreserve-rgba: rgba(160, 160, 160, 0); // Transparent //
+    --ion-color-charge-primary: rgba(0, 223, 0, 1);
+    --ion-color-charge-rgba: rgba(0, 223, 0, 0.05);
+    --ion-color-grey-primary: rgba(128, 128, 128, 1);
+    --ion-color-grey-rgba: rgba(128, 128, 128, 0.05); // semi-transparent //
+    --ion-background-percentagebar-color: #384352;
+    --ion-color-white: #fff;
+
+    /** Card **/
+    --ion-card-content: #cccccc;
+    --ion-card-content-color: #cccccc;
+}
diff --git a/ui/src/global-ion-custom.scss b/ui/src/global-ion-custom.scss
index 371559e22c6..2360b898e27 100644
--- a/ui/src/global-ion-custom.scss
+++ b/ui/src/global-ion-custom.scss
@@ -1,3 +1,5 @@
+@import "variables";
+
 .ion-font-size-medium {
     font-size: medium !important;
 }
@@ -10,6 +12,10 @@
     font-weight: bolder;
 }
 
+.ion-link {
+    color: var(--ion-color-primary);
+}
+
 .ion-full-width {
     width: 100%;
 }
@@ -26,3 +32,16 @@
 .ion-item-min-content-height {
     height: min-content;
 }
+
+.ion-toolbar-button::part(native) {
+    --background: var(--ion-item-background) !important;
+}
+
+/* Functions */
+@function tint($color, $percentage) {
+    @return mix(white, $color, $percentage);
+}
+
+@function shade($color, $percentage) {
+    @return mix(black, $color, $percentage);
+}
diff --git a/ui/src/global.scss b/ui/src/global.scss
index 64cf303577b..11c66d094a7 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -16,6 +16,9 @@
 @import "~@ionic/angular/css/float-elements.css";
 /* Basic CSS for apps built with Ionic */
 @import "~@ionic/angular/css/normalize.css";
+@import "~@ionic/angular/css/structure.css";
+@import "~@ionic/angular/css/typography.css";
+
 /* Optional CSS utils that can be commented out */
 @import "~@ionic/angular/css/padding.css";
 @import "~@ionic/angular/css/structure.css";
@@ -24,9 +27,15 @@
 @import "~@ionic/angular/css/typography.css";
 /* ngx-spinner */
 @import "node_modules/ngx-spinner/animations/ball-clip-rotate-multiple.css";
+@import "./environments/index.scss";
 @import "variables";
 @import "./global-ion-custom.scss";
 
+ion-alert {
+    color: green;
+    --color: red;
+}
+
 /* Live- and HistoryComponent*/
 ion-refresher-content {
     ion-spinner {
@@ -34,6 +43,10 @@ ion-refresher-content {
     }
 }
 
+ion-card-content {
+    color: var(--ion-card-content-color);
+}
+
 .custom-ion-popover {
 
     white-space: inherit;
@@ -42,6 +55,10 @@ ion-refresher-content {
     --min-width: min-content;
 }
 
+.footer-color {
+    background-color: var(--ion-color-toolbar-secondary) !important;
+}
+
 .hide-empty-list-header {
 
     // Guarantees evenly space between list-items
@@ -89,6 +106,72 @@ formly-field-ion-radio {
     }
 }
 
+.normal-icon {
+    color: var(--ion-color-primary-shade) !important;
+
+    ion-icon {
+        color: var(--ion-color-primary-shade) !important;
+    }
+}
+
+.percentage-style {
+    fill: var(--ion-color-text-percentage-bar);
+    text-shadow: var(--ion-text-shadow);
+}
+
+.ion-card-style {
+    ion-item {
+        --background: var(--ion-color-primary);
+
+        ion-icon {
+            color: var(--ion-color-primary-contrast);
+        }
+    }
+}
+
+.custom-channels-text {
+    color: var(--ion-color-text-channels) !important;
+}
+
+//* Color of Menu button *//
+.custom-menu-button {
+    color: var(--ion-menu-color);
+}
+
+.custom-theme-text {
+    color: var(--ion-color-text-menu) !important;
+}
+
+.custom-menu-text-dark {
+    color: var(--ion-color-text-menu-dark) !important;
+}
+
+.item-devider {
+    border-color: white;
+}
+
+.custom-ion-popover {
+    // Overwrites default width of popover
+    white-space: inherit;
+    --min-width: min-content;
+
+    [aria-checked="true"] {
+        .alert-radio-label {
+            color: var(--ion-color-text) !important;
+        }
+    }
+
+    .alert-radio-label {
+        color: var(--ion-color-text);
+    }
+
+    // Color of the selected Language from the list.
+    .item-radio-checked {
+        --background: var(--ion-color-primary-tint);
+        --background-opacity: 0.9;
+    }
+}
+
 .line-break {
 
     formly-wrapper-ion-form-field>ion-item>ion-label>span>small,
@@ -106,7 +189,7 @@ formly-field-ion-radio {
 
 .command-textbox {
     font-family: monospace;
-    color: rgb(52, 52, 52);
+    color: var(--ion-color-text);
 }
 
 .margin-top {
@@ -116,7 +199,7 @@ formly-field-ion-radio {
 }
 
 .active {
-    color: $primary-color;
+    color: var(--ion-color-dark);
 }
 
 .primary-color {
@@ -205,16 +288,41 @@ table {
 }
 
 .underline {
-    border-bottom: 1pt solid lightgray;
+    border-bottom: 1pt solid var(--ion-color-medium);
 }
 
 .gray_color {
-    color: gray;
+    color: var(--ion-color-medium);
 }
 
 button.activated {
-    color: black;
-    background-color: lightgreen;
+    color: var(--ion-color-dark);
+    background-color: var(--ion-color-success);
+}
+
+svg::part('container') {
+    --border-color: white;
+    --checkmark-color: red;
+}
+
+ion-item,
+ion-checkbox {
+    .checkbox-icon {
+        display: none;
+    }
+}
+
+#theme-switcher {
+    --transition: checkmark-color 5s ease-in-out;
+
+    :host {
+        --checkmark-color: red;
+    }
+
+    ion-checkbox::part('mark') {
+        --border-color: white;
+        --checkmark-color: red;
+    }
 }
 
 #toast-container {
@@ -276,6 +384,13 @@ formly-input-section {
 
 :root {
 
+    --ion-color-primary-item: shade($primary-color, #000);
+
+    ion-segment {
+        --color: var(--ion-text-color);
+        color: var(--ion-text-color);
+    }
+
     // Used in IBN, dynamicFeedInLimitation
     formly-field-ion-select {
         ion-select::part(text) {
@@ -307,6 +422,22 @@ formly-input-section {
     ion-select {
         font-family: $font-family;
         font-size: 14px;
+        color: var(--ion-text-color);
+    }
+
+    ion-alert {
+        color: var(--ion-text-color) !important;
+        --color: red;
+
+        [aria-checked="true"] {
+            .alert-radio-label {
+                color: var(--ion-color-primary) !important;
+            }
+        }
+
+        .alert-radio-label {
+            color: var(--ion-text-color);
+        }
     }
 
     .alert-wrapper {
diff --git a/ui/src/index.html b/ui/src/index.html
index cfd90f2e9be..cd523172f27 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" class="notranslate">
+<html lang="en" class="notranslate" data-theme="light">
 
 <head>
   <meta charset="utf-8" />
diff --git a/ui/src/themes/openems/scss/variables.scss b/ui/src/themes/openems/scss/variables.scss
index abf1541b28c..f9052326054 100644
--- a/ui/src/themes/openems/scss/variables.scss
+++ b/ui/src/themes/openems/scss/variables.scss
@@ -1,14 +1,14 @@
-// Ionic Variables and Theming. For more info, please see:
-// http://ionicframework.com/docs/theming/
-
-/** Ionic CSS Variables **/
 $primary-color: var(--ion-color-primary);
 $primary-color-contrast: var(--ion-color-primary-contrast);
 $secondary-color: var(--ion-color-dark);
 $secondary-color-contrast: var(--ion-color-secondary-contrast);
 $font-family: var(--ion-font-family);
 
-:root {
+#theme-switcher {
+  transform: --default-transition;
+}
+
+:root[data-theme="light"] {
   /** primary **/
   --ion-color-primary: #e8ae6a;
   --ion-color-primary-rgb: 232, 174, 106;
@@ -34,95 +34,8 @@ $font-family: var(--ion-font-family);
   --ion-color-tertiary-shade: #c6bbac;
   --ion-color-tertiary-tint: #e4d9ca;
 
-  /** success **/
-  --ion-color-success: #2dd36f;
-  --ion-color-success-rgb: 45, 211, 111;
-  --ion-color-success-contrast: #000000;
-  --ion-color-success-contrast-rgb: 0, 0, 0;
-  --ion-color-success-shade: #28ba62;
-  --ion-color-success-tint: #42d77d;
-
-  /** warning **/
-  --ion-color-warning: #ffc409;
-  --ion-color-warning-rgb: 255, 196, 9;
-  --ion-color-warning-contrast: #000000;
-  --ion-color-warning-contrast-rgb: 0, 0, 0;
-  --ion-color-warning-shade: #e0ac08;
-  --ion-color-warning-tint: #ffca22;
-
-  /** danger **/
-  --ion-color-danger: #eb445a;
-  --ion-color-danger-rgb: 235, 68, 90;
-  --ion-color-danger-contrast: #ffffff;
-  --ion-color-danger-contrast-rgb: 255, 255, 255;
-  --ion-color-danger-shade: #cf3c4f;
-  --ion-color-danger-tint: #ed576b;
-
-  /** light **/
-  --ion-color-light: #f4f4f4;
-  --ion-color-light-rgb: 244, 244, 244;
-  --ion-color-light-contrast: #000;
-  --ion-color-light-contrast-rgb: 0, 0, 0;
-  --ion-color-light-shade: #d7d7d7;
-  --ion-color-light-tint: #f5f5f5;
-
-  /** medium **/
-  --ion-color-medium: #92949c;
-  --ion-color-medium-rgb: 146, 148, 156;
-  --ion-color-medium-contrast: #000000;
-  --ion-color-medium-contrast-rgb: 0, 0, 0;
-  --ion-color-medium-shade: #808289;
-  --ion-color-medium-tint: #9d9fa6;
-
-  /** dark **/
-  --ion-color-dark: #222;
-  --ion-color-dark-rgb: 34, 34, 34;
-  --ion-color-dark-contrast: #fff;
-  --ion-color-dark-contrast-rgb: 255, 255, 255;
-  --ion-color-dark-shade: #1e1e1e;
-  --ion-color-dark-tint: #383838;
-
-  /** font **/
-  --ion-font-family: "Roboto", "Helvetica Neue", sans-serif;
-  --ion-color-background: #fff;
-  --ion-color-text: #444444;
-}
-
-/** Custom Colors **/
-:root {
-  --ion-color-environmental: #8abd46;
-  --ion-color-environmental-rgb: 138, 189, 70;
-  --ion-color-environmental-contrast: #fff;
-  --ion-color-environmental-contrast-rgb: 255, 255, 255;
-  --ion-color-environmental-shade: #527029;
-  --ion-color-environmental-tint: #bbff5d;
-
-  .ion-color-environmental {
-    --ion-color-base: var(--ion-color-environmental);
-    --ion-color-base-rgb: var(--ion-color-environmental-rgb);
-    --ion-color-contrast: var(--ion-color-environmental-contrast);
-    --ion-color-contrast-rgb: var(--ion-color-environmental-contrast-rgb);
-    --ion-color-shade: var(--ion-color-environmental-shade);
-    --ion-color-tint: var(--ion-color-environmental-tint);
-  }
-
-  --ion-color-production: #36aed1;
-  --ion-color-production-rgb: 54,
-  174,
-  209;
-  --ion-color-production-contrast: #fff;
-  --ion-color-production-contrast-rgb: 255,
-  255,
-  255;
-  --ion-color-production-shade: #226e84;
-  --ion-color-production-tint: #41d4ff;
-
-  .ion-color-production {
-    --ion-color-base: var(--ion-color-production);
-    --ion-color-base-rgb: var(--ion-color-production-rgb);
-    --ion-color-contrast: var(--ion-color-production-contrast);
-    --ion-color-contrast-rgb: var(--ion-color-production-contrast-rgb);
-    --ion-color-shade: var(--ion-color-production-shade);
-    --ion-color-tint: var(--ion-color-production-tint);
-  }
+  --ion-background-color: #fff;
+  --ion-color-header-contrast: #000;
+  --ion-menu-color: #000;
+  --ion-title-color: #000;
 }

From 9608ab13ec7735043718a518257b55c3f9f7821a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 23:54:13 +0100
Subject: [PATCH 02/49] Build(deps): Bump biz.aQute.bnd:biz.aQute.bnd.gradle
 from 7.0.0 to 7.1.0 in /cnf (#2899)

* Build(deps): Bump biz.aQute.bnd:biz.aQute.bnd.gradle in /cnf

Bumps [biz.aQute.bnd:biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 7.0.0 to 7.1.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/7.0.0...7.1.0)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd:biz.aQute.bnd.gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update gradle.properties

* Fix resolve; source: https://community.openems.io/t/resolve-does-not-finish/3277/2

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                                      | 2 +-
 gradle.properties                                | 2 +-
 io.openems.backend.application/BackendApp.bndrun | 1 +
 io.openems.edge.application/EdgeApp.bndrun       | 1 +
 tools/prepare-commit.sh                          | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 6fc7297f623..32f49eeec3f 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -11,7 +11,7 @@
 			<!-- On update: also update gradle.properties file -->
 			<groupId>biz.aQute.bnd</groupId>
 			<artifactId>biz.aQute.bnd.gradle</artifactId>
-			<version>7.0.0</version>
+			<version>7.1.0</version>
 		</dependency>
 		<!-- com -->
 		<dependency>
diff --git a/gradle.properties b/gradle.properties
index ac682e37020..efd93dfc0b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 java_source=21
 java_target=17
 
-bnd_version=7.0.0
+bnd_version=7.1.0
 bnd_snapshots=https://bndtools.jfrog.io/bndtools/libs-snapshot-local
 bnd_releases=https://bndtools.jfrog.io/bndtools/libs-release-local
 
diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
index 8bd11069c13..3de3a6547d5 100644
--- a/io.openems.backend.application/BackendApp.bndrun
+++ b/io.openems.backend.application/BackendApp.bndrun
@@ -35,6 +35,7 @@
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j2',\
 	bnd.identity;id='org.osgi.service.jdbc',\
 	bnd.identity;id='org.apache.felix.http.jetty',\
+	bnd.identity;id='org.apache.felix.http.servlet-api',\
 	bnd.identity;id='org.apache.felix.webconsole',\
 	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\
 	bnd.identity;id='org.apache.felix.inventory',\
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 8c9a2f48182..3e74cbd89a3 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -31,6 +31,7 @@
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-api',\
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j2',\
 	bnd.identity;id='org.apache.felix.http.jetty',\
+	bnd.identity;id='org.apache.felix.http.servlet-api',\
 	bnd.identity;id='org.apache.felix.webconsole',\
 	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\
 	bnd.identity;id='org.apache.felix.inventory',\
diff --git a/tools/prepare-commit.sh b/tools/prepare-commit.sh
index 2f7db41cca9..a155377073a 100755
--- a/tools/prepare-commit.sh
+++ b/tools/prepare-commit.sh
@@ -150,6 +150,7 @@ head -n $(grep -n '\-runrequires:' $bndrun | grep -Eo '^[^:]+' | head -n1) "$bnd
 echo "	bnd.identity;id='org.ops4j.pax.logging.pax-logging-api',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j2',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.http.jetty',\\" >> "$bndrun.new"
+echo "	bnd.identity;id='org.apache.felix.http.servlet-api',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.webconsole',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.inventory',\\" >> "$bndrun.new"
@@ -175,6 +176,7 @@ echo "	bnd.identity;id='org.ops4j.pax.logging.pax-logging-api',\\" >> "$bndrun.n
 echo "	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j2',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.osgi.service.jdbc',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.http.jetty',\\" >> "$bndrun.new"
+echo "	bnd.identity;id='org.apache.felix.http.servlet-api',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.webconsole',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\\" >> "$bndrun.new"
 echo "	bnd.identity;id='org.apache.felix.inventory',\\" >> "$bndrun.new"

From 3dc2d60b9c287dae767fdb9db8440b23848688e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 00:07:01 +0100
Subject: [PATCH 03/49] Build(deps): Bump
 org.ops4j.pax.logging:pax-logging-log4j2 from 2.2.1 to 2.2.7 in /cnf (#2915)

* Build(deps): Bump org.ops4j.pax.logging:pax-logging-api in /cnf

Bumps [org.ops4j.pax.logging:pax-logging-api](https://github.com/ops4j/org.ops4j.pax.logging) from 2.2.1 to 2.2.7.
- [Changelog](https://github.com/ops4j/org.ops4j.pax.logging/blob/main/RELEASE-NOTES.html)
- [Commits](https://github.com/ops4j/org.ops4j.pax.logging/compare/logging-2.2.1...logging-2.2.7)

---
updated-dependencies:
- dependency-name: org.ops4j.pax.logging:pax-logging-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Build(deps): Bump org.ops4j.pax.logging:pax-logging-log4j2 in /cnf

Bumps [org.ops4j.pax.logging:pax-logging-log4j2](https://github.com/ops4j/org.ops4j.pax.logging) from 2.2.1 to 2.2.7.
- [Changelog](https://github.com/ops4j/org.ops4j.pax.logging/blob/main/RELEASE-NOTES.html)
- [Commits](https://github.com/ops4j/org.ops4j.pax.logging/compare/logging-2.2.1...logging-2.2.7)

---
updated-dependencies:
- dependency-name: org.ops4j.pax.logging:pax-logging-log4j2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add dependabot pattern; run prepare-commit.sh

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 .github/dependabot.yml                           | 3 +++
 cnf/pom.xml                                      | 4 ++--
 io.openems.backend.application/BackendApp.bndrun | 4 ++--
 io.openems.edge.application/EdgeApp.bndrun       | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7e89f85d2cc..fd5504558db 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,6 +17,9 @@ updates:
       bouncycastle:
         patterns:
           - "org.bouncycastle:*"
+      pax-logging:
+        patterns:
+          - "org.ops4j.pax.logging:*"
 
   - package-ecosystem: npm
     directory: "/ui"
diff --git a/cnf/pom.xml b/cnf/pom.xml
index 32f49eeec3f..0a90ce77a81 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -403,12 +403,12 @@
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-api</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-log4j2</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
index 3de3a6547d5..db09c80078b 100644
--- a/io.openems.backend.application/BackendApp.bndrun
+++ b/io.openems.backend.application/BackendApp.bndrun
@@ -118,8 +118,8 @@
 	org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
 	org.jetbrains.kotlin.osgi-bundle;version='[2.1.0,2.1.1)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.2.1,2.2.2)',\
-	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.1,2.2.2)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
+	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 3e74cbd89a3..86fbedc8dcd 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -430,8 +430,8 @@
 	org.jsr-305;version='[3.0.2,3.0.3)',\
 	org.openmuc.jmbus;version='[3.3.0,3.3.1)',\
 	org.openmuc.jrxtx;version='[1.0.1,1.0.2)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.2.1,2.2.2)',\
-	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.1,2.2.2)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
+	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\

From 365e7d616e5b7ecc12bac579b545a570633a2b89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:30:15 +0100
Subject: [PATCH 04/49] Build(deps-dev): Bump the eslint group in /ui with 3
 updates (#2919)

Bumps the eslint group in /ui with 3 updates: [@stylistic/eslint-plugin](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/types) and [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript).


Updates `@stylistic/eslint-plugin` from 2.11.0 to 2.12.0
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v2.12.0/packages/eslint-plugin)

Updates `@typescript-eslint/types` from 8.17.0 to 8.18.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/types/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.18.0/packages/types)

Updates `eslint-import-resolver-typescript` from 3.6.3 to 3.7.0
- [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases)
- [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-import-resolver-typescript/compare/v3.6.3...v3.7.0)

---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@typescript-eslint/types"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint-import-resolver-typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ui/package-lock.json | 60 ++++++++++++++++++++++++++++++++------------
 ui/package.json      |  6 ++---
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 0b0a40e3ade..5976d5145c3 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -72,7 +72,7 @@
         "@capacitor/cli": "6.2.0",
         "@ionic/angular-toolkit": "^11.0.1",
         "@ionic/cli": "^7.2.0",
-        "@stylistic/eslint-plugin": "^2.11.0",
+        "@stylistic/eslint-plugin": "^2.12.0",
         "@types/jasmine": "~4.3.6",
         "@types/jasminewd2": "~2.0.13",
         "@types/json-schema": "^7.0.15",
@@ -83,9 +83,9 @@
         "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^7.0.0",
         "@typescript-eslint/parser": "^7.0.0",
-        "@typescript-eslint/types": "^8.17.0",
+        "@typescript-eslint/types": "^8.18.0",
         "eslint": "^8.57.0",
-        "eslint-import-resolver-typescript": "^3.6.3",
+        "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-check-file": "^2.8.0",
         "eslint-plugin-import": "^2.30.0",
         "eslint-plugin-jsdoc": "50.2.4",
@@ -6269,9 +6269,9 @@
       }
     },
     "node_modules/@stylistic/eslint-plugin": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.11.0.tgz",
-      "integrity": "sha512-PNRHbydNG5EH8NK4c+izdJlxajIR6GxcUhzsYNRsn6Myep4dsZt0qFCz3rCPnkvgO5FYibDcMqgNHUT+zvjYZw==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.12.0.tgz",
+      "integrity": "sha512-IvD2WXbOoSp0zNpyYbjdSyEjZtut78RYfj2WIlbChE7HFuposTK5X1hc5+4AyqYcjLXYdD5oo/sJtqMGFNRb1w==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^8.13.0",
@@ -7200,9 +7200,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.17.0.tgz",
-      "integrity": "sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
+      "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -11856,20 +11856,19 @@
       }
     },
     "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.3.tgz",
-      "integrity": "sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.7.0.tgz",
+      "integrity": "sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@nolyfill/is-core-module": "1.0.39",
-        "debug": "^4.3.5",
+        "debug": "^4.3.7",
         "enhanced-resolve": "^5.15.0",
-        "eslint-module-utils": "^2.8.1",
         "fast-glob": "^3.3.2",
         "get-tsconfig": "^4.7.5",
         "is-bun-module": "^1.0.2",
-        "is-glob": "^4.0.3"
+        "is-glob": "^4.0.3",
+        "stable-hash": "^0.0.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -11891,6 +11890,29 @@
         }
       }
     },
+    "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript/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/eslint-module-utils": {
       "version": "2.11.1",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.1.tgz",
@@ -22319,6 +22341,12 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/stable-hash": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz",
+      "integrity": "sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==",
+      "dev": true
+    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
diff --git a/ui/package.json b/ui/package.json
index 42ac4dd860e..9d3cf3ecb95 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -67,7 +67,7 @@
     "@capacitor/cli": "6.2.0",
     "@ionic/angular-toolkit": "^11.0.1",
     "@ionic/cli": "^7.2.0",
-    "@stylistic/eslint-plugin": "^2.11.0",
+    "@stylistic/eslint-plugin": "^2.12.0",
     "@types/jasmine": "~4.3.6",
     "@types/jasminewd2": "~2.0.13",
     "@types/json-schema": "^7.0.15",
@@ -78,9 +78,9 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
-    "@typescript-eslint/types": "^8.17.0",
+    "@typescript-eslint/types": "^8.18.0",
     "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-jsdoc": "50.2.4",

From b3471eb3fee0fad8dfcd2052f147c11e93b7cc82 Mon Sep 17 00:00:00 2001
From: "Kai J." <da.kai.creator@gmail.com>
Date: Wed, 11 Dec 2024 13:28:41 +0100
Subject: [PATCH 05/49] Update to Java 21 (#2890)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We will start 2025 with an update to latest LTS version Java 21, released on 19th September 2023 (https://en.wikipedia.org/wiki/Java_version_history#Release_table).

This commit only covers the basic migration to Java 21. Features that have been deprecated are not yet fixed and will appear in your (Eclipse) IDE, like
- `The constructor Locale(String, String) is deprecated since version 19`
- `The constructor URL(String) is deprecated since version 20`
- `The method exec(String) from the type Runtime is deprecated since version 18`
These will be fixed in follow-up PRs.

If you happen to receive a Eclipse warning `bnd has ‘21’ while Eclipse has ‘17’` please update your IDE settings: https://bnd.bndtools.org/chapters/910-warnings.html

We recommend using JDK 21 from the Eclipse Temurin project: https://adoptium.net/de/temurin/releases/. See updated deployment guides for details:
- https://openems.github.io/openems.io/openems/latest/edge/deploy.html#_prepare_operating_system_environment
- https://openems.github.io/openems.io/openems/latest/backend/deploy.html

If you need a compatible Java 21 JRE for ARM32, we are providing a prebuilt Debian package here: https://community.openems.io/t/java-21-jdk-for-arm32/3253
---
 cnf/build.bnd                                             | 4 ++--
 doc/modules/ROOT/pages/backend/deploy.adoc                | 8 ++++++++
 doc/modules/ROOT/pages/contribute/coding-guidelines.adoc  | 2 +-
 doc/modules/ROOT/pages/edge/deploy.adoc                   | 8 ++++++++
 doc/modules/ROOT/pages/gettingstarted.adoc                | 8 ++++----
 gradle.properties                                         | 2 +-
 io.openems.backend.alerting/.classpath                    | 2 +-
 io.openems.backend.application/.classpath                 | 2 +-
 io.openems.backend.application/BackendApp.bndrun          | 2 +-
 io.openems.backend.b2brest/.classpath                     | 2 +-
 io.openems.backend.b2bwebsocket/.classpath                | 2 +-
 io.openems.backend.common/.classpath                      | 2 +-
 io.openems.backend.core/.classpath                        | 2 +-
 io.openems.backend.edgewebsocket/.classpath               | 2 +-
 io.openems.backend.metadata.dummy/.classpath              | 2 +-
 io.openems.backend.metadata.file/.classpath               | 2 +-
 io.openems.backend.metadata.odoo/.classpath               | 2 +-
 io.openems.backend.timedata.aggregatedinflux/.classpath   | 2 +-
 io.openems.backend.timedata.dummy/.classpath              | 2 +-
 io.openems.backend.timedata.influx/.classpath             | 2 +-
 io.openems.backend.timedata.timescaledb/.classpath        | 2 +-
 io.openems.backend.uiwebsocket/.classpath                 | 2 +-
 io.openems.common/.classpath                              | 2 +-
 io.openems.edge.application/.classpath                    | 2 +-
 io.openems.edge.application/EdgeApp.bndrun                | 2 +-
 io.openems.edge.battery.api/.classpath                    | 2 +-
 io.openems.edge.battery.bmw/.classpath                    | 2 +-
 io.openems.edge.battery.bydcommercial/.classpath          | 2 +-
 io.openems.edge.battery.fenecon.commercial/.classpath     | 2 +-
 io.openems.edge.battery.fenecon.home/.classpath           | 2 +-
 io.openems.edge.battery.soltaro/.classpath                | 2 +-
 io.openems.edge.batteryinverter.api/.classpath            | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.batteryinverter.refu88k/.classpath        | 2 +-
 io.openems.edge.batteryinverter.sinexcel/.classpath       | 2 +-
 io.openems.edge.batteryinverter.sunspec/.classpath        | 2 +-
 io.openems.edge.bosch.bpts5hybrid/.classpath              | 2 +-
 io.openems.edge.bridge.http/.classpath                    | 2 +-
 io.openems.edge.bridge.mbus/.classpath                    | 2 +-
 io.openems.edge.bridge.modbus/.classpath                  | 2 +-
 io.openems.edge.bridge.onewire/.classpath                 | 2 +-
 io.openems.edge.common/.classpath                         | 2 +-
 io.openems.edge.controller.api.backend/.classpath         | 2 +-
 io.openems.edge.controller.api.common/.classpath          | 2 +-
 io.openems.edge.controller.api.modbus/.classpath          | 2 +-
 io.openems.edge.controller.api.mqtt/.classpath            | 2 +-
 io.openems.edge.controller.api.rest/.classpath            | 2 +-
 io.openems.edge.controller.api.websocket/.classpath       | 2 +-
 io.openems.edge.controller.api/.classpath                 | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.channelthreshold/.classpath    | 2 +-
 io.openems.edge.controller.chp.soc/.classpath             | 2 +-
 io.openems.edge.controller.debug.detailedlog/.classpath   | 2 +-
 io.openems.edge.controller.debug.log/.classpath           | 2 +-
 io.openems.edge.controller.ess.acisland/.classpath        | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.ess.balancing/.classpath       | 2 +-
 io.openems.edge.controller.ess.cycle/.classpath           | 2 +-
 io.openems.edge.controller.ess.delaycharge/.classpath     | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.ess.fixactivepower/.classpath  | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.ess.limiter14a/.classpath      | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.ess.linearpowerband/.classpath | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.ess.selltogridlimit/.classpath | 2 +-
 io.openems.edge.controller.ess.standby/.classpath         | 2 +-
 io.openems.edge.controller.ess.timeofusetariff/.classpath | 2 +-
 io.openems.edge.controller.evcs.fixactivepower/.classpath | 2 +-
 io.openems.edge.controller.evcs/.classpath                | 2 +-
 io.openems.edge.controller.generic.jsonlogic/.classpath   | 2 +-
 io.openems.edge.controller.highloadtimeslot/.classpath    | 2 +-
 io.openems.edge.controller.io.alarm/.classpath            | 2 +-
 io.openems.edge.controller.io.analog/.classpath           | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.controller.io.fixdigitaloutput/.classpath | 2 +-
 io.openems.edge.controller.io.heatingelement/.classpath   | 2 +-
 io.openems.edge.controller.io.heatpump.sgready/.classpath | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.core/.classpath                           | 2 +-
 io.openems.edge.edge2edge/.classpath                      | 2 +-
 io.openems.edge.energy.api/.classpath                     | 2 +-
 io.openems.edge.energy/.classpath                         | 2 +-
 io.openems.edge.ess.adstec.storaxe/.classpath             | 2 +-
 io.openems.edge.ess.api/.classpath                        | 2 +-
 io.openems.edge.ess.byd.container/.classpath              | 2 +-
 io.openems.edge.ess.cluster/.classpath                    | 2 +-
 io.openems.edge.ess.core/.classpath                       | 2 +-
 io.openems.edge.ess.fenecon.commercial40/.classpath       | 2 +-
 io.openems.edge.ess.generic/.classpath                    | 2 +-
 io.openems.edge.ess.samsung/.classpath                    | 2 +-
 io.openems.edge.ess.sma/.classpath                        | 2 +-
 io.openems.edge.evcs.alpitronic.hypercharger/.classpath   | 2 +-
 io.openems.edge.evcs.api/.classpath                       | 2 +-
 io.openems.edge.evcs.cluster/.classpath                   | 2 +-
 io.openems.edge.evcs.core/.classpath                      | 2 +-
 io.openems.edge.evcs.dezony/.classpath                    | 2 +-
 io.openems.edge.evcs.goe.chargerhome/.classpath           | 2 +-
 io.openems.edge.evcs.hardybarth/.classpath                | 2 +-
 io.openems.edge.evcs.keba.kecontact/.classpath            | 2 +-
 io.openems.edge.evcs.mennekes/.classpath                  | 2 +-
 io.openems.edge.evcs.ocpp.abl/.classpath                  | 2 +-
 io.openems.edge.evcs.ocpp.common/.classpath               | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.evcs.ocpp.server/.classpath               | 2 +-
 io.openems.edge.evcs.spelsberg/.classpath                 | 2 +-
 io.openems.edge.evcs.webasto.next/.classpath              | 2 +-
 io.openems.edge.evcs.webasto.unite/.classpath             | 2 +-
 io.openems.edge.fenecon.dess/.classpath                   | 2 +-
 io.openems.edge.fenecon.mini/.classpath                   | 2 +-
 io.openems.edge.fenecon.pro/.classpath                    | 2 +-
 io.openems.edge.goodwe/.classpath                         | 2 +-
 io.openems.edge.io.api/.classpath                         | 2 +-
 io.openems.edge.io.filipowski/.classpath                  | 2 +-
 io.openems.edge.io.gpio/.classpath                        | 2 +-
 io.openems.edge.io.kmtronic/.classpath                    | 2 +-
 io.openems.edge.io.offgridswitch/.classpath               | 2 +-
 io.openems.edge.io.revpi/.classpath                       | 2 +-
 io.openems.edge.io.shelly/.classpath                      | 2 +-
 io.openems.edge.io.wago/.classpath                        | 2 +-
 io.openems.edge.io.weidmueller/.classpath                 | 2 +-
 io.openems.edge.kaco.blueplanet.hybrid10/.classpath       | 2 +-
 io.openems.edge.katek.edcom/.classpath                    | 2 +-
 io.openems.edge.kostal.piko/.classpath                    | 2 +-
 io.openems.edge.meter.abb/.classpath                      | 2 +-
 io.openems.edge.meter.api/.classpath                      | 2 +-
 io.openems.edge.meter.artemes.am2/.classpath              | 2 +-
 io.openems.edge.meter.bcontrol.em300/.classpath           | 2 +-
 io.openems.edge.meter.bgetech/.classpath                  | 2 +-
 io.openems.edge.meter.camillebauer.aplus/.classpath       | 2 +-
 io.openems.edge.meter.carlo.gavazzi.em300/.classpath      | 2 +-
 io.openems.edge.meter.discovergy/.classpath               | 2 +-
 io.openems.edge.meter.eastron/.classpath                  | 2 +-
 io.openems.edge.meter.janitza/.classpath                  | 2 +-
 io.openems.edge.meter.kdk/.classpath                      | 2 +-
 io.openems.edge.meter.phoenixcontact/.classpath           | 2 +-
 io.openems.edge.meter.plexlog/.classpath                  | 2 +-
 io.openems.edge.meter.pqplus/.classpath                   | 2 +-
 .../.classpath                                            | 2 +-
 io.openems.edge.meter.siemens/.classpath                  | 2 +-
 io.openems.edge.meter.sma.shm20/.classpath                | 2 +-
 io.openems.edge.meter.socomec/.classpath                  | 2 +-
 io.openems.edge.meter.sunspec/.classpath                  | 2 +-
 io.openems.edge.meter.virtual/.classpath                  | 2 +-
 io.openems.edge.meter.weidmueller/.classpath              | 2 +-
 io.openems.edge.meter.ziehl/.classpath                    | 2 +-
 io.openems.edge.onewire.thermometer/.classpath            | 2 +-
 io.openems.edge.predictor.api/.classpath                  | 2 +-
 io.openems.edge.predictor.lstm/.classpath                 | 2 +-
 io.openems.edge.predictor.persistencemodel/.classpath     | 2 +-
 io.openems.edge.predictor.similardaymodel/.classpath      | 2 +-
 io.openems.edge.pvinverter.api/.classpath                 | 2 +-
 io.openems.edge.pvinverter.cluster/.classpath             | 2 +-
 io.openems.edge.pvinverter.fronius/.classpath             | 2 +-
 io.openems.edge.pvinverter.kaco.blueplanet/.classpath     | 2 +-
 io.openems.edge.pvinverter.kostal/.classpath              | 2 +-
 io.openems.edge.pvinverter.sma/.classpath                 | 2 +-
 io.openems.edge.pvinverter.solarlog/.classpath            | 2 +-
 io.openems.edge.pvinverter.sunspec/.classpath             | 2 +-
 io.openems.edge.scheduler.allalphabetically/.classpath    | 2 +-
 io.openems.edge.scheduler.api/.classpath                  | 2 +-
 io.openems.edge.scheduler.daily/.classpath                | 2 +-
 io.openems.edge.scheduler.fixedorder/.classpath           | 2 +-
 io.openems.edge.simulator/.classpath                      | 2 +-
 io.openems.edge.solaredge/.classpath                      | 2 +-
 io.openems.edge.tesla.powerwall2/.classpath               | 2 +-
 io.openems.edge.thermometer.api/.classpath                | 2 +-
 io.openems.edge.timedata.api/.classpath                   | 2 +-
 io.openems.edge.timedata.influxdb/.classpath              | 2 +-
 io.openems.edge.timedata.rrd4j/.classpath                 | 2 +-
 io.openems.edge.timeofusetariff.api/.classpath            | 2 +-
 io.openems.edge.timeofusetariff.awattar/.classpath        | 2 +-
 io.openems.edge.timeofusetariff.corrently/.classpath      | 2 +-
 io.openems.edge.timeofusetariff.entsoe/.classpath         | 2 +-
 io.openems.edge.timeofusetariff.groupe/.classpath         | 2 +-
 io.openems.edge.timeofusetariff.hassfurt/.classpath       | 2 +-
 io.openems.edge.timeofusetariff.rabotcharge/.classpath    | 2 +-
 io.openems.edge.timeofusetariff.swisspower/.classpath     | 2 +-
 io.openems.edge.timeofusetariff.tibber/.classpath         | 2 +-
 io.openems.oem.openems/.classpath                         | 2 +-
 io.openems.shared.influxdb/.classpath                     | 2 +-
 io.openems.wrapper/.classpath                             | 2 +-
 tools/debian/DEBIAN/control                               | 2 +-
 tools/prepare-commit.sh                                   | 2 +-
 200 files changed, 218 insertions(+), 202 deletions(-)

diff --git a/cnf/build.bnd b/cnf/build.bnd
index dbc9605619d..ca20f08127f 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -75,5 +75,5 @@ testpath: \
 	Edge_Timedata;member=${filter;${p};io\.openems\.edge\.timedata\..*},\
 	Edge_TimeOfUseTariff;member=${filter;${p};io\.openems\.edge\.timeofusetariff\..*},\
 
-javac.source: 17
-javac.target: 17
+javac.source: 21
+javac.target: 21
diff --git a/doc/modules/ROOT/pages/backend/deploy.adoc b/doc/modules/ROOT/pages/backend/deploy.adoc
index 0c6b873909a..b29e8775ce2 100644
--- a/doc/modules/ROOT/pages/backend/deploy.adoc
+++ b/doc/modules/ROOT/pages/backend/deploy.adoc
@@ -16,6 +16,14 @@ This chapter explains how OpenEMS Backend can be deployed on a Debian Linux serv
 
 NOTE: It is recommended to run every service on a server with limited permissions. This example runs OpenEMS Backend with user "root" which is a bad idea for a production server!  
 
+==== Check JAVA version
+
+Ensure that a JRE version 21 or later is installed. We recommend using `temurin-21-jre`
+
+For detailed installation instructions, visit https://adoptium.net/de/installation/linux/[Adoptium Installation Guide].
+
+NOTE: If you are using an *ARM32* device, download https://openems.io/download/temurin-21-jre-armhf_21.0.6+2.deb[temurin-21-jre-armhf_21.0.6+2.deb] directly from OpenEMS.
+
 ==== Create an application directory
 
 Create the directory */opt/openems-backend*. This is going to be the place, where we put the JAR file.
diff --git a/doc/modules/ROOT/pages/contribute/coding-guidelines.adoc b/doc/modules/ROOT/pages/contribute/coding-guidelines.adoc
index 065e9838276..ef73cf51635 100644
--- a/doc/modules/ROOT/pages/contribute/coding-guidelines.adoc
+++ b/doc/modules/ROOT/pages/contribute/coding-guidelines.adoc
@@ -25,7 +25,7 @@
 * Use precise naming for methods/functions
 * Use narrow scopes for variables; avoid class variables
 * Split code in Interface, Implementation(..Impl) and Config files
-* Use modern Java 17 syntax (e.g. 'var' keyword, streams, etc.)
+* Use modern Java 21 syntax (e.g. 'var' keyword, streams, etc.)
 * Add readme.adoc to a new bundle
 * Review data in bnd.bnd file
 * Format all files via Eclipse Autoformat, organize Imports, apply Checkstyle suggestions (see below)
diff --git a/doc/modules/ROOT/pages/edge/deploy.adoc b/doc/modules/ROOT/pages/edge/deploy.adoc
index 631099c92c2..3a9e28dcb2f 100644
--- a/doc/modules/ROOT/pages/edge/deploy.adoc
+++ b/doc/modules/ROOT/pages/edge/deploy.adoc
@@ -58,6 +58,14 @@ image::deploy-winscp.png[Start WinSCP from KiTTY]
 
 === Prepare operating system environment
 
+==== Check JAVA version
+
+Ensure that a JRE version 21 or later is installed. We recommend using `temurin-21-jre`
+
+For detailed installation instructions, visit https://adoptium.net/de/installation/linux/[Adoptium Installation Guide].
+
+NOTE: If you are using an *ARM32* device, download https://openems.io/download/temurin-21-jre-armhf_21.0.6+2.deb[temurin-21-jre-armhf_21.0.6+2.deb] directly from OpenEMS.
+
 ==== Create an application directory
 
 Create the directory */usr/lib/openems*. This is going to be the place, where we put the JAR file.
diff --git a/doc/modules/ROOT/pages/gettingstarted.adoc b/doc/modules/ROOT/pages/gettingstarted.adoc
index 6ecd5effb4d..87441ec6fc2 100644
--- a/doc/modules/ROOT/pages/gettingstarted.adoc
+++ b/doc/modules/ROOT/pages/gettingstarted.adoc
@@ -41,7 +41,7 @@ NOTE: OpenEMS uses the **git** version control system via the popular GitHub pla
 NOTE: Eclipse IDE is the recommended development environment for newcomers to OpenEMS. If you are more familiar with IntelliJ IDEA, feel free to use it. Follow xref:intellij.adoc[this guide].
 
 . Prepare Eclipse IDE
-.. Download Java Development Kit (JDK) 17 and install it. We recommend the https://adoptium.net/de/temurin/releases/?version=17[OpenJDK Temurin builds by the Adoptium project]
+.. Download Java Development Kit (JDK) 21 and install it. We recommend the https://adoptium.net/de/temurin/releases/?version=21[OpenJDK Temurin builds by the Adoptium project]
 .. Download https://www.eclipse.org/downloads/[Eclipse for Java icon:external-link[]], install and start it
 .. On first start you will get asked to create a workspace.
 Select your source code directory (`C:\Users\your.user\git\openems` in our example) and press btn:[Launch].
@@ -53,15 +53,15 @@ image::eclipse-workspace.png[Creating a workspace in Eclipse IDE]
 +
 Menu: btn:[Help] → btn:[Eclipse Marketplace...] → btn:[Find:] → enter btn:[Bndtools] → press btn:[Install]
 
-.. Configure Eclipse IDE to use JDK 17.
+.. Configure Eclipse IDE to use JDK 21.
 +
 - In the Menu select btn:[Windows] → btn:[Preferences]
 - Select btn:[Java] - btn:[Installed JREs] in the navigation tree
 - Press the btn:[Add...] button
 - Keep btn:[Standard VM] selected and press btn:[Next >]
-- Press the btn:[Directory...] button and select the folder of the installed JDK (e.g. `C:\Program Files\Eclipse Adoptium\jdk-17.0.7.7-hotspot`)
+- Press the btn:[Directory...] button and select the folder of the installed JDK (e.g. `C:\Program Files\Eclipse Adoptium\jdk-21.0.3.9-hotspot`)
 - Press the btn:[Finish] button
-- Back in the Preferences window, tick the newly added JDK 17 and press btn:[Apply and Close]
+- Back in the Preferences window, tick the newly added JDK 21 and press btn:[Apply and Close]
 +
 .Creating a workspace in Eclipse IDE
 image::eclipse-select-jdk.png[Set the Java Development Kit in Eclipse IDE]
diff --git a/gradle.properties b/gradle.properties
index efd93dfc0b3..0c9eee2fd06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 java_source=21
-java_target=17
+java_target=21
 
 bnd_version=7.1.0
 bnd_snapshots=https://bndtools.jfrog.io/bndtools/libs-snapshot-local
diff --git a/io.openems.backend.alerting/.classpath b/io.openems.backend.alerting/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.alerting/.classpath
+++ b/io.openems.backend.alerting/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.application/.classpath b/io.openems.backend.application/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.application/.classpath
+++ b/io.openems.backend.application/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
index db09c80078b..790f4a8f5b5 100644
--- a/io.openems.backend.application/BackendApp.bndrun
+++ b/io.openems.backend.application/BackendApp.bndrun
@@ -1,5 +1,5 @@
 -runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
--runee: JavaSE-17
+-runee: JavaSE-21
 -runprovidedcapabilities: ${native_capability}
 
 -resolve.effective: active
diff --git a/io.openems.backend.b2brest/.classpath b/io.openems.backend.b2brest/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.b2brest/.classpath
+++ b/io.openems.backend.b2brest/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.b2bwebsocket/.classpath b/io.openems.backend.b2bwebsocket/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.b2bwebsocket/.classpath
+++ b/io.openems.backend.b2bwebsocket/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.common/.classpath b/io.openems.backend.common/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.common/.classpath
+++ b/io.openems.backend.common/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.core/.classpath b/io.openems.backend.core/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.core/.classpath
+++ b/io.openems.backend.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.edgewebsocket/.classpath b/io.openems.backend.edgewebsocket/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.edgewebsocket/.classpath
+++ b/io.openems.backend.edgewebsocket/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.metadata.dummy/.classpath b/io.openems.backend.metadata.dummy/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.metadata.dummy/.classpath
+++ b/io.openems.backend.metadata.dummy/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.metadata.file/.classpath b/io.openems.backend.metadata.file/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.metadata.file/.classpath
+++ b/io.openems.backend.metadata.file/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.metadata.odoo/.classpath b/io.openems.backend.metadata.odoo/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.metadata.odoo/.classpath
+++ b/io.openems.backend.metadata.odoo/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.timedata.aggregatedinflux/.classpath b/io.openems.backend.timedata.aggregatedinflux/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.timedata.aggregatedinflux/.classpath
+++ b/io.openems.backend.timedata.aggregatedinflux/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.timedata.dummy/.classpath b/io.openems.backend.timedata.dummy/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.timedata.dummy/.classpath
+++ b/io.openems.backend.timedata.dummy/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.timedata.influx/.classpath b/io.openems.backend.timedata.influx/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.timedata.influx/.classpath
+++ b/io.openems.backend.timedata.influx/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.timedata.timescaledb/.classpath b/io.openems.backend.timedata.timescaledb/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.timedata.timescaledb/.classpath
+++ b/io.openems.backend.timedata.timescaledb/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.backend.uiwebsocket/.classpath b/io.openems.backend.uiwebsocket/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.backend.uiwebsocket/.classpath
+++ b/io.openems.backend.uiwebsocket/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.common/.classpath b/io.openems.common/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.common/.classpath
+++ b/io.openems.common/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.application/.classpath b/io.openems.edge.application/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.application/.classpath
+++ b/io.openems.edge.application/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 86fbedc8dcd..5bea627e5d2 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -1,5 +1,5 @@
 -runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
--runee: JavaSE-17
+-runee: JavaSE-21
 -runprovidedcapabilities: ${native_capability}
 
 -resolve.effective: active
diff --git a/io.openems.edge.battery.api/.classpath b/io.openems.edge.battery.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.battery.api/.classpath
+++ b/io.openems.edge.battery.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.battery.bmw/.classpath b/io.openems.edge.battery.bmw/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.battery.bmw/.classpath
+++ b/io.openems.edge.battery.bmw/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.battery.bydcommercial/.classpath b/io.openems.edge.battery.bydcommercial/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.battery.bydcommercial/.classpath
+++ b/io.openems.edge.battery.bydcommercial/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.battery.fenecon.commercial/.classpath b/io.openems.edge.battery.fenecon.commercial/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.battery.fenecon.commercial/.classpath
+++ b/io.openems.edge.battery.fenecon.commercial/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.battery.fenecon.home/.classpath b/io.openems.edge.battery.fenecon.home/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.battery.fenecon.home/.classpath
+++ b/io.openems.edge.battery.fenecon.home/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.battery.soltaro/.classpath b/io.openems.edge.battery.soltaro/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.battery.soltaro/.classpath
+++ b/io.openems.edge.battery.soltaro/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.batteryinverter.api/.classpath b/io.openems.edge.batteryinverter.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.batteryinverter.api/.classpath
+++ b/io.openems.edge.batteryinverter.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/.classpath b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/.classpath
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.batteryinverter.refu88k/.classpath b/io.openems.edge.batteryinverter.refu88k/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.batteryinverter.refu88k/.classpath
+++ b/io.openems.edge.batteryinverter.refu88k/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.batteryinverter.sinexcel/.classpath b/io.openems.edge.batteryinverter.sinexcel/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.batteryinverter.sinexcel/.classpath
+++ b/io.openems.edge.batteryinverter.sinexcel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.batteryinverter.sunspec/.classpath b/io.openems.edge.batteryinverter.sunspec/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.batteryinverter.sunspec/.classpath
+++ b/io.openems.edge.batteryinverter.sunspec/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.bosch.bpts5hybrid/.classpath b/io.openems.edge.bosch.bpts5hybrid/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.bosch.bpts5hybrid/.classpath
+++ b/io.openems.edge.bosch.bpts5hybrid/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.bridge.http/.classpath b/io.openems.edge.bridge.http/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.bridge.http/.classpath
+++ b/io.openems.edge.bridge.http/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.bridge.mbus/.classpath b/io.openems.edge.bridge.mbus/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.bridge.mbus/.classpath
+++ b/io.openems.edge.bridge.mbus/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.bridge.modbus/.classpath b/io.openems.edge.bridge.modbus/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.bridge.modbus/.classpath
+++ b/io.openems.edge.bridge.modbus/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.bridge.onewire/.classpath b/io.openems.edge.bridge.onewire/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.bridge.onewire/.classpath
+++ b/io.openems.edge.bridge.onewire/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.common/.classpath b/io.openems.edge.common/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.common/.classpath
+++ b/io.openems.edge.common/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api.backend/.classpath b/io.openems.edge.controller.api.backend/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api.backend/.classpath
+++ b/io.openems.edge.controller.api.backend/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api.common/.classpath b/io.openems.edge.controller.api.common/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api.common/.classpath
+++ b/io.openems.edge.controller.api.common/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api.modbus/.classpath b/io.openems.edge.controller.api.modbus/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api.modbus/.classpath
+++ b/io.openems.edge.controller.api.modbus/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api.mqtt/.classpath b/io.openems.edge.controller.api.mqtt/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api.mqtt/.classpath
+++ b/io.openems.edge.controller.api.mqtt/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api.rest/.classpath b/io.openems.edge.controller.api.rest/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api.rest/.classpath
+++ b/io.openems.edge.controller.api.rest/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api.websocket/.classpath b/io.openems.edge.controller.api.websocket/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api.websocket/.classpath
+++ b/io.openems.edge.controller.api.websocket/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.api/.classpath b/io.openems.edge.controller.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.api/.classpath
+++ b/io.openems.edge.controller.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.asymmetric.balancingcosphi/.classpath b/io.openems.edge.controller.asymmetric.balancingcosphi/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.asymmetric.balancingcosphi/.classpath
+++ b/io.openems.edge.controller.asymmetric.balancingcosphi/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.asymmetric.fixreactivepower/.classpath b/io.openems.edge.controller.asymmetric.fixreactivepower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.asymmetric.fixreactivepower/.classpath
+++ b/io.openems.edge.controller.asymmetric.fixreactivepower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.asymmetric.peakshaving/.classpath b/io.openems.edge.controller.asymmetric.peakshaving/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.asymmetric.peakshaving/.classpath
+++ b/io.openems.edge.controller.asymmetric.peakshaving/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.asymmetric.phaserectification/.classpath b/io.openems.edge.controller.asymmetric.phaserectification/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.asymmetric.phaserectification/.classpath
+++ b/io.openems.edge.controller.asymmetric.phaserectification/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.channelthreshold/.classpath b/io.openems.edge.controller.channelthreshold/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.channelthreshold/.classpath
+++ b/io.openems.edge.controller.channelthreshold/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.chp.soc/.classpath b/io.openems.edge.controller.chp.soc/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.chp.soc/.classpath
+++ b/io.openems.edge.controller.chp.soc/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.debug.detailedlog/.classpath b/io.openems.edge.controller.debug.detailedlog/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.debug.detailedlog/.classpath
+++ b/io.openems.edge.controller.debug.detailedlog/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.debug.log/.classpath b/io.openems.edge.controller.debug.log/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.debug.log/.classpath
+++ b/io.openems.edge.controller.debug.log/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.acisland/.classpath b/io.openems.edge.controller.ess.acisland/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.acisland/.classpath
+++ b/io.openems.edge.controller.ess.acisland/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/.classpath b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/.classpath
+++ b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.balancing/.classpath b/io.openems.edge.controller.ess.balancing/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.balancing/.classpath
+++ b/io.openems.edge.controller.ess.balancing/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.cycle/.classpath b/io.openems.edge.controller.ess.cycle/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.cycle/.classpath
+++ b/io.openems.edge.controller.ess.cycle/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.delaycharge/.classpath b/io.openems.edge.controller.ess.delaycharge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.delaycharge/.classpath
+++ b/io.openems.edge.controller.ess.delaycharge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.delayedselltogrid/.classpath b/io.openems.edge.controller.ess.delayedselltogrid/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.delayedselltogrid/.classpath
+++ b/io.openems.edge.controller.ess.delayedselltogrid/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/.classpath b/io.openems.edge.controller.ess.emergencycapacityreserve/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/.classpath
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.fastfrequencyreserve/.classpath b/io.openems.edge.controller.ess.fastfrequencyreserve/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.fastfrequencyreserve/.classpath
+++ b/io.openems.edge.controller.ess.fastfrequencyreserve/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.fixactivepower/.classpath b/io.openems.edge.controller.ess.fixactivepower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.fixactivepower/.classpath
+++ b/io.openems.edge.controller.ess.fixactivepower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.fixstateofcharge/.classpath b/io.openems.edge.controller.ess.fixstateofcharge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.fixstateofcharge/.classpath
+++ b/io.openems.edge.controller.ess.fixstateofcharge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/.classpath b/io.openems.edge.controller.ess.gridoptimizedcharge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/.classpath
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/.classpath b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/.classpath
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.limiter14a/.classpath b/io.openems.edge.controller.ess.limiter14a/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.limiter14a/.classpath
+++ b/io.openems.edge.controller.ess.limiter14a/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/.classpath b/io.openems.edge.controller.ess.limittotaldischarge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/.classpath
+++ b/io.openems.edge.controller.ess.limittotaldischarge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.linearpowerband/.classpath b/io.openems.edge.controller.ess.linearpowerband/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.linearpowerband/.classpath
+++ b/io.openems.edge.controller.ess.linearpowerband/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.mindischargeperiod/.classpath b/io.openems.edge.controller.ess.mindischargeperiod/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.mindischargeperiod/.classpath
+++ b/io.openems.edge.controller.ess.mindischargeperiod/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/.classpath b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/.classpath
+++ b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.selltogridlimit/.classpath b/io.openems.edge.controller.ess.selltogridlimit/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.selltogridlimit/.classpath
+++ b/io.openems.edge.controller.ess.selltogridlimit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.standby/.classpath b/io.openems.edge.controller.ess.standby/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.standby/.classpath
+++ b/io.openems.edge.controller.ess.standby/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.ess.timeofusetariff/.classpath b/io.openems.edge.controller.ess.timeofusetariff/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/.classpath
+++ b/io.openems.edge.controller.ess.timeofusetariff/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.evcs.fixactivepower/.classpath b/io.openems.edge.controller.evcs.fixactivepower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.evcs.fixactivepower/.classpath
+++ b/io.openems.edge.controller.evcs.fixactivepower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.evcs/.classpath b/io.openems.edge.controller.evcs/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.evcs/.classpath
+++ b/io.openems.edge.controller.evcs/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.generic.jsonlogic/.classpath b/io.openems.edge.controller.generic.jsonlogic/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.generic.jsonlogic/.classpath
+++ b/io.openems.edge.controller.generic.jsonlogic/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.highloadtimeslot/.classpath b/io.openems.edge.controller.highloadtimeslot/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.highloadtimeslot/.classpath
+++ b/io.openems.edge.controller.highloadtimeslot/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.io.alarm/.classpath b/io.openems.edge.controller.io.alarm/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.io.alarm/.classpath
+++ b/io.openems.edge.controller.io.alarm/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.io.analog/.classpath b/io.openems.edge.controller.io.analog/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.io.analog/.classpath
+++ b/io.openems.edge.controller.io.analog/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.io.channelsinglethreshold/.classpath b/io.openems.edge.controller.io.channelsinglethreshold/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.io.channelsinglethreshold/.classpath
+++ b/io.openems.edge.controller.io.channelsinglethreshold/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.io.fixdigitaloutput/.classpath b/io.openems.edge.controller.io.fixdigitaloutput/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.io.fixdigitaloutput/.classpath
+++ b/io.openems.edge.controller.io.fixdigitaloutput/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.io.heatingelement/.classpath b/io.openems.edge.controller.io.heatingelement/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.io.heatingelement/.classpath
+++ b/io.openems.edge.controller.io.heatingelement/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.io.heatpump.sgready/.classpath b/io.openems.edge.controller.io.heatpump.sgready/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/.classpath
+++ b/io.openems.edge.controller.io.heatpump.sgready/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.pvinverter.fixpowerlimit/.classpath b/io.openems.edge.controller.pvinverter.fixpowerlimit/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.pvinverter.fixpowerlimit/.classpath
+++ b/io.openems.edge.controller.pvinverter.fixpowerlimit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.pvinverter.selltogridlimit/.classpath b/io.openems.edge.controller.pvinverter.selltogridlimit/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.pvinverter.selltogridlimit/.classpath
+++ b/io.openems.edge.controller.pvinverter.selltogridlimit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.symmetric.balancingschedule/.classpath b/io.openems.edge.controller.symmetric.balancingschedule/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.symmetric.balancingschedule/.classpath
+++ b/io.openems.edge.controller.symmetric.balancingschedule/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.symmetric.fixreactivepower/.classpath b/io.openems.edge.controller.symmetric.fixreactivepower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.symmetric.fixreactivepower/.classpath
+++ b/io.openems.edge.controller.symmetric.fixreactivepower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.symmetric.limitactivepower/.classpath b/io.openems.edge.controller.symmetric.limitactivepower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.symmetric.limitactivepower/.classpath
+++ b/io.openems.edge.controller.symmetric.limitactivepower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.symmetric.peakshaving/.classpath b/io.openems.edge.controller.symmetric.peakshaving/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.symmetric.peakshaving/.classpath
+++ b/io.openems.edge.controller.symmetric.peakshaving/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.symmetric.randompower/.classpath b/io.openems.edge.controller.symmetric.randompower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.symmetric.randompower/.classpath
+++ b/io.openems.edge.controller.symmetric.randompower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.controller.symmetric.timeslotpeakshaving/.classpath b/io.openems.edge.controller.symmetric.timeslotpeakshaving/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.controller.symmetric.timeslotpeakshaving/.classpath
+++ b/io.openems.edge.controller.symmetric.timeslotpeakshaving/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.core/.classpath b/io.openems.edge.core/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.core/.classpath
+++ b/io.openems.edge.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.edge2edge/.classpath b/io.openems.edge.edge2edge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.edge2edge/.classpath
+++ b/io.openems.edge.edge2edge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.energy.api/.classpath b/io.openems.edge.energy.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.energy.api/.classpath
+++ b/io.openems.edge.energy.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.energy/.classpath b/io.openems.edge.energy/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.energy/.classpath
+++ b/io.openems.edge.energy/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.adstec.storaxe/.classpath b/io.openems.edge.ess.adstec.storaxe/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.adstec.storaxe/.classpath
+++ b/io.openems.edge.ess.adstec.storaxe/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.api/.classpath b/io.openems.edge.ess.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.api/.classpath
+++ b/io.openems.edge.ess.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.byd.container/.classpath b/io.openems.edge.ess.byd.container/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.byd.container/.classpath
+++ b/io.openems.edge.ess.byd.container/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.cluster/.classpath b/io.openems.edge.ess.cluster/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.cluster/.classpath
+++ b/io.openems.edge.ess.cluster/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.core/.classpath b/io.openems.edge.ess.core/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.core/.classpath
+++ b/io.openems.edge.ess.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.fenecon.commercial40/.classpath b/io.openems.edge.ess.fenecon.commercial40/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.fenecon.commercial40/.classpath
+++ b/io.openems.edge.ess.fenecon.commercial40/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.generic/.classpath b/io.openems.edge.ess.generic/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.generic/.classpath
+++ b/io.openems.edge.ess.generic/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.samsung/.classpath b/io.openems.edge.ess.samsung/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.samsung/.classpath
+++ b/io.openems.edge.ess.samsung/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.ess.sma/.classpath b/io.openems.edge.ess.sma/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.ess.sma/.classpath
+++ b/io.openems.edge.ess.sma/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.alpitronic.hypercharger/.classpath b/io.openems.edge.evcs.alpitronic.hypercharger/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.alpitronic.hypercharger/.classpath
+++ b/io.openems.edge.evcs.alpitronic.hypercharger/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.api/.classpath b/io.openems.edge.evcs.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.api/.classpath
+++ b/io.openems.edge.evcs.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.cluster/.classpath b/io.openems.edge.evcs.cluster/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.cluster/.classpath
+++ b/io.openems.edge.evcs.cluster/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.core/.classpath b/io.openems.edge.evcs.core/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.core/.classpath
+++ b/io.openems.edge.evcs.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.dezony/.classpath b/io.openems.edge.evcs.dezony/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.dezony/.classpath
+++ b/io.openems.edge.evcs.dezony/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.goe.chargerhome/.classpath b/io.openems.edge.evcs.goe.chargerhome/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.goe.chargerhome/.classpath
+++ b/io.openems.edge.evcs.goe.chargerhome/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.hardybarth/.classpath b/io.openems.edge.evcs.hardybarth/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.hardybarth/.classpath
+++ b/io.openems.edge.evcs.hardybarth/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.keba.kecontact/.classpath b/io.openems.edge.evcs.keba.kecontact/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.keba.kecontact/.classpath
+++ b/io.openems.edge.evcs.keba.kecontact/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.mennekes/.classpath b/io.openems.edge.evcs.mennekes/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.mennekes/.classpath
+++ b/io.openems.edge.evcs.mennekes/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.ocpp.abl/.classpath b/io.openems.edge.evcs.ocpp.abl/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.ocpp.abl/.classpath
+++ b/io.openems.edge.evcs.ocpp.abl/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.ocpp.common/.classpath b/io.openems.edge.evcs.ocpp.common/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.ocpp.common/.classpath
+++ b/io.openems.edge.evcs.ocpp.common/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/.classpath b/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/.classpath
+++ b/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.ocpp.server/.classpath b/io.openems.edge.evcs.ocpp.server/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.ocpp.server/.classpath
+++ b/io.openems.edge.evcs.ocpp.server/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.spelsberg/.classpath b/io.openems.edge.evcs.spelsberg/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.spelsberg/.classpath
+++ b/io.openems.edge.evcs.spelsberg/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.webasto.next/.classpath b/io.openems.edge.evcs.webasto.next/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.webasto.next/.classpath
+++ b/io.openems.edge.evcs.webasto.next/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.evcs.webasto.unite/.classpath b/io.openems.edge.evcs.webasto.unite/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.evcs.webasto.unite/.classpath
+++ b/io.openems.edge.evcs.webasto.unite/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.fenecon.dess/.classpath b/io.openems.edge.fenecon.dess/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.fenecon.dess/.classpath
+++ b/io.openems.edge.fenecon.dess/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.fenecon.mini/.classpath b/io.openems.edge.fenecon.mini/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.fenecon.mini/.classpath
+++ b/io.openems.edge.fenecon.mini/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.fenecon.pro/.classpath b/io.openems.edge.fenecon.pro/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.fenecon.pro/.classpath
+++ b/io.openems.edge.fenecon.pro/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.goodwe/.classpath b/io.openems.edge.goodwe/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.goodwe/.classpath
+++ b/io.openems.edge.goodwe/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.api/.classpath b/io.openems.edge.io.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.api/.classpath
+++ b/io.openems.edge.io.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.filipowski/.classpath b/io.openems.edge.io.filipowski/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.filipowski/.classpath
+++ b/io.openems.edge.io.filipowski/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.gpio/.classpath b/io.openems.edge.io.gpio/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.gpio/.classpath
+++ b/io.openems.edge.io.gpio/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.kmtronic/.classpath b/io.openems.edge.io.kmtronic/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.kmtronic/.classpath
+++ b/io.openems.edge.io.kmtronic/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.offgridswitch/.classpath b/io.openems.edge.io.offgridswitch/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.offgridswitch/.classpath
+++ b/io.openems.edge.io.offgridswitch/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.revpi/.classpath b/io.openems.edge.io.revpi/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.revpi/.classpath
+++ b/io.openems.edge.io.revpi/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.shelly/.classpath b/io.openems.edge.io.shelly/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.shelly/.classpath
+++ b/io.openems.edge.io.shelly/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.wago/.classpath b/io.openems.edge.io.wago/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.wago/.classpath
+++ b/io.openems.edge.io.wago/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.io.weidmueller/.classpath b/io.openems.edge.io.weidmueller/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.io.weidmueller/.classpath
+++ b/io.openems.edge.io.weidmueller/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.kaco.blueplanet.hybrid10/.classpath b/io.openems.edge.kaco.blueplanet.hybrid10/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.kaco.blueplanet.hybrid10/.classpath
+++ b/io.openems.edge.kaco.blueplanet.hybrid10/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.katek.edcom/.classpath b/io.openems.edge.katek.edcom/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.katek.edcom/.classpath
+++ b/io.openems.edge.katek.edcom/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.kostal.piko/.classpath b/io.openems.edge.kostal.piko/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.kostal.piko/.classpath
+++ b/io.openems.edge.kostal.piko/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.abb/.classpath b/io.openems.edge.meter.abb/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.abb/.classpath
+++ b/io.openems.edge.meter.abb/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.api/.classpath b/io.openems.edge.meter.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.api/.classpath
+++ b/io.openems.edge.meter.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.artemes.am2/.classpath b/io.openems.edge.meter.artemes.am2/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.artemes.am2/.classpath
+++ b/io.openems.edge.meter.artemes.am2/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.bcontrol.em300/.classpath b/io.openems.edge.meter.bcontrol.em300/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.bcontrol.em300/.classpath
+++ b/io.openems.edge.meter.bcontrol.em300/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.bgetech/.classpath b/io.openems.edge.meter.bgetech/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.bgetech/.classpath
+++ b/io.openems.edge.meter.bgetech/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.camillebauer.aplus/.classpath b/io.openems.edge.meter.camillebauer.aplus/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.camillebauer.aplus/.classpath
+++ b/io.openems.edge.meter.camillebauer.aplus/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/.classpath b/io.openems.edge.meter.carlo.gavazzi.em300/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/.classpath
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.discovergy/.classpath b/io.openems.edge.meter.discovergy/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.discovergy/.classpath
+++ b/io.openems.edge.meter.discovergy/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.eastron/.classpath b/io.openems.edge.meter.eastron/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.eastron/.classpath
+++ b/io.openems.edge.meter.eastron/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.janitza/.classpath b/io.openems.edge.meter.janitza/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.janitza/.classpath
+++ b/io.openems.edge.meter.janitza/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.kdk/.classpath b/io.openems.edge.meter.kdk/.classpath
index bbfbdbe40e7..b4cffd0fe60 100755
--- a/io.openems.edge.meter.kdk/.classpath
+++ b/io.openems.edge.meter.kdk/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.phoenixcontact/.classpath b/io.openems.edge.meter.phoenixcontact/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.phoenixcontact/.classpath
+++ b/io.openems.edge.meter.phoenixcontact/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.plexlog/.classpath b/io.openems.edge.meter.plexlog/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.plexlog/.classpath
+++ b/io.openems.edge.meter.plexlog/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.pqplus/.classpath b/io.openems.edge.meter.pqplus/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.pqplus/.classpath
+++ b/io.openems.edge.meter.pqplus/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.schneider.acti9.smartlink/.classpath b/io.openems.edge.meter.schneider.acti9.smartlink/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.schneider.acti9.smartlink/.classpath
+++ b/io.openems.edge.meter.schneider.acti9.smartlink/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.siemens/.classpath b/io.openems.edge.meter.siemens/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.siemens/.classpath
+++ b/io.openems.edge.meter.siemens/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.sma.shm20/.classpath b/io.openems.edge.meter.sma.shm20/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.sma.shm20/.classpath
+++ b/io.openems.edge.meter.sma.shm20/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.socomec/.classpath b/io.openems.edge.meter.socomec/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.socomec/.classpath
+++ b/io.openems.edge.meter.socomec/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.sunspec/.classpath b/io.openems.edge.meter.sunspec/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.sunspec/.classpath
+++ b/io.openems.edge.meter.sunspec/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.virtual/.classpath b/io.openems.edge.meter.virtual/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.virtual/.classpath
+++ b/io.openems.edge.meter.virtual/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.weidmueller/.classpath b/io.openems.edge.meter.weidmueller/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.weidmueller/.classpath
+++ b/io.openems.edge.meter.weidmueller/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.meter.ziehl/.classpath b/io.openems.edge.meter.ziehl/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.meter.ziehl/.classpath
+++ b/io.openems.edge.meter.ziehl/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.onewire.thermometer/.classpath b/io.openems.edge.onewire.thermometer/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.onewire.thermometer/.classpath
+++ b/io.openems.edge.onewire.thermometer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.predictor.api/.classpath b/io.openems.edge.predictor.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.predictor.api/.classpath
+++ b/io.openems.edge.predictor.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.predictor.lstm/.classpath b/io.openems.edge.predictor.lstm/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.predictor.lstm/.classpath
+++ b/io.openems.edge.predictor.lstm/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.predictor.persistencemodel/.classpath b/io.openems.edge.predictor.persistencemodel/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.predictor.persistencemodel/.classpath
+++ b/io.openems.edge.predictor.persistencemodel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.predictor.similardaymodel/.classpath b/io.openems.edge.predictor.similardaymodel/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.predictor.similardaymodel/.classpath
+++ b/io.openems.edge.predictor.similardaymodel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.api/.classpath b/io.openems.edge.pvinverter.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.api/.classpath
+++ b/io.openems.edge.pvinverter.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.cluster/.classpath b/io.openems.edge.pvinverter.cluster/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.cluster/.classpath
+++ b/io.openems.edge.pvinverter.cluster/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.fronius/.classpath b/io.openems.edge.pvinverter.fronius/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.fronius/.classpath
+++ b/io.openems.edge.pvinverter.fronius/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.kaco.blueplanet/.classpath b/io.openems.edge.pvinverter.kaco.blueplanet/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.kaco.blueplanet/.classpath
+++ b/io.openems.edge.pvinverter.kaco.blueplanet/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.kostal/.classpath b/io.openems.edge.pvinverter.kostal/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.kostal/.classpath
+++ b/io.openems.edge.pvinverter.kostal/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.sma/.classpath b/io.openems.edge.pvinverter.sma/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.sma/.classpath
+++ b/io.openems.edge.pvinverter.sma/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.solarlog/.classpath b/io.openems.edge.pvinverter.solarlog/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.solarlog/.classpath
+++ b/io.openems.edge.pvinverter.solarlog/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.pvinverter.sunspec/.classpath b/io.openems.edge.pvinverter.sunspec/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.pvinverter.sunspec/.classpath
+++ b/io.openems.edge.pvinverter.sunspec/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.scheduler.allalphabetically/.classpath b/io.openems.edge.scheduler.allalphabetically/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.scheduler.allalphabetically/.classpath
+++ b/io.openems.edge.scheduler.allalphabetically/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.scheduler.api/.classpath b/io.openems.edge.scheduler.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.scheduler.api/.classpath
+++ b/io.openems.edge.scheduler.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.scheduler.daily/.classpath b/io.openems.edge.scheduler.daily/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.scheduler.daily/.classpath
+++ b/io.openems.edge.scheduler.daily/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.scheduler.fixedorder/.classpath b/io.openems.edge.scheduler.fixedorder/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.scheduler.fixedorder/.classpath
+++ b/io.openems.edge.scheduler.fixedorder/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.simulator/.classpath b/io.openems.edge.simulator/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.simulator/.classpath
+++ b/io.openems.edge.simulator/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.solaredge/.classpath b/io.openems.edge.solaredge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.solaredge/.classpath
+++ b/io.openems.edge.solaredge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.tesla.powerwall2/.classpath b/io.openems.edge.tesla.powerwall2/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.tesla.powerwall2/.classpath
+++ b/io.openems.edge.tesla.powerwall2/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.thermometer.api/.classpath b/io.openems.edge.thermometer.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.thermometer.api/.classpath
+++ b/io.openems.edge.thermometer.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timedata.api/.classpath b/io.openems.edge.timedata.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timedata.api/.classpath
+++ b/io.openems.edge.timedata.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timedata.influxdb/.classpath b/io.openems.edge.timedata.influxdb/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timedata.influxdb/.classpath
+++ b/io.openems.edge.timedata.influxdb/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timedata.rrd4j/.classpath b/io.openems.edge.timedata.rrd4j/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timedata.rrd4j/.classpath
+++ b/io.openems.edge.timedata.rrd4j/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.api/.classpath b/io.openems.edge.timeofusetariff.api/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.api/.classpath
+++ b/io.openems.edge.timeofusetariff.api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.awattar/.classpath b/io.openems.edge.timeofusetariff.awattar/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.awattar/.classpath
+++ b/io.openems.edge.timeofusetariff.awattar/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.corrently/.classpath b/io.openems.edge.timeofusetariff.corrently/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.corrently/.classpath
+++ b/io.openems.edge.timeofusetariff.corrently/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.entsoe/.classpath b/io.openems.edge.timeofusetariff.entsoe/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.entsoe/.classpath
+++ b/io.openems.edge.timeofusetariff.entsoe/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.groupe/.classpath b/io.openems.edge.timeofusetariff.groupe/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.groupe/.classpath
+++ b/io.openems.edge.timeofusetariff.groupe/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.hassfurt/.classpath b/io.openems.edge.timeofusetariff.hassfurt/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.hassfurt/.classpath
+++ b/io.openems.edge.timeofusetariff.hassfurt/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.rabotcharge/.classpath b/io.openems.edge.timeofusetariff.rabotcharge/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.rabotcharge/.classpath
+++ b/io.openems.edge.timeofusetariff.rabotcharge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.swisspower/.classpath b/io.openems.edge.timeofusetariff.swisspower/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.swisspower/.classpath
+++ b/io.openems.edge.timeofusetariff.swisspower/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.edge.timeofusetariff.tibber/.classpath b/io.openems.edge.timeofusetariff.tibber/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.edge.timeofusetariff.tibber/.classpath
+++ b/io.openems.edge.timeofusetariff.tibber/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.oem.openems/.classpath b/io.openems.oem.openems/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.oem.openems/.classpath
+++ b/io.openems.oem.openems/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.shared.influxdb/.classpath b/io.openems.shared.influxdb/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.shared.influxdb/.classpath
+++ b/io.openems.shared.influxdb/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/io.openems.wrapper/.classpath b/io.openems.wrapper/.classpath
index bbfbdbe40e7..b4cffd0fe60 100644
--- a/io.openems.wrapper/.classpath
+++ b/io.openems.wrapper/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>
diff --git a/tools/debian/DEBIAN/control b/tools/debian/DEBIAN/control
index 1a727b83ba3..18dc6d86725 100755
--- a/tools/debian/DEBIAN/control
+++ b/tools/debian/DEBIAN/control
@@ -3,7 +3,7 @@ Version:
 Section: misc
 Priority: extra
 Architecture: all
-Depends: systemd, java17-runtime-headless
+Depends: systemd, java21-runtime-headless
 Maintainer: OpenEMS Association e.V. <office@openems.io>
 Homepage: https://openems.io
 Description: OpenEMS Edge
diff --git a/tools/prepare-commit.sh b/tools/prepare-commit.sh
index a155377073a..8e94a4c4133 100755
--- a/tools/prepare-commit.sh
+++ b/tools/prepare-commit.sh
@@ -78,7 +78,7 @@ EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test">
 		<attributes>

From 4b768aecbf528a97c1416cc897b23e83edfb3cfa Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Thu, 12 Dec 2024 22:00:05 +0100
Subject: [PATCH 06/49] systemd-service: update to Java 21 (#2921)

* Update to Java 21
---
 tools/debian/etc/systemd/system/openems.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/debian/etc/systemd/system/openems.service b/tools/debian/etc/systemd/system/openems.service
index cb04992892a..e367e7a22a2 100644
--- a/tools/debian/etc/systemd/system/openems.service
+++ b/tools/debian/etc/systemd/system/openems.service
@@ -7,7 +7,7 @@ User=root
 Group=root
 Type=notify
 WorkingDirectory=/usr/lib/openems
-ExecStart=/usr/lib/jvm/temurin-17-jre-armhf/bin/java \
+ExecStart=/usr/lib/jvm/temurin-21-jre-armhf/bin/java \
     -Dorg.osgi.framework.storage=/tmp/org.osgi.framework.storage \
     -Dosgi.clean=true \
     -Dfelix.cm.dir=/etc/openems.d/ \

From d4d0df49c36a325941706d63dae50026842944b3 Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Fri, 13 Dec 2024 13:32:47 +0100
Subject: [PATCH 07/49] Java 21: fix deprecation warnings caused by Java update
 (#2922)

See #2890
---
 .../backend/metadata/odoo/odoo/OdooUtils.java   | 17 ++++++++++-------
 ...istoricTimeseriesExportXlsxResponseTest.java |  2 +-
 .../dalsemi/onewire/adapter/NetAdapterSim.java  | 12 ++++++++++--
 .../ControllerApiRestReadWriteImplTest.java     |  5 +++--
 .../src/io/openems/edge/core/host/HostImpl.java |  7 ++++++-
 .../io/openems/edge/evcs/dezony/DezonyApi.java  |  7 +++++--
 .../edge/evcs/goe/chargerhome/GoeApi.java       |  5 +++--
 .../src/io/openems/edge/wago/IoWagoImpl.java    |  5 +++--
 .../meter/discovergy/DiscovergyApiClient.java   |  5 +++--
 .../edge/tesla/powerwall2/core/ReadWorker.java  |  4 ++--
 10 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooUtils.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooUtils.java
index 638d3c09408..fd92b4cb783 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooUtils.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooUtils.java
@@ -6,7 +6,7 @@
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -101,7 +101,9 @@ public static SuccessResponseAndHeaders sendJsonrpcRequest(String url, String co
 		HttpURLConnection connection = null;
 		try {
 			// Open connection to Odoo
-			connection = (HttpURLConnection) new URL(url).openConnection();
+			connection = (HttpURLConnection) URI.create(url) //
+					.toURL() //
+					.openConnection(); //
 			connection.setConnectTimeout(5000);// 5 secs
 			connection.setReadTimeout(timeout);// 5 secs
 			connection.setRequestProperty("Accept-Charset", "US-ASCII");
@@ -276,8 +278,9 @@ private static Object executeKw(Credentials creds, String model, String action,
 	private static Object executeKw(Credentials creds, String model, String action, Object[] arg, Map<String, ?> kw)
 			throws MalformedURLException, XMLRPCException {
 		var params = new Object[] { creds.getDatabase(), creds.getUid(), creds.getPassword(), model, action, arg, kw };
-		var client = new XMLRPCClient(new URL(String.format("%s/xmlrpc/2/object", creds.getUrl())),
-				XMLRPCClient.FLAGS_NIL);
+		var uri = URI.create(String.format("%s/xmlrpc/2/object", creds.getUrl()));
+		var client = new XMLRPCClient(uri.toURL(), XMLRPCClient.FLAGS_NIL);
+
 		client.setTimeout(60 /* seconds */);
 		return client.call("execute_kw", params);
 	}
@@ -557,9 +560,9 @@ protected static byte[] getOdooReport(Credentials credentials, String report, in
 
 		HttpURLConnection connection = null;
 		try {
-			connection = (HttpURLConnection) new URL(
-					credentials.getUrl() + "/report/pdf/" + report + "/" + id + "?session_id=" + session)
-					.openConnection();
+			connection = (HttpURLConnection) URI
+					.create(credentials.getUrl() + "/report/pdf/" + report + "/" + id + "?session_id=" + session)
+					.toURL().openConnection();
 			connection.setConnectTimeout(5000);
 			connection.setReadTimeout(5000);
 			connection.setRequestMethod("GET");
diff --git a/io.openems.common/test/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponseTest.java b/io.openems.common/test/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponseTest.java
index d59804bff2e..e34f9f1a8a6 100644
--- a/io.openems.common/test/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponseTest.java
+++ b/io.openems.common/test/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponseTest.java
@@ -70,7 +70,7 @@ private byte[] generateXlsxFile() throws OpenemsNamedException, IOException {
 		) {
 			var ws = workbook.newWorksheet("Export");
 
-			Locale currentLocale = new Locale("en", "EN");
+			Locale currentLocale = Locale.of("en", "EN");
 
 			var translationBundle = ResourceBundle.getBundle("io.openems.common.jsonrpc.response.translation",
 					currentLocale);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
index e2732dfacae..b92d9054cb4 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
@@ -230,7 +230,11 @@ public NetAdapterSim(String execCmd, String logFilename, boolean multiThread) th
 	public NetAdapterSim(String execCmd, String logFilename, int listenPort, boolean multiThread) throws IOException {
 		// save references to file and command
 		this.execCommand = execCmd;
-		this.process = Runtime.getRuntime().exec(execCmd);
+
+		// Use ProcessBuilder instead of Runtime.getRuntime().exec()
+		ProcessBuilder processBuilder = new ProcessBuilder(execCmd.split(" "));
+		processBuilder.redirectErrorStream(true); // Redirect error stream to standard output
+		this.process = processBuilder.start();
 		this.processOutput = new BufferedReader(new InputStreamReader(this.process.getInputStream()));
 		this.processError = new BufferedReader(new InputStreamReader(this.process.getErrorStream()));
 		this.processInput = new OutputStreamWriter(this.process.getOutputStream());
@@ -323,7 +327,11 @@ public NetAdapterSim(String execCmd, String logFilename, ServerSocket serverSock
 			throws IOException {
 		// save references to file and command
 		this.execCommand = execCmd;
-		this.process = Runtime.getRuntime().exec(execCmd);
+
+		// Use ProcessBuilder instead of Runtime.getRuntime().exec()
+		ProcessBuilder processBuilder = new ProcessBuilder(execCmd.split(" "));
+		processBuilder.redirectErrorStream(true); // Redirect error stream to standard output
+		this.process = processBuilder.start();
 		this.processOutput = new BufferedReader(new InputStreamReader(this.process.getInputStream()));
 		this.processError = new BufferedReader(new InputStreamReader(this.process.getErrorStream()));
 		this.processInput = new OutputStreamWriter(this.process.getOutputStream());
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
index 0dd9165587a..eaaf3fae866 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
@@ -13,7 +13,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 import java.util.Base64;
 
 import org.junit.Test;
@@ -156,7 +156,8 @@ private static JsonElement sendPostRequest(int port, String password, String end
 	private static JsonElement sendRequest(int port, String requestMethod, String password, String endpoint,
 			JsonObject request) throws OpenemsNamedException {
 		try {
-			var url = new URL("http://127.0.0.1:" + port + endpoint);
+			var uri = URI.create("http://127.0.0.1:" + port + endpoint);
+			var url = uri.toURL();
 			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestProperty("Authorization",
 					"Basic " + new String(Base64.getEncoder().encode(("x:" + password).getBytes())));
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java b/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
index 44c1e8d873c..e9b516ae383 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
@@ -319,8 +319,13 @@ protected void logError(Logger log, String message) {
 	 * @throws IOException on error
 	 */
 	private static String execReadToString(String execCommand) throws IOException {
-		try (var s = new Scanner(Runtime.getRuntime().exec(execCommand).getInputStream()).useDelimiter("\\A")) {
+		ProcessBuilder processBuilder = new ProcessBuilder(execCommand.split(" "));
+		processBuilder.redirectErrorStream(true);
+		Process process = processBuilder.start();
+
+		try (var s = new Scanner(process.getInputStream()).useDelimiter("\\A")) {
 			return s.hasNext() ? s.next().trim() : "";
 		}
 	}
+
 }
diff --git a/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyApi.java b/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyApi.java
index 59b8fa6d9e6..011d6469e2a 100644
--- a/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyApi.java
+++ b/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyApi.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.util.Optional;
 
@@ -95,7 +96,8 @@ public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 		JsonObject result = null;
 
 		try {
-			URL url = new URL(this.baseUrl + endpoint);
+			URI uri = URI.create(this.baseUrl + endpoint);
+			URL url = uri.toURL();
 			HttpURLConnection con = (HttpURLConnection) url.openConnection();
 
 			con.setRequestMethod("GET");
@@ -149,7 +151,8 @@ public JsonObject sendPostRequest(String endpoint) throws OpenemsNamedException
 		JsonObject result = null;
 
 		try {
-			var url = new URL(this.baseUrl + endpoint);
+			URI uri = URI.create(this.baseUrl + endpoint);
+			URL url = uri.toURL();
 			var connection = (HttpURLConnection) url.openConnection();
 
 			// Set general information
diff --git a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
index c8bbfe747a2..39c9871df65 100644
--- a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
+++ b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 
 import com.google.gson.JsonObject;
 
@@ -177,7 +177,8 @@ public boolean setMaxEnergy(int maxEnergy) {
 	 */
 	private JsonObject sendRequest(String urlString, String requestMethod) throws OpenemsNamedException {
 		try {
-			var url = new URL(urlString);
+			var uri = URI.create(urlString);
+			var url = uri.toURL();
 			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestMethod(requestMethod);
 			con.setConnectTimeout(5000);
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/IoWagoImpl.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/IoWagoImpl.java
index d00fe280ee6..fae2ebd405d 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/IoWagoImpl.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/IoWagoImpl.java
@@ -5,7 +5,7 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -160,7 +160,8 @@ private static Document downloadConfigXml(InetAddress ip, String username, Strin
 
 	private static Document downloadConfigXml(InetAddress ip, String filename, String username, String password)
 			throws ParserConfigurationException, SAXException, IOException {
-		var url = new URL(String.format("http://%s/etc/%s", ip.getHostAddress(), filename));
+		var uri = URI.create(String.format("http://%s/etc/%s", ip.getHostAddress(), filename));
+		var url = uri.toURL();
 		var authStr = String.format("%s:%s", username, password);
 		var bytesEncoded = Base64.getEncoder().encode(authStr.getBytes());
 		var authEncoded = new String(bytesEncoded);
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
index 34160ecb35a..e036aff0687 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.stream.Collectors;
@@ -93,7 +93,8 @@ public JsonObject getLastReading(String meterId, Field... fields) throws Openems
 	 */
 	private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException {
 		try {
-			var url = new URL(BASE_URL + endpoint);
+			var uri = URI.create(BASE_URL + endpoint);
+			var url = uri.toURL();
 			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestProperty("Authorization", this.authorizationHeader);
 			con.setRequestMethod("GET");
diff --git a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
index 02c9174d672..a9ffa703907 100644
--- a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
+++ b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Inet4Address;
-import java.net.URL;
+import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -122,7 +122,7 @@ protected void forever() throws Throwable {
 	 */
 	private JsonObject getResponse(String path) throws OpenemsNamedException {
 		try {
-			var url = new URL(this.baseUrl + path);
+			var url = URI.create(this.baseUrl + path).toURL();
 			var connection = (HttpsURLConnection) url.openConnection();
 			connection.setHostnameVerifier((hostname, session) -> true);
 			try (var reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {

From 9ec028dd288dc560030b2a7387647c29b7756392 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:29:48 +0100
Subject: [PATCH 08/49] Build(deps): Bump de.bytefish:pgbulkinsert from 8.1.4
 to 8.1.5 in /cnf (#2924)

* Build(deps): Bump de.bytefish:pgbulkinsert from 8.1.4 to 8.1.5 in /cnf

Bumps [de.bytefish:pgbulkinsert](https://github.com/bytefish/PgBulkInsert) from 8.1.4 to 8.1.5.
- [Release notes](https://github.com/bytefish/PgBulkInsert/releases)
- [Changelog](https://github.com/PgBulkInsert/PgBulkInsert/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bytefish/PgBulkInsert/compare/8.1.4...8.1.5)

---
updated-dependencies:
- dependency-name: de.bytefish:pgbulkinsert
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update wrapper

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                         | 2 +-
 io.openems.wrapper/pgbulkinsert.bnd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 0a90ce77a81..d921113afef 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -105,7 +105,7 @@
 			<!-- Changelog: https://github.com/PgBulkInsert/PgBulkInsert/blob/master/CHANGELOG.md-->
 			<groupId>de.bytefish</groupId>
 			<artifactId>pgbulkinsert</artifactId>
-			<version>8.1.4</version>
+			<version>8.1.5</version>
 		</dependency>
 		<!-- eu -->
 		<dependency>
diff --git a/io.openems.wrapper/pgbulkinsert.bnd b/io.openems.wrapper/pgbulkinsert.bnd
index 41cff7e3259..20cde1ff293 100644
--- a/io.openems.wrapper/pgbulkinsert.bnd
+++ b/io.openems.wrapper/pgbulkinsert.bnd
@@ -1,10 +1,10 @@
 Bundle-Name: pgbulkinsert
 Bundle-DocURL: https://github.com/PgBulkInsert/PgBulkInsert
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 8.1.4
+Bundle-Version: 8.1.5
 
 Include-Resource: \
-	@pgbulkinsert-8.1.4.jar,\
+	@pgbulkinsert-8.1.5.jar,\
 
 -dsannotations: *
 

From 9ec4f9603b1a658cfed9a19acb5df034878c5c8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:50:48 +0100
Subject: [PATCH 09/49] Build(deps): Bump fr.turri:aXMLRPC from 1.14.0 to
 1.15.0 in /cnf (#2925)

* Build(deps): Bump fr.turri:aXMLRPC from 1.14.0 to 1.15.0 in /cnf

Bumps [fr.turri:aXMLRPC](https://github.com/gturri/aXMLRPC) from 1.14.0 to 1.15.0.
- [Changelog](https://github.com/gturri/aXMLRPC/blob/master/Changelog)
- [Commits](https://github.com/gturri/aXMLRPC/compare/aXMLRPC-1.14.0...aXMLRPC-1.15.0)

---
updated-dependencies:
- dependency-name: fr.turri:aXMLRPC
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update wrapper

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                    | 2 +-
 io.openems.wrapper/aXMLRPC.bnd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index d921113afef..055e9c202de 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -130,7 +130,7 @@
 		<dependency>
 			<groupId>fr.turri</groupId>
 			<artifactId>aXMLRPC</artifactId>
-			<version>1.14.0</version>
+			<version>1.15.0</version>
 		</dependency>
 		<!-- info -->
 		<dependency>
diff --git a/io.openems.wrapper/aXMLRPC.bnd b/io.openems.wrapper/aXMLRPC.bnd
index 21c82f88316..c7d9750545f 100644
--- a/io.openems.wrapper/aXMLRPC.bnd
+++ b/io.openems.wrapper/aXMLRPC.bnd
@@ -2,10 +2,10 @@ Bundle-Name: aXMLRPC
 Bundle-Description: aXMLRPC is a Java library with a lightweight XML-RPC client. 
 Bundle-DocURL: https://github.com/gturri/aXMLRPC
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 1.14.0
+Bundle-Version: 1.15.0
 
 Include-Resource: \
-	@aXMLRPC-1.14.0.jar,\
+	@aXMLRPC-1.15.0.jar,\
 
 Export-Package: \
 	de.timroes.axmlrpc,\

From 92d9029f63d3f2df23c24f84ba40f6aeec902f77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:05:12 +0100
Subject: [PATCH 10/49] Build(deps): Bump com.google.guava:guava from
 33.3.1-jre to 33.4.0-jre in /cnf (#2927)

* Build(deps): Bump com.google.guava:guava in /cnf

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.1-jre to 33.4.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update bndrun

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/build.bnd                                    | 2 +-
 cnf/pom.xml                                      | 2 +-
 io.openems.backend.application/BackendApp.bndrun | 2 +-
 io.openems.edge.application/EdgeApp.bndrun       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cnf/build.bnd b/cnf/build.bnd
index ca20f08127f..9dd618398b5 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -40,7 +40,7 @@ buildpath: \
 	org.osgi.service.metatype;version='1.4.1',\
 	org.osgi.service.metatype.annotations;version='1.4.1',\
 	org.osgi.util.promise;version='1.2.0',\
-	com.google.guava;version='33.3.1.jre',\
+	com.google.guava;version='33.4.0.jre',\
 	com.google.guava.failureaccess;version='1.0.2',\
 	com.google.gson;version='2.11.0',\
 
diff --git a/cnf/pom.xml b/cnf/pom.xml
index 055e9c202de..32e92f67f83 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.3.1-jre</version>
+			<version>33.4.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
index 790f4a8f5b5..2f9caaea57f 100644
--- a/io.openems.backend.application/BackendApp.bndrun
+++ b/io.openems.backend.application/BackendApp.bndrun
@@ -63,7 +63,7 @@
 	Java-WebSocket;version='[1.5.4,1.5.5)',\
 	com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.google.guava;version='[33.3.1,33.3.2)',\
+	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.squareup.okio;version='[3.9.1,3.9.2)',\
 	com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 5bea627e5d2..577f4a3dddd 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -205,7 +205,7 @@
 	com.fazecast.jSerialComm;version='[2.10.4,2.10.5)',\
 	com.ghgande.j2mod;version='[3.2.1,3.2.2)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.google.guava;version='[33.3.1,33.3.2)',\
+	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.squareup.okio;version='[3.9.1,3.9.2)',\
 	com.sun.jna;version='[5.15.0,5.15.1)',\

From e37f9b2d272a15f35d9c1c34a8603dda5b9aec1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:33:21 +0100
Subject: [PATCH 11/49] UI: Migration to angular 19 (#2918)

- `@typescript-eslint/ban-types` is deprecated and replaced by other ESlint rules. See https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/ban-types.md for details. Checks have been set to `off` for now
- `@typescript-eslint/switch-exhaustiveness-check` was throwing errors. Has been set to `off` for now
- `@ionic-native` is replaced by `@awesome-cordova-plugins`. See https://stackoverflow.com/a/77201601
  > As of ~ September 27, 2021 all Cordova plugins were moved to a community maintainer. You will need to move all @ionic-native/* packages to their new package name: @awesome-cordova-plugins/*.
- Major version updates to...
  - Angular, Ionic, Cordova, Capacitor
  - ngx-translate
  - date-fns - including new imports. See https://blog.date-fns.org/v40-with-time-zone-support/
  - ng2-charts - including new imports. https://github.com/valor-software/ng2-charts?tab=readme-ov-file#installation
  - ngx-cookie-service
  - ngx-device-detector
  - ngx-spinner
  - rxjs
  - zone.js

- ESlint also found some logical mistakes, like
  - `if ("_sum/EssActivePowerL1" && "_sum/EssActivePowerL2" && "_sum/EssActivePowerL3" in result.data...`
  - ` this.isOtherInputAddress = this.inputChannel.toString() != (null && "_sum/EssSoc" && "_sum/GridActivePower" && "_sum/ProductionActivePower") ? false : true;`
  - `reason?.error?.message || "Unknown error"`

TODO
[ ] Reactivate ESlint rules (where easily possible; add tasks if not possible)

---

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions


</details>



* Build(deps): Bump the angular group across 1 directory with 3 updates

Bumps the angular group with 3 updates in the /ui directory: [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common), [@angular-devkit/core](https://github.com/angular/angular-cli) and [@angular-devkit/schematics](https://github.com/angular/angular-cli).


Updates `@angular/common` from 18.2.12 to 19.0.3
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/19.0.3/packages/common)

Updates `@angular-devkit/core` from 18.2.12 to 19.0.4
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/18.2.12...19.0.4)

Updates `@angular-devkit/schematics` from 18.2.12 to 19.0.4
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/18.2.12...19.0.4)

---
updated-dependencies:
- dependency-name: "@angular/common"
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: angular
- dependency-name: "@angular-devkit/core"
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: angular
- dependency-name: "@angular-devkit/schematics"
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: angular
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Co-authored-by: Lukas Rieger <lukas.rieger@fenecon.de>
---
 ui/.eslintrc.json                             |    33 +-
 ui/angular.json                               |    18 +-
 ui/e2e/protractor.conf.js                     |    37 -
 ui/e2e/src/app.e2e-spec.ts                    |    14 -
 ui/e2e/src/app.po.ts                          |    11 -
 ui/e2e/tsconfig.json                          |    12 -
 ui/package-lock.json                          | 13741 ++++++----------
 ui/package.json                               |    92 +-
 ui/src/app/app.component.ts                   |     1 +
 ui/src/app/app.module.ts                      |     2 +
 ui/src/app/app.service.ts                     |    30 -
 ui/src/app/edge/edge.component.ts             |     1 +
 .../chart/totalchart.component.ts             |     1 +
 .../Controller/ChannelThreshold/flat/flat.ts  |     1 +
 .../ChannelThreshold/overview/overview.ts     |     1 +
 .../Ess/GridoptimizedCharge/chart/chart.ts    |     1 +
 .../chart/sellToGridLimitChart.component.ts   |     1 +
 .../Ess/GridoptimizedCharge/flat/flat.ts      |     1 +
 .../GridoptimizedCharge/overview/overview.ts  |     1 +
 .../Ess/TimeOfUseTariff/chart/chart.ts        |     1 +
 .../Ess/TimeOfUseTariff/flat/flat.ts          |     1 +
 .../Ess/TimeOfUseTariff/overview/overview.ts  |     1 +
 .../Io/DigitalOutput/chart/chart.ts           |     1 +
 .../Io/DigitalOutput/details/chart/chart.ts   |     1 +
 .../DigitalOutput/details/details.overview.ts |     1 +
 .../Controller/Io/DigitalOutput/flat/flat.ts  |     1 +
 .../Io/DigitalOutput/overview/overview.ts     |     1 +
 .../Io/heatingelement/chart/chart.ts          |     1 +
 .../Controller/Io/heatingelement/flat/flat.ts |     1 +
 .../Io/heatingelement/overview/overview.ts    |     1 +
 .../Controller/ModbusTcpApi/chart/chart.ts    |     1 +
 .../Controller/ModbusTcpApi/flat/flat.ts      |     1 +
 .../ModbusTcpApi/overview/overview.ts         |     1 +
 .../edge/history/chpsoc/chart.component.ts    |     1 +
 .../edge/history/chpsoc/widget.component.ts   |     1 +
 .../history/common/autarchy/chart/chart.ts    |     1 +
 .../edge/history/common/autarchy/flat/flat.ts |     1 +
 .../common/autarchy/overview/overview.ts      |     1 +
 .../history/common/consumption/chart/chart.ts |     1 +
 .../details/chart/consumptionMeter.ts         |     1 +
 .../common/consumption/details/chart/evcs.ts  |     1 +
 .../common/consumption/details/chart/sum.ts   |     1 +
 .../consumption/details/details.overview.ts   |     1 +
 .../history/common/consumption/flat/flat.ts   |     1 +
 .../common/consumption/overview/overview.ts   |     1 +
 .../edge/history/common/energy/chart/chart.ts |     1 +
 .../edge/history/common/energy/flat/flat.ts   |     1 +
 .../edge/history/common/grid/chart/chart.ts   |     1 +
 .../common/grid/details/chart/chart.ts        |     1 +
 .../common/grid/details/details.overview.ts   |     1 +
 .../app/edge/history/common/grid/flat/flat.ts |     1 +
 .../history/common/grid/overview/overview.ts  |     1 +
 .../common/production/chart/totalChart.ts     |     1 +
 .../production/details/chart/charger.ts       |     1 +
 .../details/chart/productionMeter.ts          |     1 +
 .../common/production/details/chart/sum.ts    |     1 +
 .../production/details/details.overview.ts    |     1 +
 .../history/common/production/flat/flat.ts    |     1 +
 .../common/production/overview/overview.ts    |     1 +
 .../selfconsumption/chart/chart.component.ts  |     1 +
 .../common/selfconsumption/flat/flat.ts       |     1 +
 .../selfconsumption/overview/overview.ts      |     1 +
 .../delayedselltogrid/chart.component.ts      |     1 +
 ...elayedselltogridchartoverview.component.ts |     1 +
 .../delayedselltogrid/widget.component.ts     |     1 +
 .../edge/history/heatpump/chart.component.ts  |     1 +
 .../heatpumpchartoverview.component.ts        |     1 +
 .../edge/history/heatpump/widget.component.ts |     1 +
 ui/src/app/edge/history/history.component.ts  |     1 +
 .../edge/history/historyparent.component.ts   |     1 +
 ...etricpeakshavingchartoverview.component.ts |     1 +
 .../peakshaving/asymmetric/chart.component.ts |     1 +
 .../asymmetric/widget.component.ts            |     1 +
 .../peakshaving/symmetric/chart.component.ts  |     1 +
 ...etricpeakshavingchartoverview.component.ts |     1 +
 .../peakshaving/symmetric/widget.component.ts |     1 +
 .../peakshaving/timeslot/chart.component.ts   |     1 +
 ...eslotpeakshavingchartoverview.component.ts |     1 +
 .../peakshaving/timeslot/widget.component.ts  |     1 +
 .../history/storage/chargerchart.component.ts |     1 +
 .../history/storage/esschart.component.ts     |     1 +
 .../history/storage/singlechart.component.ts  |     4 +-
 .../history/storage/socchart.component.ts     |     1 +
 .../storagechartoverview.component.ts         |     1 +
 .../history/storage/totalchart.component.ts   |     4 +-
 .../edge/history/storage/widget.component.ts  |     1 +
 .../Channelthreshold/Channelthreshold.ts      |     1 +
 .../app/edge/live/Controller/ChpSoc/ChpSoc.ts |     1 +
 .../ChpSoc/modal/modal.component.ts           |     1 +
 .../Ess/FixActivePower/flat/flat.ts           |     1 +
 .../Ess/FixActivePower/modal/modal.ts         |     1 +
 .../Ess/GridOptimizedCharge/flat/flat.ts      |     1 +
 .../Ess/GridOptimizedCharge/modal/modal.ts    |     1 +
 .../modal/predictionChart.ts                  |     1 +
 .../Ess/TimeOfUseTariff/flat/flat.ts          |     1 +
 .../Ess/TimeOfUseTariff/modal/modal.ts        |     1 +
 .../TimeOfUseTariff/modal/powerSocChart.ts    |     1 +
 .../TimeOfUseTariff/modal/statePriceChart.ts  |     1 +
 .../administration.component.ts               |     1 +
 .../edge/live/Controller/Evcs/flat/flat.ts    |     1 +
 .../edge/live/Controller/Evcs/modal/modal.ts  |     1 +
 .../live/Controller/Evcs/popover/popover.ts   |     1 +
 .../Io_ChannelSingleThreshold.ts              |     7 +-
 .../modal/modal.component.html                |    20 +-
 .../modal/modal.component.ts                  |     1 +
 .../FixDigitalOutput/Io_FixDigitalOutput.ts   |     1 +
 .../FixDigitalOutput/modal/modal.component.ts |     1 +
 .../Controller/Io/HeatingElement/flat/flat.ts |     1 +
 .../Io/HeatingElement/modal/modal.ts          |     1 +
 .../Controller/Io/Heatpump/Io_Heatpump.ts     |     1 +
 .../Io/Heatpump/modal/modal.component.html    |    12 +-
 .../Io/Heatpump/modal/modal.component.ts      |     1 +
 .../live/Controller/ModbusTcpApi/flat/flat.ts |     1 +
 .../Controller/ModbusTcpApi/modal/modal.ts    |     1 +
 .../PeakShaving/Asymmetric/Asymmetric.ts      |     1 +
 .../Asymmetric/modal/modal.component.html     |     6 +-
 .../Asymmetric/modal/modal.component.ts       |     1 +
 .../PeakShaving/Symmetric/Symmetric.ts        |     1 +
 .../Symmetric/modal/modal.component.html      |     6 +-
 .../Symmetric/modal/modal.component.ts        |     1 +
 .../Symmetric_TimeSlot/Symmetric_TimeSlot.ts  |     1 +
 .../modal/modal.component.html                |     9 +-
 .../modal/modal.component.ts                  |     1 +
 .../Api_DigitalInput/Io_Api_DigitalInput.ts   |     1 +
 .../Api_DigitalInput/modal/modal.component.ts |     1 +
 .../Evcs_Api_Cluster/Evcs_Api_Cluster.ts      |     1 +
 .../modal/evcs-chart/evcs.chart.ts            |     1 +
 .../modal/evcsCluster-modal.page.ts           |     1 +
 .../edge/live/common/autarchy/flat/flat.ts    |     1 +
 .../edge/live/common/autarchy/modal/modal.ts  |     1 +
 .../edge/live/common/consumption/flat/flat.ts |     1 +
 .../live/common/consumption/modal/modal.ts    |     1 +
 ui/src/app/edge/live/common/grid/flat/flat.ts |     1 +
 .../app/edge/live/common/grid/modal/modal.ts  |     1 +
 .../edge/live/common/production/flat/flat.ts  |     1 +
 .../live/common/production/modal/modal.ts     |     1 +
 .../live/common/selfconsumption/flat/flat.ts  |     1 +
 .../common/selfconsumption/modal/modal.ts     |     1 +
 .../common/storage/modal/modal.component.ts   |     1 +
 .../live/common/storage/storage.component.ts  |     3 +-
 .../delayedselltogrid.component.ts            |     1 +
 .../modal/modal.component.html                |     6 +-
 .../modal/modal.component.ts                  |     1 +
 .../energymonitor/chart/chart.component.ts    |     1 +
 .../chart/section/consumption.component.ts    |     1 +
 .../chart/section/grid.component.ts           |     1 +
 .../chart/section/production.component.ts     |     1 +
 .../chart/section/storage.component.ts        |     1 +
 .../energymonitor/energymonitor.component.ts  |     1 +
 ui/src/app/edge/live/info/info.component.ts   |     1 +
 ui/src/app/edge/live/live.component.ts        |     1 +
 .../settings/alerting/alerting.component.html |     4 +-
 .../settings/alerting/alerting.component.ts   |     1 +
 .../edge/settings/app/formly/formly-text.ts   |     1 +
 .../settings/app/formly/input-with-unit.ts    |     1 +
 .../formly-option-group-picker.component.ts   |     1 +
 .../formly-reorder-array.component.ts         |     1 +
 .../formly-safe-input-modal.component.ts      |     1 +
 .../safe-input/formly-safe-input.extended.ts  |     1 +
 .../app/edge/settings/app/index.component.ts  |     1 +
 .../edge/settings/app/install.component.ts    |     1 +
 .../settings/app/keypopup/modal.component.ts  |     1 +
 .../app/edge/settings/app/single.component.ts |     1 +
 .../app/edge/settings/app/update.component.ts |     1 +
 .../settings/channels/channels.component.html |    15 +-
 .../settings/channels/channels.component.ts   |     1 +
 .../component/install/index.component.ts      |     1 +
 .../component/install/install.component.ts    |     1 +
 .../component/update/index.component.ts       |     1 +
 .../component/update/update.component.ts      |     1 +
 .../edge/settings/jsonrpctest/jsonrpctest.ts  |     1 +
 .../settings/network/network.component.ts     |     5 +-
 .../settings/powerassistant/powerassistant.ts |     1 +
 .../profile/aliasupdate.component.html        |     4 +-
 .../settings/profile/aliasupdate.component.ts |     1 +
 .../settings/profile/profile.component.ts     |     1 +
 .../app/edge/settings/settings.component.ts   |     1 +
 .../system/maintenance/maintenance.ts         |     1 +
 .../system/oe-system-update.component.ts      |     1 +
 .../edge/settings/system/system.component.ts  |     1 +
 .../systemexecute.component.html              |    18 +-
 .../systemexecute/systemexecute.component.ts  |     1 +
 .../settings/systemlog/systemlog.component.ts |     1 +
 ui/src/app/index/filter/filter.component.html |    12 +-
 ui/src/app/index/filter/filter.component.ts   |     1 +
 ui/src/app/index/login.component.html         |     8 +-
 ui/src/app/index/login.component.ts           |     1 +
 .../index/overview/overview.component.html    |     3 +-
 .../app/index/overview/overview.component.ts  |     1 +
 ui/src/app/index/shared/loading-screen.ts     |     1 +
 ui/src/app/index/shared/sumState.ts           |     1 +
 .../app/registration/modal/modal.component.ts |     1 +
 .../registration/registration.component.ts    |     1 +
 .../shared/components/chart/chart.module.ts   |     4 +-
 ui/src/app/shared/components/chart/chart.ts   |     1 +
 .../currentVoltage/chart/asymmetricMeter.ts   |     1 +
 .../currentVoltage/chart/symmetricMeter.ts    |     1 +
 .../currentVoltage/currentVoltage.overview.ts |     1 +
 .../currentVoltage/currentVoltageModule.ts    |     6 +-
 .../edge/meter/electricity/modal.component.ts |     1 +
 .../edge/meter/esscharger/modal.component.ts  |     1 +
 .../components/edge/meter/meter.module.ts     |     4 +-
 .../edge/offline/offline.component.ts         |     1 +
 .../flat-widget-horizontal-line.ts            |     1 +
 .../flat-widget-line-divider.ts               |     1 +
 .../flat-widget-line-item.ts                  |     1 +
 .../flat/flat-widget-line/flat-widget-line.ts |     1 +
 .../flat-widget-percentagebar.ts              |     1 +
 ui/src/app/shared/components/flat/flat.ts     |     1 +
 .../app/shared/components/footer/footer.html  |     4 +-
 ui/src/app/shared/components/footer/footer.ts |     1 +
 .../footer/subnavigation/footerNavigation.ts  |     1 +
 .../form-field-checkbox-hyperlink.wrapper.ts  |     1 +
 .../form-field-default-cases.wrapper.ts       |     1 +
 .../form-field-multi-step.ts                  |     1 +
 .../components/formly/form-field.wrapper.ts   |     1 +
 .../formly-field-checkbox-with-image.ts       |     1 +
 .../formly-field-modal/formlyfieldmodal.ts    |     1 +
 .../formly-field-radio-with-image.ts          |     1 +
 .../formly-select-field-modal.component.ts    |     1 +
 .../formly/formly-select-field.extended.ts    |     1 +
 .../formly/formly-skeleton-wrapper.ts         |     1 +
 .../formly/input-serial-number-wrapper.ts     |     1 +
 ui/src/app/shared/components/formly/input.ts  |     1 +
 .../formly/panel-wrapper.component.ts         |     1 +
 ui/src/app/shared/components/formly/repeat.ts |     1 +
 .../shared/components/header/app-header.ts    |     1 +
 .../components/header/header.component.ts     |     1 +
 .../history-data-error.component.ts           |     1 +
 .../modal/help-button/help-button.ts          |     1 +
 .../modal/modal-button/modal-button.ts        |     1 +
 .../modal/modal-info-line/modal-info-line.ts  |     1 +
 .../modal-line-item/modal-line-item.ts        |     1 +
 .../components/modal/modal-line/modal-line.ts |     1 +
 .../modal/modal-phases/modal-phases.ts        |     1 +
 .../modal-value-line/modal-value-line.ts      |     1 +
 ui/src/app/shared/components/modal/modal.ts   |     1 +
 .../modal-horizontal-line.ts                  |     1 +
 .../percentagebar/percentagebar.component.ts  |     1 +
 .../components/pickdate/pickdate.component.ts |     4 +-
 .../pickdate/popover/popover.component.ts     |     7 +-
 .../shared/notification/notification.ts       |     1 +
 .../status/single/status.component.ts         |     1 +
 ui/src/app/shared/directive/autofill.ts       |     1 +
 ui/src/app/shared/directive/ngvar.ts          |     1 +
 .../chartoptions/chartoptions.component.ts    |     1 +
 .../chartoptions/popover/popover.component.ts |     1 +
 ui/src/app/shared/ngrx-store/states.ts        |     2 +-
 .../shared/pipe/classname/classname.pipe.ts   |     1 +
 ui/src/app/shared/pipe/converter/converter.ts |     1 +
 .../formatSecondsToDuration.pipe.ts           |     1 +
 .../app/shared/pipe/isclass/isclass.pipe.ts   |     1 +
 ui/src/app/shared/pipe/keys/keys.pipe.ts      |     1 +
 ui/src/app/shared/pipe/sign/sign.pipe.ts      |     1 +
 ui/src/app/shared/pipe/typeof/typeof.pipe.ts  |     1 +
 .../shared/pipe/unitvalue/unitvalue.pipe.ts   |     1 +
 .../app/shared/pipe/version/version.pipe.ts   |     1 +
 ui/src/app/shared/shared.module.ts            |     6 +-
 ui/src/app/shared/type/language.ts            |     2 +-
 ui/src/app/shared/utils/array/array.utils.ts  |    11 +
 .../app/shared/utils/object/object.utils.ts   |     6 +
 .../app/shared/utils/string/string.utils.ts   |    13 +
 ui/src/app/user/user.component.html           |    18 +-
 ui/src/app/user/user.component.ts             |     1 +
 ui/src/environments/index.scss                |     2 +-
 ui/src/global-ion-custom.scss                 |     2 +-
 ui/src/global.scss                            |    48 +-
 ui/tsconfig.json                              |     2 +-
 268 files changed, 5785 insertions(+), 8715 deletions(-)
 delete mode 100644 ui/e2e/protractor.conf.js
 delete mode 100644 ui/e2e/src/app.e2e-spec.ts
 delete mode 100644 ui/e2e/src/app.po.ts
 delete mode 100644 ui/e2e/tsconfig.json
 create mode 100644 ui/src/app/shared/utils/string/string.utils.ts

diff --git a/ui/.eslintrc.json b/ui/.eslintrc.json
index 0504d10ffef..94564f9bfc6 100644
--- a/ui/.eslintrc.json
+++ b/ui/.eslintrc.json
@@ -44,8 +44,18 @@
         "import/order": [
           "error",
           {
-            "groups": ["builtin", "external", "internal", "parent", "sibling", "index"],
-            "alphabetize": { "order": "asc", "caseInsensitive": true }
+            "groups": [
+              "builtin",
+              "external",
+              "internal",
+              "parent",
+              "sibling",
+              "index"
+            ],
+            "alphabetize": {
+              "order": "asc",
+              "caseInsensitive": true
+            }
           }
         ],
         "@typescript-eslint/explicit-member-accessibility": [
@@ -64,6 +74,7 @@
         "@angular-eslint/use-lifecycle-interface": [
           "error"
         ],
+        "@angular-eslint/prefer-standalone": "off",
         "@angular-eslint/directive-selector": [
           "error",
           {
@@ -95,27 +106,15 @@
         ],
         "@typescript-eslint/no-explicit-any": 0,
         "@typescript-eslint/no-namespace": 0,
-        "@typescript-eslint/ban-types": [
-          "error",
-          {
-            "extendDefaults": true,
-            "types": {
-              "{}": false
-            }
-          }
-        ],
+        "@typescript-eslint/no-restricted-types": 0,
         "@typescript-eslint/member-ordering": "error",
+        "@typescript-eslint/no-unused-expressions": "off",
+        "@typescript-eslint/no-empty-object-type": "off",
         "@stylistic/no-multiple-empty-lines": "error",
         "@stylistic/quotes": [
           "error",
           "double"
         ],
-        "@typescript-eslint/switch-exhaustiveness-check": [
-          "error",
-          {
-            "allowDefaultCaseForExhaustiveSwitch": false
-          }
-        ],
         "no-restricted-syntax": [
           "error",
           {
diff --git a/ui/angular.json b/ui/angular.json
index 11947ebaaeb..ae312552523 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -8,7 +8,6 @@
       "sourceRoot": "src",
       "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -44,7 +43,14 @@
               "aot": true,
               "buildOptimizer": true,
               "extractLicenses": true,
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "serviceWorker": true
@@ -212,13 +218,5 @@
   },
   "cli": {
     "analytics": false
-  },
-  "schematics": {
-    "@ionic/angular-toolkit:component": {
-      "styleext": "scss"
-    },
-    "@ionic/angular-toolkit:page": {
-      "styleext": "scss"
-    }
   }
 }
diff --git a/ui/e2e/protractor.conf.js b/ui/e2e/protractor.conf.js
deleted file mode 100644
index d23f1d99631..00000000000
--- a/ui/e2e/protractor.conf.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// @ts-check
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
-
-/**
- * @type { import("protractor").Config }
- */
-exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    './src/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    browserName: 'chrome'
-  },
-  directConnect: true,
-  SELENIUM_PROMISE_MANAGER: false,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function () { }
-  },
-  onPrepare() {
-    require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.json')
-    });
-    jasmine.getEnv().addReporter(new SpecReporter({
-      spec: {
-        displayStacktrace: StacktraceOption.PRETTY
-      }
-    }));
-  }
-};
diff --git a/ui/e2e/src/app.e2e-spec.ts b/ui/e2e/src/app.e2e-spec.ts
deleted file mode 100644
index 33efa08de0b..00000000000
--- a/ui/e2e/src/app.e2e-spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { AppPage } from './app.po';
-
-describe('new App', () => {
-  let page: AppPage;
-
-  beforeEach(() => {
-    page = new AppPage();
-  });
-
-  it('should be blank', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toContain('Start with Ionic UI Components');
-  });
-});
diff --git a/ui/e2e/src/app.po.ts b/ui/e2e/src/app.po.ts
deleted file mode 100644
index c121fd9b869..00000000000
--- a/ui/e2e/src/app.po.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { browser, by, element } from 'protractor';
-
-export class AppPage {
-  navigateTo() {
-    return browser.get('/');
-  }
-
-  getParagraphText() {
-    return element(by.deepCss('app-root ion-content')).getText();
-  }
-}
diff --git a/ui/e2e/tsconfig.json b/ui/e2e/tsconfig.json
deleted file mode 100644
index a82df00eef3..00000000000
--- a/ui/e2e/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
-    "module": "commonjs",
-    "target": "es2018",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  }
-}
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 5976d5145c3..9dc993b1dcd 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -9,31 +9,31 @@
       "version": "2025.1.0-SNAPSHOT",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@angular/animations": "18.2.12",
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/forms": "18.2.12",
-        "@angular/platform-browser": "18.2.12",
-        "@angular/platform-browser-dynamic": "18.2.12",
-        "@angular/router": "18.2.12",
-        "@angular/service-worker": "18.2.12",
+        "@angular/animations": "19.0.3",
+        "@angular/common": "19.0.3",
+        "@angular/core": "19.0.3",
+        "@angular/forms": "19.0.3",
+        "@angular/platform-browser": "19.0.3",
+        "@angular/platform-browser-dynamic": "19.0.3",
+        "@angular/router": "19.0.3",
+        "@angular/service-worker": "19.0.3",
+        "@awesome-cordova-plugins/core": "^6.12.0",
+        "@awesome-cordova-plugins/file-opener": "^6.12.0",
         "@capacitor-community/file-opener": "^6.0.1",
         "@capacitor/android": "^6.2.0",
         "@capacitor/app": "^6.0.2",
-        "@capacitor/core": "^6.1.2",
+        "@capacitor/core": "^6.2.0",
         "@capacitor/filesystem": "^6.0.2",
         "@capacitor/ios": "^6.2.0",
         "@capacitor/splash-screen": "^6.0.3",
-        "@ionic-native/core": "^5.36.0",
-        "@ionic-native/file-opener": "^5.36.0",
-        "@ionic/angular": "^6.7.5",
-        "@ngx-formly/core": "^6.3.11",
-        "@ngx-formly/ionic": "^6.3.11",
-        "@ngx-formly/schematics": "^6.3.10",
-        "@ngx-translate/core": "^15.0.0",
+        "@ionic/angular": "^7.8.6",
+        "@ngx-formly/core": "^6.3.12",
+        "@ngx-formly/ionic": "^6.3.12",
+        "@ngx-formly/schematics": "^6.3.12",
+        "@ngx-translate/core": "^16.0.3",
         "@nodro7/angular-mydatepicker": "^0.14.0",
         "capacitor-blob-writer": "^1.1.17",
-        "capacitor-ios-autofill-save-password": "^3.0.0",
+        "capacitor-ios-autofill-save-password": "^4.0.0",
         "capacitor-secure-storage-plugin": "^0.10.0",
         "chart.js": "^4.4.7",
         "chartjs-adapter-date-fns": "^3.0.0",
@@ -43,37 +43,38 @@
         "classlist.js": "^1.1.20150312",
         "compare-versions": "^6.1.1",
         "d3": "^7.9.0",
-        "date-fns": "^2.30.0",
+        "date-fns": "^4.1.0",
         "file-saver-es": "^2.0.5",
-        "ng2-charts": "4.1.1",
-        "ngx-cookie-service": "18.0.0",
-        "ngx-device-detector": "^8.0.0",
-        "ngx-spinner": "^16.0.2",
+        "ng2-charts": "7.0.0",
+        "ngx-cookie-service": "19.0.0",
+        "ngx-device-detector": "^9.0.0",
+        "ngx-spinner": "^17.0.0",
         "roboto-fontface": "^0.10.0",
-        "rxjs": "~6.6.7",
+        "rxjs": "~7.8.1",
         "swiper": "11.1.15",
         "tslib": "^2.8.1",
         "uuid": "^11.0.3",
-        "zone.js": "~0.14.10"
+        "zone.js": "~0.15.0"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "^18.2.12",
-        "@angular-devkit/core": "18.2.12",
-        "@angular-devkit/schematics": "18.2.12",
-        "@angular-eslint/builder": "^18.4.1",
-        "@angular-eslint/eslint-plugin": "^18.4.1",
-        "@angular-eslint/eslint-plugin-template": "^18.4.1",
-        "@angular-eslint/template-parser": "^18.4.1",
-        "@angular/cli": "18.2.12",
-        "@angular/compiler": "18.2.12",
-        "@angular/compiler-cli": "18.2.12",
-        "@angular/language-service": "18.2.12",
+        "@angular-devkit/build-angular": "^19.0.3",
+        "@angular-devkit/core": "^19.0.5",
+        "@angular-devkit/schematics": "^19.0.5",
+        "@angular-eslint/builder": "^19.0.2",
+        "@angular-eslint/eslint-plugin": "^19.0.2",
+        "@angular-eslint/eslint-plugin-template": "^19.0.2",
+        "@angular-eslint/template-parser": "^19.0.2",
+        "@angular/cli": "^19.0.5",
+        "@angular/compiler": "19.0.3",
+        "@angular/compiler-cli": "19.0.3",
+        "@angular/language-service": "19.0.3",
         "@capacitor/assets": "^3.0.5",
         "@capacitor/cli": "6.2.0",
-        "@ionic/angular-toolkit": "^11.0.1",
+        "@ionic/angular-toolkit": "^12.1.1",
         "@ionic/cli": "^7.2.0",
-        "@stylistic/eslint-plugin": "^2.12.0",
-        "@types/jasmine": "~4.3.6",
+        "@schematics/angular": "^19.0.5",
+        "@stylistic/eslint-plugin": "^2.12.1",
+        "@types/jasmine": "~5.1.5",
         "@types/jasminewd2": "~2.0.13",
         "@types/json-schema": "^7.0.15",
         "@types/node": "^20.12.6",
@@ -81,17 +82,17 @@
         "@types/range-parser": "^1.2.7",
         "@types/send": "^0.17.4",
         "@types/uuid": "^10.0.0",
-        "@typescript-eslint/eslint-plugin": "^7.0.0",
-        "@typescript-eslint/parser": "^7.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.18.0",
+        "@typescript-eslint/parser": "^8.18.0",
         "@typescript-eslint/types": "^8.18.0",
-        "eslint": "^8.57.0",
+        "eslint": "^9.16.0",
         "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-check-file": "^2.8.0",
-        "eslint-plugin-import": "^2.30.0",
-        "eslint-plugin-jsdoc": "50.2.4",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-jsdoc": "50.6.1",
         "eslint-plugin-prefer-arrow": "1.2.3",
         "eslint-plugin-unused-imports": "^4.1.4",
-        "jasmine-core": "~5.3.0",
+        "jasmine-core": "~5.5.0",
         "jasmine-spec-reporter": "~7.0.0",
         "karma": "~6.4.4",
         "karma-chrome-launcher": "~3.2.0",
@@ -99,9 +100,8 @@
         "karma-coverage-istanbul-reporter": "~3.0.3",
         "karma-jasmine": "~5.1.0",
         "karma-jasmine-html-reporter": "^2.1.0",
-        "protractor": "^7.0.0",
         "ts-node": "^10.9.2",
-        "typescript": "~5.4.5",
+        "typescript": "~5.6.3",
         "typescript-strict-plugin": "^2.4.4"
       }
     },
@@ -110,7 +110,6 @@
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -120,13 +119,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
-      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
+      "version": "0.1900.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.5.tgz",
+      "integrity": "sha512-JxgoIxwGw3QNj6e70d04g5yJ8ZK0g/my22UK0TlRJRbYcfFQr8pL7u3wq77iNlgeHMDwBskZEf4TEZOVSbm7mw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/core": "19.0.5",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -135,51 +133,38 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.12.tgz",
-      "integrity": "sha512-quVUi7eqTq9OHumQFNl9Y8t2opm8miu4rlYnuF6rbujmmBDvdUvR6trFChueRczl2p5HWqTOr6NPoDGQm8AyNw==",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.0.3.tgz",
+      "integrity": "sha512-uC8I9WT2y6eMXSOmKGT0X7a9BKNpzfCEWaTvE2VX4RkwqQhNC/2wr2PIz9AeyIBfLGyarsI9QA9TmZ7Qyu25ow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1802.12",
-        "@angular-devkit/build-webpack": "0.1802.12",
-        "@angular-devkit/core": "18.2.12",
-        "@angular/build": "18.2.12",
-        "@babel/core": "7.25.2",
-        "@babel/generator": "7.25.0",
-        "@babel/helper-annotate-as-pure": "7.24.7",
+        "@angular-devkit/architect": "0.1900.3",
+        "@angular-devkit/build-webpack": "0.1900.3",
+        "@angular-devkit/core": "19.0.3",
+        "@angular/build": "19.0.3",
+        "@babel/core": "7.26.0",
+        "@babel/generator": "7.26.2",
+        "@babel/helper-annotate-as-pure": "7.25.9",
         "@babel/helper-split-export-declaration": "7.24.7",
-        "@babel/plugin-transform-async-generator-functions": "7.25.0",
-        "@babel/plugin-transform-async-to-generator": "7.24.7",
-        "@babel/plugin-transform-runtime": "7.24.7",
-        "@babel/preset-env": "7.25.3",
-        "@babel/runtime": "7.25.0",
-        "@discoveryjs/json-ext": "0.6.1",
-        "@ngtools/webpack": "18.2.12",
+        "@babel/plugin-transform-async-generator-functions": "7.25.9",
+        "@babel/plugin-transform-async-to-generator": "7.25.9",
+        "@babel/plugin-transform-runtime": "7.25.9",
+        "@babel/preset-env": "7.26.0",
+        "@babel/runtime": "7.26.0",
+        "@discoveryjs/json-ext": "0.6.3",
+        "@ngtools/webpack": "19.0.3",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.20",
-        "babel-loader": "9.1.3",
+        "babel-loader": "9.2.1",
         "browserslist": "^4.21.5",
         "copy-webpack-plugin": "12.0.2",
-        "critters": "0.0.24",
         "css-loader": "7.1.2",
-        "esbuild-wasm": "0.23.0",
+        "esbuild-wasm": "0.24.0",
         "fast-glob": "3.3.2",
         "http-proxy-middleware": "3.0.3",
-        "https-proxy-agent": "7.0.5",
         "istanbul-lib-instrument": "6.0.3",
         "jsonc-parser": "3.3.1",
         "karma-source-map-support": "1.4.0",
@@ -187,31 +172,26 @@
         "less-loader": "12.2.0",
         "license-webpack-plugin": "4.0.2",
         "loader-utils": "3.3.1",
-        "magic-string": "0.30.11",
-        "mini-css-extract-plugin": "2.9.0",
-        "mrmime": "2.0.0",
+        "mini-css-extract-plugin": "2.9.2",
         "open": "10.1.0",
         "ora": "5.4.1",
-        "parse5-html-rewriting-stream": "7.0.0",
         "picomatch": "4.0.2",
-        "piscina": "4.6.1",
-        "postcss": "8.4.41",
+        "piscina": "4.7.0",
+        "postcss": "8.4.49",
         "postcss-loader": "8.1.1",
         "resolve-url-loader": "5.0.0",
         "rxjs": "7.8.1",
-        "sass": "1.77.6",
-        "sass-loader": "16.0.0",
+        "sass": "1.80.7",
+        "sass-loader": "16.0.3",
         "semver": "7.6.3",
         "source-map-loader": "5.0.0",
         "source-map-support": "0.5.21",
-        "terser": "5.31.6",
+        "terser": "5.36.0",
         "tree-kill": "1.2.2",
-        "tslib": "2.6.3",
-        "vite": "5.4.6",
-        "watchpack": "2.4.1",
-        "webpack": "5.94.0",
+        "tslib": "2.8.1",
+        "webpack": "5.96.1",
         "webpack-dev-middleware": "7.4.2",
-        "webpack-dev-server": "5.0.4",
+        "webpack-dev-server": "5.1.0",
         "webpack-merge": "6.0.1",
         "webpack-subresource-integrity": "5.1.0"
       },
@@ -221,22 +201,23 @@
         "yarn": ">= 1.13.0"
       },
       "optionalDependencies": {
-        "esbuild": "0.23.0"
+        "esbuild": "0.24.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "@angular/localize": "^18.0.0",
-        "@angular/platform-server": "^18.0.0",
-        "@angular/service-worker": "^18.0.0",
-        "@web/test-runner": "^0.18.0",
+        "@angular/compiler-cli": "^19.0.0",
+        "@angular/localize": "^19.0.0",
+        "@angular/platform-server": "^19.0.0",
+        "@angular/service-worker": "^19.0.0",
+        "@angular/ssr": "^19.0.3",
+        "@web/test-runner": "^0.19.0",
         "browser-sync": "^3.0.2",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "karma": "^6.3.0",
-        "ng-packagr": "^18.0.0",
+        "ng-packagr": "^19.0.0",
         "protractor": "^7.0.0",
         "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.4 <5.6"
+        "typescript": ">=5.5 <5.7"
       },
       "peerDependenciesMeta": {
         "@angular/localize": {
@@ -248,6 +229,9 @@
         "@angular/service-worker": {
           "optional": true
         },
+        "@angular/ssr": {
+          "optional": true
+        },
         "@web/test-runner": {
           "optional": true
         },
@@ -274,60 +258,431 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@babel/generator": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
+      "version": "0.1900.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.3.tgz",
+      "integrity": "sha512-8goF98QbzC2pkZkNytun4ViTRnLjMhPIx6ze60V2+OaMjUCkJ25nWcyTd0Q3rNx7wYr9IVuzpeAQBmiZ5igEMg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "@angular-devkit/core": "19.0.3",
+        "rxjs": "7.8.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.3.tgz",
+      "integrity": "sha512-nrzmSKpebmEHGToiRi1NWxZVgzU0M/PCEqsj8Q/LIHrho/YgKVxJ9pX3F7Emo9SmnJJLMYYOQ9qZdAxz4joSMw==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
+      "dependencies": {
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular/build": {
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.0.3.tgz",
+      "integrity": "sha512-lUM8+/8iQuCzq+tGpuaHklsmgai19aBjaI8QWUmD5KYKQcg0DBtrx8WgG3bRKvhvY77AVVLhabMimzTjtrKVXA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "@ampproject/remapping": "2.3.0",
+        "@angular-devkit/architect": "0.1900.3",
+        "@babel/core": "7.26.0",
+        "@babel/helper-annotate-as-pure": "7.25.9",
+        "@babel/helper-split-export-declaration": "7.24.7",
+        "@babel/plugin-syntax-import-attributes": "7.26.0",
+        "@inquirer/confirm": "5.0.2",
+        "@vitejs/plugin-basic-ssl": "1.1.0",
+        "beasties": "0.1.0",
+        "browserslist": "^4.23.0",
+        "esbuild": "0.24.0",
+        "fast-glob": "3.3.2",
+        "https-proxy-agent": "7.0.5",
+        "istanbul-lib-instrument": "6.0.3",
+        "listr2": "8.2.5",
+        "magic-string": "0.30.12",
+        "mrmime": "2.0.0",
+        "parse5-html-rewriting-stream": "7.0.0",
+        "picomatch": "4.0.2",
+        "piscina": "4.7.0",
+        "rollup": "4.26.0",
+        "sass": "1.80.7",
+        "semver": "7.6.3",
+        "vite": "5.4.11",
+        "watchpack": "2.4.2"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "optionalDependencies": {
+        "lmdb": "3.1.5"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "^19.0.0",
+        "@angular/compiler-cli": "^19.0.0",
+        "@angular/localize": "^19.0.0",
+        "@angular/platform-server": "^19.0.0",
+        "@angular/service-worker": "^19.0.0",
+        "@angular/ssr": "^19.0.3",
+        "less": "^4.2.0",
+        "postcss": "^8.4.0",
+        "tailwindcss": "^2.0.0 || ^3.0.0",
+        "typescript": ">=5.5 <5.7"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        },
+        "@angular/platform-server": {
+          "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "@angular/ssr": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+    "node_modules/@angular-devkit/build-angular/node_modules/@inquirer/confirm": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.0.2.tgz",
+      "integrity": "sha512-KJLUHOaKnNCYzwVbryj3TNBxyZIrr56fR5N45v6K9IPrbT6B7DcudBMfylkV1A8PUdJE15mybkEQyp2/ZUpxUA==",
       "dev": true,
-      "license": "0BSD"
+      "dependencies": {
+        "@inquirer/core": "^10.1.0",
+        "@inquirer/type": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.26.0.tgz",
+      "integrity": "sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.26.0.tgz",
+      "integrity": "sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.26.0.tgz",
+      "integrity": "sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.26.0.tgz",
+      "integrity": "sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.26.0.tgz",
+      "integrity": "sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.26.0.tgz",
+      "integrity": "sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.26.0.tgz",
+      "integrity": "sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.26.0.tgz",
+      "integrity": "sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.26.0.tgz",
+      "integrity": "sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.26.0.tgz",
+      "integrity": "sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.26.0.tgz",
+      "integrity": "sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.26.0.tgz",
+      "integrity": "sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.26.0.tgz",
+      "integrity": "sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.26.0.tgz",
+      "integrity": "sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.26.0.tgz",
+      "integrity": "sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.26.0.tgz",
+      "integrity": "sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.26.0.tgz",
+      "integrity": "sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.26.0.tgz",
+      "integrity": "sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rollup": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.26.0.tgz",
+      "integrity": "sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.6"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.26.0",
+        "@rollup/rollup-android-arm64": "4.26.0",
+        "@rollup/rollup-darwin-arm64": "4.26.0",
+        "@rollup/rollup-darwin-x64": "4.26.0",
+        "@rollup/rollup-freebsd-arm64": "4.26.0",
+        "@rollup/rollup-freebsd-x64": "4.26.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.26.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.26.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.26.0",
+        "@rollup/rollup-linux-arm64-musl": "4.26.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.26.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.26.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.26.0",
+        "@rollup/rollup-linux-x64-gnu": "4.26.0",
+        "@rollup/rollup-linux-x64-musl": "4.26.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.26.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.26.0",
+        "@rollup/rollup-win32-x64-msvc": "4.26.0",
+        "fsevents": "~2.3.2"
+      }
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.12.tgz",
-      "integrity": "sha512-0Z3fdbZVRnjYWE2/VYyfy+uieY+6YZyEp4ylzklVkc+fmLNsnz4Zw6cK1LzzcBqAwKIyh1IdW20Cg7o8b0sONA==",
+      "version": "0.1900.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1900.3.tgz",
+      "integrity": "sha512-aXsF3J0Ply2ghT4GLKQQ2kfp+deQxtNjlvk5/yhgB2MG7HIk14c8K/f6VWd9cuJ/vrSkd9EP1f4aFWRyAaA5hw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1802.12",
+        "@angular-devkit/architect": "0.1900.3",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -340,20 +695,25 @@
         "webpack-dev-server": "^5.0.2"
       }
     },
-    "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
+      "version": "0.1900.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.3.tgz",
+      "integrity": "sha512-8goF98QbzC2pkZkNytun4ViTRnLjMhPIx6ze60V2+OaMjUCkJ25nWcyTd0Q3rNx7wYr9IVuzpeAQBmiZ5igEMg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "@angular-devkit/core": "19.0.3",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/core": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz",
-      "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==",
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.3.tgz",
+      "integrity": "sha512-nrzmSKpebmEHGToiRi1NWxZVgzU0M/PCEqsj8Q/LIHrho/YgKVxJ9pX3F7Emo9SmnJJLMYYOQ9qZdAxz4joSMw==",
       "dev": true,
       "dependencies": {
         "ajv": "8.17.1",
@@ -369,7 +729,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -377,25 +737,42 @@
         }
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+    "node_modules/@angular-devkit/core": {
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.5.tgz",
+      "integrity": "sha512-njBblpYHmlDI+Jtbub9NEm9RH+SBIFmmsgL9uJB8GxQVSo2qo4+f69nTkijRNN8WNKsSkYoRR9+JSl9QXWbyEA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz",
-      "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.0.5.tgz",
+      "integrity": "sha512-dhLVBVb0ECfcIP59azoD/5lJMSMU//bo1LEbuE0VrFA9orVxQhgilNuZeVXBr5sOll1PFjxs/fqyX8sAH9xQYw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/core": "19.0.5",
         "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.11",
+        "magic-string": "0.30.12",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
@@ -405,42 +782,34 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/@angular-eslint/builder": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.1.tgz",
-      "integrity": "sha512-Ofkwd9Rg52K+AgvnV1RXYXVBGJvl5jD7+4dqwoprqXG7YKNTdHy5vqNZ5XDSMb26qjoZF7JC+IKruKFaON/ZaA==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-19.0.2.tgz",
+      "integrity": "sha512-BdmMSndQt2fSBiTVniskUcUpQaeweUapbsL0IDfQ7a13vL0NVXpc3K89YXuVE/xsb08uHtqphuwxPAAj6kX3OA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/architect": ">= 0.1900.0 < 0.2000.0",
+        "@angular-devkit/core": ">= 19.0.0 < 20.0.0"
+      },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.1.tgz",
-      "integrity": "sha512-gCQC0mgBO1bwHDXL9CUgHW+Rf1XGZCLAopoXnggwxGkBCx+oww507t+jrSOxdh+4OTKU4ZfmbtWd7Y8AeXns8w==",
-      "dev": true,
-      "license": "MIT"
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.0.2.tgz",
+      "integrity": "sha512-HPmp92r70SNO/0NdIaIhxrgVSpomqryuUk7jszvNRtu+OzYCJGcbLhQD38T3dbBWT/AV0QXzyzExn6/2ai9fEw==",
+      "dev": true
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.1.tgz",
-      "integrity": "sha512-FoHwj+AFo8ONKb8wEK5qpo6uefuyklZlDqErJxeC3fpNIJzDe8PWBcJsuZt7Wwm/HeggWgt0Au6h+3IEa0V3BQ==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.0.2.tgz",
+      "integrity": "sha512-DLuNVVGGFicSThOcMSJyNje+FZSPdG0B3lCBRiqcgKH/16kfM4pV8MobPM7RGK2NhaOmmZ4zzJNwpwWPSgi+Lw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1",
-        "@angular-eslint/utils": "18.4.1"
+        "@angular-eslint/bundled-angular-compiler": "19.0.2",
+        "@angular-eslint/utils": "19.0.2"
       },
       "peerDependencies": {
         "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -449,14 +818,13 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.1.tgz",
-      "integrity": "sha512-sofnKpi6wOZ6avVfYYqB7sCgGgWF2HgCZfW+IAp1MtVD2FBa1zTSbbfIZ1I8Akpd22UXa4LKJd0TLwm5XHHkiQ==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.0.2.tgz",
+      "integrity": "sha512-f/OCF9ThnxQ8m0eNYPwnCrySQPhYfCOF6STL7F9LnS8Bs3ZeW3/oT1yLaMIZ1Eg0ogIkgxksMAJZjrJPUPBD1Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1",
-        "@angular-eslint/utils": "18.4.1",
+        "@angular-eslint/bundled-angular-compiler": "19.0.2",
+        "@angular-eslint/utils": "19.0.2",
         "aria-query": "5.3.2",
         "axobject-query": "4.1.0"
       },
@@ -468,13 +836,12 @@
       }
     },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.1.tgz",
-      "integrity": "sha512-LsStXVyso/89gQU5eiJebB/b1j+wrRtTLjk+ODVUTa7NGCCT7B7xI6ToTchkBEpSTHLT9pEQXHsHer3FymsQRQ==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.0.2.tgz",
+      "integrity": "sha512-z3rZd2sBfuYcFf9rGDsB2zz2fbGX8kkF+0ftg9eocyQmzWrlZHFmuw9ha7oP/Mz8gpblyCS/aa1U/Srs6gz0UQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1",
+        "@angular-eslint/bundled-angular-compiler": "19.0.2",
         "eslint-scope": "^8.0.2"
       },
       "peerDependencies": {
@@ -483,13 +850,12 @@
       }
     },
     "node_modules/@angular-eslint/utils": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.1.tgz",
-      "integrity": "sha512-F5UGE1J/CRmTbl8vjexQRwRglNqnJwdXCUejaG+qlGssSHoWcRB+ubbR/na3PdnzeJdBE6DkLYElXnOQZ6YKfg==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.0.2.tgz",
+      "integrity": "sha512-HotBT8OKr7zCaX1S9k27JuhRiTVIbbYVl6whlb3uwdMIPIWY8iOcEh1tjI4qDPUafpLfR72Dhwi5bO1E17F3/Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1"
+        "@angular-eslint/bundled-angular-compiler": "19.0.2"
       },
       "peerDependencies": {
         "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -498,10 +864,9 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.12.tgz",
-      "integrity": "sha512-XcWH/VFQ1Rddhdqi/iU8lW3Qg96yVx1NPfrO5lhcSSvVUzYWTZ5r+jh3GqYqUgPWyEp1Kpw3FLsOgVcGcBWQkQ==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.0.3.tgz",
+      "integrity": "sha512-YWoXM2S5p+Eq6cX1xjtFaai23oVNnbf3u34pEQCyKDjZpqI5lMu8e63lQT0tf7fZttEWlNUYRTwQ9+MpZ0sjzQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -509,99 +874,13 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.12"
-      }
-    },
-    "node_modules/@angular/build": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.12.tgz",
-      "integrity": "sha512-4Ohz+OSILoL+cCAQ4UTiCT5v6pctu3fXNoNpTEUK46OmxELk9jDITO5rNyNS7TxBn9wY69kjX5VcDf7MenquFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1802.12",
-        "@babel/core": "7.25.2",
-        "@babel/helper-annotate-as-pure": "7.24.7",
-        "@babel/helper-split-export-declaration": "7.24.7",
-        "@babel/plugin-syntax-import-attributes": "7.24.7",
-        "@inquirer/confirm": "3.1.22",
-        "@vitejs/plugin-basic-ssl": "1.1.0",
-        "browserslist": "^4.23.0",
-        "critters": "0.0.24",
-        "esbuild": "0.23.0",
-        "fast-glob": "3.3.2",
-        "https-proxy-agent": "7.0.5",
-        "listr2": "8.2.4",
-        "lmdb": "3.0.13",
-        "magic-string": "0.30.11",
-        "mrmime": "2.0.0",
-        "parse5-html-rewriting-stream": "7.0.0",
-        "picomatch": "4.0.2",
-        "piscina": "4.6.1",
-        "rollup": "4.22.4",
-        "sass": "1.77.6",
-        "semver": "7.6.3",
-        "vite": "5.4.6",
-        "watchpack": "2.4.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "@angular/localize": "^18.0.0",
-        "@angular/platform-server": "^18.0.0",
-        "@angular/service-worker": "^18.0.0",
-        "less": "^4.2.0",
-        "postcss": "^8.4.0",
-        "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.4 <5.6"
-      },
-      "peerDependenciesMeta": {
-        "@angular/localize": {
-          "optional": true
-        },
-        "@angular/platform-server": {
-          "optional": true
-        },
-        "@angular/service-worker": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "tailwindcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/build/node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
-      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@angular/core": "19.0.3"
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "18.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.1.tgz",
-      "integrity": "sha512-6y4MmpEPXze6igUHkLsBUPkxw32F8+rmW0xVXZchkSyGlFgqfh53ueXoryWb0qL4s5enkNY6AzXnKAqHfPNkVQ==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.0.3.tgz",
+      "integrity": "sha512-sPdIKbSgNk4z02FqdTTMUS62aLVA2R/DsnOk3qdH+nEfeS4nNWQEzwrvMf6dDsTeLQ6YJLWXfZfemsGYpOoiWg==",
       "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
@@ -610,31 +889,30 @@
         "parse5": "^7.1.2"
       },
       "peerDependencies": {
-        "@angular/common": "^18.0.0 || ^19.0.0",
-        "@angular/core": "^18.0.0 || ^19.0.0",
+        "@angular/common": "^19.0.0 || ^20.0.0",
+        "@angular/core": "^19.0.0 || ^20.0.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.12.tgz",
-      "integrity": "sha512-xhuZ/b7IhqNw1MgXf+arWf4x+GfUSt/IwbdWU4+CO8A7h0Y46zQywouP/KUK3cMQZfVdHdciTBvlpF3vFacA6Q==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.0.5.tgz",
+      "integrity": "sha512-AalLr1EbgJqBbzk+5ZtXwg6wCwLlRLd+CRrZZcC6QSee69mfsU9jEP2KFlMAecajOCqAGK3H4ZRiTZNeQ3y5AA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1802.12",
-        "@angular-devkit/core": "18.2.12",
-        "@angular-devkit/schematics": "18.2.12",
-        "@inquirer/prompts": "5.3.8",
-        "@listr2/prompt-adapter-inquirer": "2.0.15",
-        "@schematics/angular": "18.2.12",
+        "@angular-devkit/architect": "0.1900.5",
+        "@angular-devkit/core": "19.0.5",
+        "@angular-devkit/schematics": "19.0.5",
+        "@inquirer/prompts": "7.1.0",
+        "@listr2/prompt-adapter-inquirer": "2.0.18",
+        "@schematics/angular": "19.0.5",
         "@yarnpkg/lockfile": "1.1.0",
-        "ini": "4.1.3",
+        "ini": "5.0.0",
         "jsonc-parser": "3.3.1",
-        "listr2": "8.2.4",
-        "npm-package-arg": "11.0.3",
-        "npm-pick-manifest": "9.1.0",
-        "pacote": "18.0.6",
+        "listr2": "8.2.5",
+        "npm-package-arg": "12.0.0",
+        "npm-pick-manifest": "10.0.0",
+        "pacote": "20.0.0",
         "resolve": "1.22.8",
         "semver": "7.6.3",
         "symbol-observable": "4.0.0",
@@ -650,9 +928,9 @@
       }
     },
     "node_modules/@angular/common": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.12.tgz",
-      "integrity": "sha512-gI5o8Bccsi8ow8Wk2vG4Tw/Rw9LoHEA9j8+qHKNR/55SCBsz68Syg310dSyxy+sApJO2WiqIadr5VP36dlSUFw==",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.0.3.tgz",
+      "integrity": "sha512-YyBVZU+LQ38R+/U5vF/b1T3muROKpR0kkupMw7VKnGhQfgrRX5Dk3H2nr9ritt0zPc7TOUuQSlHMf3QWah2GDg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -660,15 +938,14 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.12",
+        "@angular/core": "19.0.3",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.12.tgz",
-      "integrity": "sha512-D5d5dLrjQal5DbAXJJNSsCC3UxzjOI2wbc+Iv+LOpRM1gpNwuYfZMX5W7cj62Ce4G2++78CJSppdKBp8D4HErQ==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.0.3.tgz",
+      "integrity": "sha512-cxtK4SlHAPstcXfjwOaoR1dAszrzo2iDF8ZiihbZPgKUG3m27qIU3Lp5XBgxfZPlO4jh6TXkWznY7f6Tyxkb0Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -676,7 +953,7 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.12"
+        "@angular/core": "19.0.3"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -685,13 +962,12 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.12.tgz",
-      "integrity": "sha512-IWimTNq5Q+i2Wxev6HLqnN4iYbPvLz04W1BBycT1LfGUsHcjFYLuUqbeUzHbk2snmBAzXkixgVpo8SF6P4Y5Pg==",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.0.3.tgz",
+      "integrity": "sha512-nayLcC3hSHoGKXCZInMdFcIZJEHYkEGNsdAutgCMuSj+lXCGuRUysuGC0rGzJc2R6nhgfaLJnO8T/O5acqaqdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/core": "7.25.2",
+        "@babel/core": "7.26.0",
         "@jridgewell/sourcemap-codec": "^1.4.14",
         "chokidar": "^4.0.0",
         "convert-source-map": "^1.5.1",
@@ -709,45 +985,14 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "18.2.12",
-        "typescript": ">=5.4 <5.6"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/readdirp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
+        "@angular/compiler": "19.0.3",
+        "typescript": ">=5.5 <5.7"
       }
     },
     "node_modules/@angular/core": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.12.tgz",
-      "integrity": "sha512-wCf/OObwS6bpM60rk6bpMpCRGp0DlMLB1WNAMtfcaPNyqimVV5Bm98mWRhkOuRyvU3fU7iHhM/10ePVaoyu9+A==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.0.3.tgz",
+      "integrity": "sha512-WM844gDzrbHtcM2TJB9DmfCmenUYyNSI6h924CeppDW5oG8ShinQGiWNjF5oI6EZ4tG60uK3QvCm3kjr1dmbOA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -756,14 +1001,13 @@
       },
       "peerDependencies": {
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.10"
+        "zone.js": "~0.15.0"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.12.tgz",
-      "integrity": "sha512-FsukBJEU6jfAmht7TrODTkct/o4iwCZvGozuThOp0tYUPD/E1rZZzuKjEyTnT5Azpfkf0Wqx1nmpz80cczELOQ==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.0.3.tgz",
+      "integrity": "sha512-8wf8yDR6cW+lOhpzhmxUOiI5Wjr1Kf7o8NuJ2P5K6b7IMNRzRyR5q/6R4NUwtF6aaJ1wNqmSof+goQmtn1HOcw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -771,27 +1015,25 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12",
+        "@angular/common": "19.0.3",
+        "@angular/core": "19.0.3",
+        "@angular/platform-browser": "19.0.3",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.12.tgz",
-      "integrity": "sha512-oaiVAnGzmPZvrXdGh8XnosaqfEPbZxO2225MxbbrD49XTqUgpaS2zrz1Uf5j42e8qytA2kj8tckLq7PAMm0D1w==",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-19.0.3.tgz",
+      "integrity": "sha512-SkUFggQayulgMWW4rwslLVCD7woZ1m7dCB87NCQdlZv9NIrHbNkaPfxHzaX3YrdKhw+u65XcttzD7cworcMcVQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.12.tgz",
-      "integrity": "sha512-DRSMznuxuecrs+v5BRyd60/R4vjkQtuYUEPfzdo+rqxM83Dmr3PGtnqPRgd5oAFUbATxf02hQXijRD27K7rZRg==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.0.3.tgz",
+      "integrity": "sha512-vggWHSzOsCpYqnGq5IIN+n7xdEvXfgUGaMdgzPhFMTsnlMTUs5+VEFl9tX9FANHkXKB5S1RttVyvEXRqJM9ncQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -799,9 +1041,9 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "18.2.12",
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12"
+        "@angular/animations": "19.0.3",
+        "@angular/common": "19.0.3",
+        "@angular/core": "19.0.3"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -810,10 +1052,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.12.tgz",
-      "integrity": "sha512-dv1QEjYpcFno6+oUeGEDRWpB5g2Ufb0XkUbLJQIgrOk1Qbyzb8tmpDpTjok8jcKdquigMRWolr6Y1EOicfRlLw==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.0.3.tgz",
+      "integrity": "sha512-gFh+QN7JvepnD3mS0XmOtDmfY8h5sSkk2/guesE2A68Na8q+M3fGZlz7I37tCXToLth5us1X0Gi0UPCSESc4SA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -821,17 +1062,16 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/compiler": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12"
+        "@angular/common": "19.0.3",
+        "@angular/compiler": "19.0.3",
+        "@angular/core": "19.0.3",
+        "@angular/platform-browser": "19.0.3"
       }
     },
     "node_modules/@angular/router": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.12.tgz",
-      "integrity": "sha512-cz/1YWOZadAT35PPPYmpK3HSzKOE56nlUHue5bFkw73VSZr2iBn03ALLpd9YKzWgRmx3y7DqnlQtCkDu9JPGKQ==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.0.3.tgz",
+      "integrity": "sha512-L/s8crRC6nj5knmHsnPeOXMNdC7vUOSOvTQonXhmT0FdlP9bPnnRrNeVDnLnd8AzjPSBfIFE2eQw6T8jCwdxMA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -839,17 +1079,16 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12",
+        "@angular/common": "19.0.3",
+        "@angular/core": "19.0.3",
+        "@angular/platform-browser": "19.0.3",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/service-worker": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.12.tgz",
-      "integrity": "sha512-rgztA+Eduo69y6cvSDtAXC5lMTWjgowSSreiyM4ssyjwd8vD6h2TZp/3slr8Tt6+Lh9J4bK+UdcqMIjIdDxwSw==",
-      "license": "MIT",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.0.3.tgz",
+      "integrity": "sha512-MPvAs0lFAyZbwoHQ6NJgvUM1rHA65UhXZjqRJNq2O5k9Ajd4xFkCtp7UuAOaiTgOlo8ecKB1SMWOw+b86N4+oQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -860,18 +1099,41 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12"
+        "@angular/common": "19.0.3",
+        "@angular/core": "19.0.3"
+      }
+    },
+    "node_modules/@awesome-cordova-plugins/core": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-6.13.0.tgz",
+      "integrity": "sha512-iqa5TU8HcFns/ND18KFrDVo4rGD4d4Gr5bgACFPwfztNCNmCRp+qkhv/xRBstqZ72qYH2oAJnEE1PTUY+IfX7Q==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "rxjs": "^5.5.0 || ^6.5.0 || ^7.3.0"
+      }
+    },
+    "node_modules/@awesome-cordova-plugins/file-opener": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/file-opener/-/file-opener-6.13.0.tgz",
+      "integrity": "sha512-0+caltmjJf3BuZiklqaSHsxviDiS4znnJj3RiBfoERfPCRa0HIyO8dywH2EhkOMhYQ5g8gBobTTOJQpV/yQhmw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@awesome-cordova-plugins/core": "^6.0.1",
+        "rxjs": "^5.5.0 || ^6.5.0 || ^7.3.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -879,32 +1141,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
-      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+      "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+      "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.26.0",
+        "@babel/generator": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.0",
+        "@babel/parser": "^7.26.0",
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -923,27 +1183,25 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@babel/core/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,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7",
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -953,41 +1211,25 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
-      "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
-      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -1001,24 +1243,22 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1028,38 +1268,23 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-create-class-features-plugin/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,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "regexpu-core": "^6.1.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1069,35 +1294,20 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-create-regexp-features-plugin/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,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1110,44 +1320,40 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
-      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
-      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
-      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1157,38 +1363,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
-      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
-      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz",
-      "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-wrap-function": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1197,29 +1400,15 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
-      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1228,29 +1417,14 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
-      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
-      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1261,7 +1435,6 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
       "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -1270,88 +1443,66 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz",
-      "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz",
-      "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.8"
+        "@babel/types": "^7.26.3"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1361,14 +1512,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.7.tgz",
-      "integrity": "sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1378,13 +1528,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.7.tgz",
-      "integrity": "sha512-GDDWeVLNxRIkQTnJn2pDOM1pkCgYdSqPeT1a9vh9yIqu2uzzgw1zcqEb+IJOhy+dTBMlNdThrDIksr2o09qrrQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1394,13 +1543,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.7",
-      "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.25.7.tgz",
-      "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
+      "version": "7.25.9",
+      "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.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1410,15 +1558,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
-      "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/plugin-transform-optional-chaining": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1428,14 +1575,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
-      "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1449,49 +1595,6 @@
       "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
       "engines": {
         "node": ">=6.9.0"
       },
@@ -1499,40 +1602,13 @@
         "@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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
-      "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1542,149 +1618,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
-      "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
-      },
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "dev": true,
-      "license": "MIT",
       "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,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1698,7 +1637,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,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -1711,13 +1649,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
-      "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1727,16 +1664,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
-      "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+      "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-remap-async-to-generator": "^7.25.0",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1746,15 +1681,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-remap-async-to-generator": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1764,13 +1698,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
-      "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1780,13 +1713,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
-      "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1796,14 +1728,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
-      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1813,14 +1744,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
-      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1830,17 +1760,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
-      "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1850,28 +1779,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
-      "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/template": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1881,13 +1796,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
-      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1897,14 +1811,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
-      "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1914,13 +1827,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
-      "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1930,14 +1842,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.7.tgz",
-      "integrity": "sha512-HvS6JF66xSS5rNKXLqkk7L9c/jZ/cdIVIcoPVrnl8IsVpLggTjXs8OWekbLHs/VtYDDh5WXnQyeE3PPUGm22MA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1947,13 +1858,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
-      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1963,14 +1873,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
-      "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1980,13 +1888,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
-      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1996,14 +1903,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
-      "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2013,15 +1919,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
-      "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2031,13 +1936,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
-      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2047,13 +1951,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
-      "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2063,13 +1966,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
-      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2079,13 +1981,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
-      "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2095,14 +1996,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
-      "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2112,15 +2012,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
-      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2130,16 +2028,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
-      "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2149,14 +2046,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
-      "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2166,14 +2062,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
-      "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2183,13 +2078,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
-      "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2199,13 +2093,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
-      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2215,13 +2108,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
-      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2231,15 +2123,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
-      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-transform-parameters": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2249,14 +2140,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
-      "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2266,13 +2156,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
-      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2282,14 +2171,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
-      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2299,13 +2187,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
-      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2315,14 +2202,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
-      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2332,15 +2218,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
-      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2349,27 +2234,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
-      "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2378,31 +2265,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
-      "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+      "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "regenerator-transform": "^0.15.2"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
-      "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2412,16 +2297,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz",
-      "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz",
+      "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.1",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
         "babel-plugin-polyfill-regenerator": "^0.6.1",
         "semver": "^6.3.1"
       },
@@ -2437,19 +2321,17 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
-      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2459,14 +2341,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
-      "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2476,13 +2357,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
-      "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2492,13 +2372,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
-      "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2508,13 +2387,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
-      "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2524,13 +2402,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
-      "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2540,14 +2417,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
-      "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2557,14 +2433,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
-      "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2574,14 +2449,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
-      "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2591,94 +2465,79 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
-      "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-validator-option": "^7.24.8",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
-        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
+      "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
         "@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.24.7",
-        "@babel/plugin-syntax-import-attributes": "^7.24.7",
-        "@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-import-assertions": "^7.26.0",
+        "@babel/plugin-syntax-import-attributes": "^7.26.0",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.7",
-        "@babel/plugin-transform-async-generator-functions": "^7.25.0",
-        "@babel/plugin-transform-async-to-generator": "^7.24.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
-        "@babel/plugin-transform-block-scoping": "^7.25.0",
-        "@babel/plugin-transform-class-properties": "^7.24.7",
-        "@babel/plugin-transform-class-static-block": "^7.24.7",
-        "@babel/plugin-transform-classes": "^7.25.0",
-        "@babel/plugin-transform-computed-properties": "^7.24.7",
-        "@babel/plugin-transform-destructuring": "^7.24.8",
-        "@babel/plugin-transform-dotall-regex": "^7.24.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
-        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
-        "@babel/plugin-transform-dynamic-import": "^7.24.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
-        "@babel/plugin-transform-for-of": "^7.24.7",
-        "@babel/plugin-transform-function-name": "^7.25.1",
-        "@babel/plugin-transform-json-strings": "^7.24.7",
-        "@babel/plugin-transform-literals": "^7.25.2",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
-        "@babel/plugin-transform-modules-amd": "^7.24.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.25.0",
-        "@babel/plugin-transform-modules-umd": "^7.24.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
-        "@babel/plugin-transform-new-target": "^7.24.7",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
-        "@babel/plugin-transform-numeric-separator": "^7.24.7",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
-        "@babel/plugin-transform-object-super": "^7.24.7",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.8",
-        "@babel/plugin-transform-parameters": "^7.24.7",
-        "@babel/plugin-transform-private-methods": "^7.24.7",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
-        "@babel/plugin-transform-property-literals": "^7.24.7",
-        "@babel/plugin-transform-regenerator": "^7.24.7",
-        "@babel/plugin-transform-reserved-words": "^7.24.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
-        "@babel/plugin-transform-spread": "^7.24.7",
-        "@babel/plugin-transform-sticky-regex": "^7.24.7",
-        "@babel/plugin-transform-template-literals": "^7.24.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+        "@babel/plugin-transform-arrow-functions": "^7.25.9",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.9",
+        "@babel/plugin-transform-async-to-generator": "^7.25.9",
+        "@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+        "@babel/plugin-transform-block-scoping": "^7.25.9",
+        "@babel/plugin-transform-class-properties": "^7.25.9",
+        "@babel/plugin-transform-class-static-block": "^7.26.0",
+        "@babel/plugin-transform-classes": "^7.25.9",
+        "@babel/plugin-transform-computed-properties": "^7.25.9",
+        "@babel/plugin-transform-destructuring": "^7.25.9",
+        "@babel/plugin-transform-dotall-regex": "^7.25.9",
+        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-dynamic-import": "^7.25.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+        "@babel/plugin-transform-for-of": "^7.25.9",
+        "@babel/plugin-transform-function-name": "^7.25.9",
+        "@babel/plugin-transform-json-strings": "^7.25.9",
+        "@babel/plugin-transform-literals": "^7.25.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+        "@babel/plugin-transform-modules-amd": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+        "@babel/plugin-transform-modules-umd": "^7.25.9",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-new-target": "^7.25.9",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+        "@babel/plugin-transform-numeric-separator": "^7.25.9",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+        "@babel/plugin-transform-object-super": "^7.25.9",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9",
+        "@babel/plugin-transform-private-methods": "^7.25.9",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+        "@babel/plugin-transform-property-literals": "^7.25.9",
+        "@babel/plugin-transform-regenerator": "^7.25.9",
+        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+        "@babel/plugin-transform-reserved-words": "^7.25.9",
+        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+        "@babel/plugin-transform-spread": "^7.25.9",
+        "@babel/plugin-transform-sticky-regex": "^7.25.9",
+        "@babel/plugin-transform-template-literals": "^7.25.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.25.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
         "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.37.1",
+        "core-js-compat": "^3.38.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2693,7 +2552,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -2703,7 +2561,6 @@
       "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,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/types": "^7.4.4",
@@ -2714,10 +2571,10 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
-      "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
-      "license": "MIT",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -2726,32 +2583,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+      "version": "7.26.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+      "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.3",
+        "@babel/parser": "^7.26.3",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -2759,16 +2614,30 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/traverse/node_modules/@babel/generator": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+      "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.26.3",
+        "@babel/types": "^7.26.3",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/types": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2807,7 +2676,6 @@
       "resolved": "https://registry.npmjs.org/@capacitor/assets/-/assets-3.0.5.tgz",
       "integrity": "sha512-ohz/OUq61Y1Fc6aVSt0uDrUdeOA7oTH4pkWDbv/8I3UrPjH7oPkzYhShuDRUjekNp9RBi198VSFdt0CetpEOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@capacitor/cli": "^5.3.0",
         "@ionic/utils-array": "2.1.6",
@@ -2834,7 +2702,6 @@
       "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.7.8.tgz",
       "integrity": "sha512-qN8LDlREMhrYhOvVXahoJVNkP8LP55/YPRJrzTAFrMqlNJC18L3CzgWYIblFPnuwfbH/RxbfoZT/ydkwgVpMrw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework-output": "^2.2.5",
         "@ionic/utils-fs": "^3.1.6",
@@ -2867,7 +2734,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
       "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || >=14"
       }
@@ -2877,7 +2743,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -2895,17 +2760,48 @@
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@capacitor/assets/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@capacitor/assets/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@capacitor/assets/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/@capacitor/assets/node_modules/open": {
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
       "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -2922,8 +2818,7 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-      "dev": true,
-      "license": "0BSD"
+      "dev": true
     },
     "node_modules/@capacitor/cli": {
       "version": "6.2.0",
@@ -2962,7 +2857,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
       "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || >=14"
       }
@@ -2972,7 +2866,33 @@
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
-      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
       "engines": {
         "node": ">=8"
       }
@@ -2982,7 +2902,6 @@
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
       "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -3032,7 +2951,6 @@
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
       "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.1.90"
       }
@@ -3042,7 +2960,6 @@
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
       "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -3055,28 +2972,25 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
       "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
-      "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.17.0"
       }
     },
     "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.48.0.tgz",
-      "integrity": "sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz",
+      "integrity": "sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "comment-parser": "1.4.1",
         "esquery": "^1.6.0",
@@ -3087,14 +3001,13 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
-      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
+      "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -3104,14 +3017,13 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
-      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
+      "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3121,14 +3033,13 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
-      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
+      "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3138,14 +3049,13 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
-      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
+      "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3155,14 +3065,13 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
-      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
+      "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3172,14 +3081,13 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
-      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
+      "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3189,14 +3097,13 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
-      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
+      "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -3206,14 +3113,13 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
-      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
+      "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -3223,14 +3129,13 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
-      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
+      "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3240,14 +3145,13 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
-      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
+      "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3257,14 +3161,13 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
-      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
+      "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3274,14 +3177,13 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
-      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
+      "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3291,14 +3193,13 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
-      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
+      "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
       "cpu": [
         "mips64el"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3308,14 +3209,13 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
-      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
+      "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3325,14 +3225,13 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
-      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
+      "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3342,14 +3241,13 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
-      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
+      "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3359,14 +3257,13 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
-      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
+      "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3376,14 +3273,13 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
-      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
+      "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -3393,14 +3289,13 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
-      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
+      "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -3410,14 +3305,13 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
-      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
+      "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -3427,14 +3321,13 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
-      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
+      "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -3444,14 +3337,13 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
-      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
+      "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3461,14 +3353,13 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
-      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
+      "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3478,14 +3369,13 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
-      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
+      "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3495,17 +3385,19 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
@@ -3515,7 +3407,6 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -3524,26 +3415,72 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
+      "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.5",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/config-array/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/@eslint/config-array/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/@eslint/core": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
+      "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -3551,7 +3488,7 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -3562,7 +3499,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3579,54 +3515,18 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -3636,15 +3536,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@eslint/eslintrc/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,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -3652,67 +3550,69 @@
         "node": "*"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/@eslint/js": {
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
+      "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
+      "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
+      "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "levn": "^0.4.1"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/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==",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "engines": {
+        "node": ">=18.18.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -3720,7 +3620,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -3729,70 +3628,74 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@hutson/parse-repository-url": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
       "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@inquirer/checkbox": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz",
-      "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.3.tgz",
+      "integrity": "sha512-CEt9B4e8zFOGtc/LYeQx5m8nfqQeG/4oNNv0PUvXGG0mys+wR/WbJ3B4KfSQ4Fcr3AQfpiuFOi3fVvmPfvNbxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/figures": "^1.0.5",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/figures": "^1.0.8",
+        "@inquirer/type": "^3.0.1",
         "ansi-escapes": "^4.3.2",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/confirm": {
-      "version": "3.1.22",
-      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
-      "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.0.tgz",
+      "integrity": "sha512-osaBbIMEqVFjTX5exoqPXs6PilWQdjaLhGtMDXMXg/yxkHXNq43GlxGyTA35lK2HpzUgDN+Cjh/2AmqCN0QJpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.0.10",
-        "@inquirer/type": "^1.5.2"
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/core": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz",
-      "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.1.tgz",
+      "integrity": "sha512-rmZVXy9iZvO3ZStEe/ayuuwIJ23LSF13aPMlLMTQARX6lGUBDHGV8UB5i9MRrfy0+mZwt5/9bdy8llszSD3NQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/figures": "^1.0.6",
-        "@inquirer/type": "^2.0.0",
-        "@types/mute-stream": "^0.0.4",
-        "@types/node": "^22.5.5",
-        "@types/wrap-ansi": "^3.0.0",
+        "@inquirer/figures": "^1.0.8",
+        "@inquirer/type": "^3.0.1",
         "ansi-escapes": "^4.3.2",
         "cli-width": "^4.1.0",
-        "mute-stream": "^1.0.0",
+        "mute-stream": "^2.0.0",
         "signal-exit": "^4.1.0",
         "strip-ansi": "^6.0.1",
         "wrap-ansi": "^6.2.0",
@@ -3802,267 +3705,232 @@
         "node": ">=18"
       }
     },
-    "node_modules/@inquirer/core/node_modules/@inquirer/type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz",
-      "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mute-stream": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@inquirer/core/node_modules/@types/node": {
-      "version": "22.6.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.6.1.tgz",
-      "integrity": "sha512-V48tCfcKb/e6cVUigLAaJDAILdMP0fUW6BidkPK4GpGjXcfbnoHasCZDwz3N3yVt5we2RHm4XTQCpv0KJz9zqw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.19.2"
-      }
-    },
     "node_modules/@inquirer/editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz",
-      "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.0.tgz",
+      "integrity": "sha512-Z3LeGsD3WlItDqLxTPciZDbGtm0wrz7iJGS/uUxSiQxef33ZrBq7LhsXg30P7xrWz1kZX4iGzxxj5SKZmJ8W+w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1",
         "external-editor": "^3.1.0"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/expand": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz",
-      "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.3.tgz",
+      "integrity": "sha512-MDszqW4HYBpVMmAoy/FA9laLrgo899UAga0itEjsYrBthKieDZNc0e16gdn7N3cQ0DSf/6zsTBZMuDYDQU4ktg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz",
-      "integrity": "sha512-yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.8.tgz",
+      "integrity": "sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@inquirer/input": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz",
-      "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.0.tgz",
+      "integrity": "sha512-16B8A9hY741yGXzd8UJ9R8su/fuuyO2e+idd7oVLYjP23wKJ6ILRIIHcnXe8/6AoYgwRS2zp4PNsW/u/iZ24yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3"
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/number": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz",
-      "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.3.tgz",
+      "integrity": "sha512-HA/W4YV+5deKCehIutfGBzNxWH1nhvUC67O4fC9ufSijn72yrYnRmzvC61dwFvlXIG1fQaYWi+cqNE9PaB9n6Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3"
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/password": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz",
-      "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.3.tgz",
+      "integrity": "sha512-3qWjk6hS0iabG9xx0U1plwQLDBc/HA/hWzLFFatADpR6XfE62LqPr9GpFXBkLU0KQUaIXZ996bNG+2yUvocH8w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1",
         "ansi-escapes": "^4.3.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/prompts": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
-      "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.1.0.tgz",
+      "integrity": "sha512-5U/XiVRH2pp1X6gpNAjWOglMf38/Ys522ncEHIKT1voRUvSj/DQnR22OVxHnwu5S+rCFaUiPQ57JOtMFQayqYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/checkbox": "^2.4.7",
-        "@inquirer/confirm": "^3.1.22",
-        "@inquirer/editor": "^2.1.22",
-        "@inquirer/expand": "^2.1.22",
-        "@inquirer/input": "^2.2.9",
-        "@inquirer/number": "^1.0.10",
-        "@inquirer/password": "^2.1.22",
-        "@inquirer/rawlist": "^2.2.4",
-        "@inquirer/search": "^1.0.7",
-        "@inquirer/select": "^2.4.7"
+        "@inquirer/checkbox": "^4.0.2",
+        "@inquirer/confirm": "^5.0.2",
+        "@inquirer/editor": "^4.1.0",
+        "@inquirer/expand": "^4.0.2",
+        "@inquirer/input": "^4.0.2",
+        "@inquirer/number": "^3.0.2",
+        "@inquirer/password": "^4.0.2",
+        "@inquirer/rawlist": "^4.0.2",
+        "@inquirer/search": "^3.0.2",
+        "@inquirer/select": "^4.0.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/rawlist": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz",
-      "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.3.tgz",
+      "integrity": "sha512-5MhinSzfmOiZlRoPezfbJdfVCZikZs38ja3IOoWe7H1dxL0l3Z2jAUgbBldeyhhOkELdGvPlBfQaNbeLslib1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/type": "^3.0.1",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/search": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz",
-      "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.3.tgz",
+      "integrity": "sha512-mQTCbdNolTGvGGVCJSI6afDwiSGTV+fMLPEIMDJgIV6L/s3+RYRpxt6t0DYnqMQmemnZ/Zq0vTIRwoHT1RgcTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/figures": "^1.0.5",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/figures": "^1.0.8",
+        "@inquirer/type": "^3.0.1",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/select": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz",
-      "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.3.tgz",
+      "integrity": "sha512-OZfKDtDE8+J54JYAFTUGZwvKNfC7W/gFCjDkcsO7HnTH/wljsZo9y/FJquOxMy++DY0+9l9o/MOZ8s5s1j5wmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/figures": "^1.0.5",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.1",
+        "@inquirer/figures": "^1.0.8",
+        "@inquirer/type": "^3.0.1",
         "ansi-escapes": "^4.3.2",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
       }
     },
     "node_modules/@inquirer/type": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
-      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.1.tgz",
+      "integrity": "sha512-+ksJMIy92sOAiAccGpcKZUc3bYO07cADnscIxHBknEm3uNts3movSmBofc1908BNy5edKscxYeAdaX1NXkHS6A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mute-stream": "^1.0.0"
-      },
       "engines": {
         "node": ">=18"
-      }
-    },
-    "node_modules/@ionic-native/core": {
-      "version": "5.36.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.36.0.tgz",
-      "integrity": "sha512-lOrkktadlKYbYf1LrDyAtsu1JnQ0oCCdkOU7iHQ8oXnNOkMwobFfD2m62F1CoOr0u9LIkpYnZSPjng8lZbmbNw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/file-opener": {
-      "version": "5.36.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.36.0.tgz",
-      "integrity": "sha512-UKp3pbqvQXsAtLMJ5JE+KcTMxpjSZMFebf6nvy/KJvwy85JGIaCV4ZVM/H9CFUrHJMWBH6wDbY+WPygnsrl4Yg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/cordova": "latest"
       },
       "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
+        "@types/node": ">=18"
       }
     },
     "node_modules/@ionic/angular": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.7.5.tgz",
-      "integrity": "sha512-nV8HP7RedjYkIAT8nVr5ifHNT0D3XzA74RPG3/WCCFJKunERNJ9SBiNkCTWhUpSkqsYYwEB4+SOOHz+R5NLk/w==",
-      "license": "MIT",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-7.8.6.tgz",
+      "integrity": "sha512-3Qe53hXpyjtx6fFcxt/NTAlauIawsGmCZJPauV5sAnSKVuX8C82C1zMAZTeJt6m2dnd71wythc98BXUXsx/UxQ==",
       "dependencies": {
-        "@ionic/core": "6.7.5",
-        "ionicons": "^6.1.3",
+        "@ionic/core": "7.8.6",
+        "ionicons": "^7.0.0",
         "jsonc-parser": "^3.0.0",
-        "tslib": "^2.0.0"
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=12.0.0",
-        "@angular/forms": ">=12.0.0",
-        "@angular/router": ">=12.0.0",
-        "rxjs": ">=6.6.0",
+        "@angular/core": ">=14.0.0",
+        "@angular/forms": ">=14.0.0",
+        "@angular/router": ">=14.0.0",
+        "rxjs": ">=7.5.0",
         "zone.js": ">=0.11.0"
       }
     },
     "node_modules/@ionic/angular-toolkit": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-11.0.1.tgz",
-      "integrity": "sha512-dxx2RDbxDYM2nWRPIirKMJySHtqJ1u02T25PGbNb99W2Wlcmu1cza3+2/PQ8ga18yMz/dQqaGyEmPDf3ZSVO0w==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-12.1.1.tgz",
+      "integrity": "sha512-VgD9pUg2ViI6a0W+8iUs7sGrQ8/1BQH43/ioAqGu/WWsgcnevy9ddTZp0M1MHbeVWaoauwbmNsG/lgNNEZq1hw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "^17.0.0",
-        "@angular-devkit/schematics": "^17.0.0",
-        "@schematics/angular": "^17.0.0"
+        "@angular-devkit/core": "^18.0.0",
+        "@angular-devkit/schematics": "^18.0.0",
+        "@schematics/angular": "^18.0.0"
       }
     },
     "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/core": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.8.tgz",
-      "integrity": "sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz",
+      "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
         "rxjs": "7.8.1",
         "source-map": "0.7.4"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
@@ -4076,125 +3944,121 @@
       }
     },
     "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/schematics": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.8.tgz",
-      "integrity": "sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz",
+      "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "17.3.8",
-        "jsonc-parser": "3.2.1",
-        "magic-string": "0.30.8",
+        "@angular-devkit/core": "18.2.12",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.11",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@ionic/angular-toolkit/node_modules/@schematics/angular": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.8.tgz",
-      "integrity": "sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz",
+      "integrity": "sha512-sIoeipsisK5eTLW3XuNZYcal83AfslBbgI7LnV+3VrXwpasKPGHwo2ZdwhCd2IXAkuJ02Iyu7MyV0aQRM9i/3g==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/schematics": "18.2.12",
+        "jsonc-parser": "3.3.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.8",
-        "@angular-devkit/schematics": "17.3.8",
-        "jsonc-parser": "3.2.1"
+        "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"
       },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+    "node_modules/@ionic/angular-toolkit/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==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "is-glob": "^4.0.1"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+    "node_modules/@ionic/angular-toolkit/node_modules/magic-string": {
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/magic-string": {
-      "version": "0.30.8",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+    "node_modules/@ionic/angular-toolkit/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
+        "picomatch": "^2.2.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8.10.0"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/picomatch": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
-      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
+    "node_modules/@ionic/angular-toolkit/node_modules/readdirp/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=8.6"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/@ionic/cli": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-7.2.0.tgz",
       "integrity": "sha512-IEms9Df8mJOoWPqgvZEXmqKztttHDFAz+9ewDPZGYv8Xx66Cj7zSen13O2Vf4FuLXhl+U95HXT9sAs4lDwFmcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework": "6.0.1",
         "@ionic/cli-framework-output": "2.2.8",
@@ -4235,7 +4099,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-6.0.1.tgz",
       "integrity": "sha512-Fyix4eQt2HKTV+GoeoiziQGZyqIA8RfoMqjGyAS5XgNXLOYW0P27Ph348hQZh9Mphjf+m0lOYa6dWQTEPzUHiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework-output": "2.2.8",
         "@ionic/utils-array": "2.1.6",
@@ -4262,7 +4125,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.8.tgz",
       "integrity": "sha512-TshtaFQsovB4NWRBydbNFawql6yul7d5bMiW1WYYf17hd99V6xdDdk3vtF51bw6sLkxON3bDQpWsnUc9/hVo3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-terminal": "2.3.5",
         "debug": "^4.0.0",
@@ -4277,7 +4139,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.13.tgz",
       "integrity": "sha512-Yj1fz6p7OehreQ8C70bd9+M6tYP/rvzLw5JVj8pT/N9s0kQSjqEFRbs96LKr3lfd3TADZaS8OlZrQIqenFIUpg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-terminal": "2.3.5",
         "debug": "^4.0.0",
@@ -4293,7 +4154,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-3.0.1.tgz",
       "integrity": "sha512-cT4te3AQQPeIM9WCwIg8ohroJ8TjsYaMb2G4ZEgv9YzeDqHZ4JpeIKqG2SoaA3GmVQ3sOfhPM6Ox9sxphV/d1A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-array": "2.1.6",
         "@ionic/utils-fs": "3.1.7",
@@ -4308,76 +4168,12 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/@ionic/cli-framework/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework/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,
-      "license": "MIT",
-      "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/@ionic/cli-framework/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework/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,
-      "license": "MIT"
-    },
-    "node_modules/@ionic/cli-framework/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@ionic/cli-framework/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -4388,25 +4184,11 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@ionic/cli-framework/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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@ionic/cli/node_modules/@ionic/utils-subprocess": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-3.0.1.tgz",
       "integrity": "sha512-cT4te3AQQPeIM9WCwIg8ohroJ8TjsYaMb2G4ZEgv9YzeDqHZ4JpeIKqG2SoaA3GmVQ3sOfhPM6Ox9sxphV/d1A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-array": "2.1.6",
         "@ionic/utils-fs": "3.1.7",
@@ -4421,65 +4203,29 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/@ionic/cli/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==",
+    "node_modules/@ionic/cli/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
+      "bin": {
+        "is-docker": "cli.js"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli/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,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@ionic/cli/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==",
+    "node_modules/@ionic/cli/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "is-docker": "^2.0.0"
       },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/cli/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,
-      "license": "MIT"
-    },
-    "node_modules/@ionic/cli/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,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4489,7 +4235,6 @@
       "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
       "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -4501,27 +4246,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@ionic/cli/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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@ionic/core": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
-      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
-      "license": "MIT",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.6.tgz",
+      "integrity": "sha512-HAYZdEmeJgOdo2kDlZkcCGHb+zs/vjU6iv4skbVBL7y+OnSv/oC2u83Yee8S3/aY0YAxkyBgu7hLTYH13Zc2Aw==",
       "dependencies": {
-        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.1.3",
+        "@stencil/core": "^4.12.2",
+        "ionicons": "^7.2.2",
         "tslib": "^2.1.0"
       }
     },
@@ -4530,7 +4261,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.6.tgz",
       "integrity": "sha512-0JZ1Zkp3wURnv8oq6Qt7fMPo5MpjbLoUoa9Bu2Q4PJuSDWM8H8gwF3dQO7VTeUj3/0o1IB1wGkFWZZYgUXZMUg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4544,7 +4274,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.7.tgz",
       "integrity": "sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.0",
         "debug": "^4.0.0",
@@ -4560,7 +4289,6 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -4576,7 +4304,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.7.tgz",
       "integrity": "sha512-5Q3NdZtSLiLs7ufuX9X293BvAwo8CxaD93Hkp3ODPgctLYErv3nFibhq3j+eguEqUh2um9WNXEUOuQ8x+Sd1fw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4590,7 +4317,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.6.tgz",
       "integrity": "sha512-vCl7sl6JjBHFw99CuAqHljYJpcE88YaH2ZW4ELiC/Zwxl5tiwn4kbdP/gxi2OT3MQb1vOtgAmSNRtusvgxI8ww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4604,7 +4330,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.12.tgz",
       "integrity": "sha512-Jqkgyq7zBs/v/J3YvKtQQiIcxfJyplPgECMWgdO0E1fKrrH8EF0QGHNJ9mJCn6PYe2UtHNS8JJf5G21e09DfYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-object": "2.1.6",
         "@ionic/utils-terminal": "2.3.5",
@@ -4621,15 +4346,13 @@
       "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/@ionic/utils-stream": {
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.7.tgz",
       "integrity": "sha512-eSELBE7NWNFIHTbTC2jiMvh1ABKGIpGdUIvARsNPMNQhxJB3wpwdiVnoBoTYp+5a6UUIww4Kpg7v6S7iTctH1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4643,7 +4366,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.11.tgz",
       "integrity": "sha512-6zCDixNmZCbMCy5np8klSxOZF85kuDyzZSTTQKQP90ZtYNCcPYmuFSzaqDwApJT4r5L3MY3JrqK1gLkc6xiUPw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.6",
@@ -4663,7 +4385,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
       "integrity": "sha512-HD72a71IQVBmQckDwmA8RxNVMTbxnaLbgFOl+dO5tbvW9CkkSFCv41h6fUuNsSEVgngfkn0i98HDuZC8mk+lTA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4677,7 +4398,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.6.tgz",
       "integrity": "sha512-eikrNkK89CfGPmexjTfSWl4EYqsPSBh0Ka7by4F0PLc1hJZYtJxUZV3X4r5ecA8ikjicUmcbU7zJmAjmqutG/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.0",
         "debug": "^4.0.0",
@@ -4693,7 +4413,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
       "integrity": "sha512-XnYNSwfewUqxq+yjER1hxTKggftpNjFLJH0s37jcrNDwbzmbpFTQTVAp4ikNK4rd9DOebX/jbeZb8jfD86IYxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4707,7 +4426,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.10.tgz",
       "integrity": "sha512-mZ7JEowcuGQK+SKsJXi0liYTcXd2bNMR3nE0CyTROpMECUpJeAvvaBaPGZf5ERQUPeWBVuwqAqjUmIdxhz5bxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-object": "2.1.5",
         "@ionic/utils-terminal": "2.3.3",
@@ -4725,7 +4443,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
       "integrity": "sha512-hkm46uHvEC05X/8PHgdJi4l4zv9VQDELZTM+Kz69odtO9zZYfnt8DkfXHJqJ+PxmtiE5mk/ehJWLnn/XAczTUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4739,7 +4456,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.3.tgz",
       "integrity": "sha512-RnuSfNZ5fLEyX3R5mtcMY97cGD1A0NVBbarsSQ6yMMfRJ5YHU7hHVyUfvZeClbqkBC/pAqI/rYJuXKCT9YeMCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/slice-ansi": "^4.0.0",
         "debug": "^4.0.0",
@@ -4755,48 +4471,11 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-subprocess/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/utils-subprocess/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/utils-subprocess/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,
-      "license": "MIT"
-    },
     "node_modules/@ionic/utils-subprocess/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -4811,15 +4490,13 @@
       "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/@ionic/utils-subprocess/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -4837,7 +4514,6 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.5.tgz",
       "integrity": "sha512-3cKScz9Jx2/Pr9ijj1OzGlBDfcmx7OMVBt4+P1uRR0SSW4cm1/y3Mo4OY3lfkuaYifMNBW8Wz6lQHbs1bihr7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/slice-ansi": "^4.0.0",
         "debug": "^4.0.0",
@@ -4853,55 +4529,17 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/@ionic/utils-terminal/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/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,
-      "license": "MIT"
-    },
     "node_modules/@ionic/utils-terminal/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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/@ionic/utils-terminal/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -4919,7 +4557,6 @@
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
         "string-width-cjs": "npm:string-width@^4.2.0",
@@ -4933,11 +4570,10 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -4950,7 +4586,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -4962,15 +4597,13 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@isaacs/cliui/node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -4988,7 +4621,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -5004,7 +4636,6 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -5017,22 +4648,32 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -5047,7 +4688,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -5057,7 +4697,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -5067,7 +4706,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -5077,15 +4715,13 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -5096,7 +4732,6 @@
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
       "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
       },
@@ -5109,11 +4744,10 @@
       }
     },
     "node_modules/@jsonjoy.com/json-pack": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz",
-      "integrity": "sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.1.tgz",
+      "integrity": "sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@jsonjoy.com/base64": "^1.1.1",
         "@jsonjoy.com/util": "^1.1.2",
@@ -5136,7 +4770,6 @@
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz",
       "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
       },
@@ -5149,113 +4782,125 @@
       }
     },
     "node_modules/@kurkle/color": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz",
-      "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==",
-      "license": "MIT"
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz",
+      "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w=="
     },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@listr2/prompt-adapter-inquirer": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz",
-      "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.18.tgz",
+      "integrity": "sha512-0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@inquirer/type": "^1.5.1"
+        "@inquirer/type": "^1.5.5"
       },
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@inquirer/prompts": ">= 3 < 6"
+        "@inquirer/prompts": ">= 3 < 8"
+      }
+    },
+    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
+      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/mute-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@lmdb/lmdb-darwin-arm64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz",
-      "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.1.5.tgz",
+      "integrity": "sha512-ue5PSOzHMCIYrfvPP/MRS6hsKKLzqqhcdAvJCO8uFlDdj598EhgnacuOTuqA6uBK5rgiZXfDWyb7DVZSiBKxBA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@lmdb/lmdb-darwin-x64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz",
-      "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.1.5.tgz",
+      "integrity": "sha512-CGhsb0R5vE6mMNCoSfxHFD8QTvBHM51gs4DBeigTYHWnYv2V5YpJkC4rMo5qAAFifuUcc0+a8a3SIU0c9NrfNw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@lmdb/lmdb-linux-arm": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz",
-      "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.1.5.tgz",
+      "integrity": "sha512-3WeW328DN+xB5PZdhSWmqE+t3+44xWXEbqQ+caWJEZfOFdLp9yklBZEbVqVdqzznkoaXJYxTCp996KD6HmANeg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@lmdb/lmdb-linux-arm64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz",
-      "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.1.5.tgz",
+      "integrity": "sha512-LAjaoOcBHGj6fiYB8ureiqPoph4eygbXu4vcOF+hsxiY74n8ilA7rJMmGUT0K0JOB5lmRQHSmor3mytRjS4qeQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@lmdb/lmdb-linux-x64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz",
-      "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.1.5.tgz",
+      "integrity": "sha512-k/IklElP70qdCXOQixclSl2GPLFiopynGoKX1FqDd1/H0E3Fo1oPwjY2rEVu+0nS3AOw1sryStdXk8CW3cVIsw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@lmdb/lmdb-win32-x64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz",
-      "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.1.5.tgz",
+      "integrity": "sha512-KYar6W8nraZfSJspcK7Kp7hdj238X/FNauYbZyrqPBrtsXI1hvI4/KcRcRGP50aQoV7fkKDyJERlrQGMGTZUsA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -5269,7 +4914,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -5283,7 +4927,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -5297,7 +4940,6 @@
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5311,7 +4953,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5322,50 +4963,335 @@
       "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
       "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
       "cpu": [
-        "x64"
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@napi-rs/nice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.0.1.tgz",
+      "integrity": "sha512-zM0mVWSXE0a0h9aKACLwKmD6nHcRiKrPpCfvaKqG1CqDEyjEawId0ocXxVzPMCAm6kkWr2P025msfxXEnt8UGQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "optionalDependencies": {
+        "@napi-rs/nice-android-arm-eabi": "1.0.1",
+        "@napi-rs/nice-android-arm64": "1.0.1",
+        "@napi-rs/nice-darwin-arm64": "1.0.1",
+        "@napi-rs/nice-darwin-x64": "1.0.1",
+        "@napi-rs/nice-freebsd-x64": "1.0.1",
+        "@napi-rs/nice-linux-arm-gnueabihf": "1.0.1",
+        "@napi-rs/nice-linux-arm64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-arm64-musl": "1.0.1",
+        "@napi-rs/nice-linux-ppc64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-riscv64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-s390x-gnu": "1.0.1",
+        "@napi-rs/nice-linux-x64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-x64-musl": "1.0.1",
+        "@napi-rs/nice-win32-arm64-msvc": "1.0.1",
+        "@napi-rs/nice-win32-ia32-msvc": "1.0.1",
+        "@napi-rs/nice-win32-x64-msvc": "1.0.1"
+      }
+    },
+    "node_modules/@napi-rs/nice-android-arm-eabi": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.1.tgz",
+      "integrity": "sha512-5qpvOu5IGwDo7MEKVqqyAxF90I6aLj4n07OzpARdgDRfz8UbBztTByBp0RC59r3J1Ij8uzYi6jI7r5Lws7nn6w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-android-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.1.tgz",
+      "integrity": "sha512-GqvXL0P8fZ+mQqG1g0o4AO9hJjQaeYG84FRfZaYjyJtZZZcMjXW5TwkL8Y8UApheJgyE13TQ4YNUssQaTgTyvA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-darwin-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.1.tgz",
+      "integrity": "sha512-91k3HEqUl2fsrz/sKkuEkscj6EAj3/eZNCLqzD2AA0TtVbkQi8nqxZCZDMkfklULmxLkMxuUdKe7RvG/T6s2AA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-darwin-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.1.tgz",
+      "integrity": "sha512-jXnMleYSIR/+TAN/p5u+NkCA7yidgswx5ftqzXdD5wgy/hNR92oerTXHc0jrlBisbd7DpzoaGY4cFD7Sm5GlgQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-freebsd-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.1.tgz",
+      "integrity": "sha512-j+iJ/ezONXRQsVIB/FJfwjeQXX7A2tf3gEXs4WUGFrJjpe/z2KB7sOv6zpkm08PofF36C9S7wTNuzHZ/Iiccfw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-arm-gnueabihf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.1.tgz",
+      "integrity": "sha512-G8RgJ8FYXYkkSGQwywAUh84m946UTn6l03/vmEXBYNJxQJcD+I3B3k5jmjFG/OPiU8DfvxutOP8bi+F89MCV7Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-arm64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.1.tgz",
+      "integrity": "sha512-IMDak59/W5JSab1oZvmNbrms3mHqcreaCeClUjwlwDr0m3BoR09ZiN8cKFBzuSlXgRdZ4PNqCYNeGQv7YMTjuA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-arm64-musl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.1.tgz",
+      "integrity": "sha512-wG8fa2VKuWM4CfjOjjRX9YLIbysSVV1S3Kgm2Fnc67ap/soHBeYZa6AGMeR5BJAylYRjnoVOzV19Cmkco3QEPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-ppc64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.1.tgz",
+      "integrity": "sha512-lxQ9WrBf0IlNTCA9oS2jg/iAjQyTI6JHzABV664LLrLA/SIdD+I1i3Mjf7TsnoUbgopBcCuDztVLfJ0q9ubf6Q==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-riscv64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.1.tgz",
+      "integrity": "sha512-3xs69dO8WSWBb13KBVex+yvxmUeEsdWexxibqskzoKaWx9AIqkMbWmE2npkazJoopPKX2ULKd8Fm9veEn0g4Ig==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-s390x-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.1.tgz",
+      "integrity": "sha512-lMFI3i9rlW7hgToyAzTaEybQYGbQHDrpRkg+1gJWEpH0PLAQoZ8jiY0IzakLfNWnVda1eTYYlxxFYzW8Rqczkg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-x64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.1.tgz",
+      "integrity": "sha512-XQAJs7DRN2GpLN6Fb+ZdGFeYZDdGl2Fn3TmFlqEL5JorgWKrQGRUrpGKbgZ25UeZPILuTKJ+OowG2avN8mThBA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-x64-musl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.1.tgz",
+      "integrity": "sha512-/rodHpRSgiI9o1faq9SZOp/o2QkKQg7T+DK0R5AkbnI/YxvAIEHf2cngjYzLMQSQgUhxym+LFr+UGZx4vK4QdQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-win32-arm64-msvc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.1.tgz",
+      "integrity": "sha512-rEcz9vZymaCB3OqEXoHnp9YViLct8ugF+6uO5McifTedjq4QMQs3DHz35xBEGhH3gJWEsXMUbzazkz5KNM5YUg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-win32-ia32-msvc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.1.tgz",
+      "integrity": "sha512-t7eBAyPUrWL8su3gDxw9xxxqNwZzAqKo0Szv3IjVQd1GpXXVkb6vBBQUuxfIYaXMzZLwlxRQ7uzM2vdUE9ULGw==",
+      "cpu": [
+        "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
-      ]
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     },
-    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
-      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+    "node_modules/@napi-rs/nice-win32-x64-msvc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.1.tgz",
+      "integrity": "sha512-JlF+uDcatt3St2ntBG8H02F1mM45i5SF9W+bIKiReVE6wiy3o16oBP/yxt+RZ+N6LbCImJXJ6bXNO2kn9AXicg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
-      ]
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz",
-      "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.0.3.tgz",
+      "integrity": "sha512-z2xdbPKdYrKuypsIvCXEgPH1UWBV52JBKfShJB+zZerUWsAVJRqzsqVQKMhbyhbuqT/XJwP6EoVE6ADCGuTj/Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "typescript": ">=5.4 <5.6",
+        "@angular/compiler-cli": "^19.0.0",
+        "typescript": ">=5.5 <5.7",
         "webpack": "^5.54.0"
       }
     },
     "node_modules/@ngx-formly/core": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/@ngx-formly/core/-/core-6.3.11.tgz",
-      "integrity": "sha512-C/k1bbBjIKM5SnpGl9eHe0EcTlXlxYBg9u5JCWuh8GgR2BPXAaBcXfTcsrp4SRDLSXre/GyxWt4iCLjPWCZ/ug==",
+      "version": "6.3.12",
+      "resolved": "https://registry.npmjs.org/@ngx-formly/core/-/core-6.3.12.tgz",
+      "integrity": "sha512-88MOfn9dM1B33t04jl8x0Glh0Ed0lUKMkhYajicRH7ZHTmwIdla1SQjiblp2C+EcCFvsY7XAU2/JUZQdl56aUw==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -5375,22 +5301,21 @@
       }
     },
     "node_modules/@ngx-formly/ionic": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/@ngx-formly/ionic/-/ionic-6.3.11.tgz",
-      "integrity": "sha512-0NeytDRSrx7pBut3LT5vqHNx2bGShn/SYok/483YCy4SsfiTdio75H7PzvoFZZ/lOmB/dVYjP4EZRbaCP27hGw==",
+      "version": "6.3.12",
+      "resolved": "https://registry.npmjs.org/@ngx-formly/ionic/-/ionic-6.3.12.tgz",
+      "integrity": "sha512-Ohl3bbVZaTwIbcjIuSsjVF1Kig32ftyBBntsD9Lu95rxcFPq67tLUMRNRB/XEPVUAA2ecGvOwhH7RmJKNqyy2Q==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
         "@ionic/angular": "^6.0.0 || ^7.0.0",
-        "@ngx-formly/core": "6.3.11"
+        "@ngx-formly/core": "6.3.12"
       }
     },
     "node_modules/@ngx-formly/schematics": {
-      "version": "6.3.10",
-      "resolved": "https://registry.npmjs.org/@ngx-formly/schematics/-/schematics-6.3.10.tgz",
-      "integrity": "sha512-fOsTdSSlO/JcsHIXa726I/2ScsLIwE0fMCML1Hh0nIZR2clOFyvJr1+jQSIngmR7GEE8uLbHbyFpY7rHQsBgsA==",
-      "license": "MIT",
+      "version": "6.3.12",
+      "resolved": "https://registry.npmjs.org/@ngx-formly/schematics/-/schematics-6.3.12.tgz",
+      "integrity": "sha512-Gzrvo/bRNvTVOTVlJLC/F+j6rTn5h/5GBg7GDF6VipSgfmpXq2xXNvyI0QMdEnfBSLElw5v3ve/HA/xlQPw65A==",
       "dependencies": {
         "@angular-devkit/core": "^13.0.3",
         "@angular-devkit/schematics": "^13.0.3",
@@ -5401,7 +5326,6 @@
       "version": "13.3.11",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.11.tgz",
       "integrity": "sha512-rfqoLMRYhlz0wzKlHx7FfyIyQq8dKTsmbCoIVU1cEIH0gyTMVY7PbVzwRRcO6xp5waY+0hA+0Brriujpuhkm4w==",
-      "license": "MIT",
       "dependencies": {
         "ajv": "8.9.0",
         "ajv-formats": "2.1.1",
@@ -5428,7 +5352,6 @@
       "version": "13.3.11",
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.11.tgz",
       "integrity": "sha512-ben+EGXpCrClnIVAAnEQmhQdKmnnqFhMp5BqMxgOslSYBAmCutLA6rBu5vsc8kZcGian1wt+lueF7G1Uk5cGBg==",
-      "license": "MIT",
       "dependencies": {
         "@angular-devkit/core": "13.3.11",
         "jsonc-parser": "3.0.0",
@@ -5446,7 +5369,6 @@
       "version": "13.3.11",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.11.tgz",
       "integrity": "sha512-imKBnKYEse0SBVELZO/753nkpt3eEgpjrYkB+AFWF9YfO/4RGnYXDHoH8CFkzxPH9QQCgNrmsVFNiYGS+P/S1A==",
-      "license": "MIT",
       "dependencies": {
         "@angular-devkit/core": "13.3.11",
         "@angular-devkit/schematics": "13.3.11",
@@ -5462,7 +5384,6 @@
       "version": "8.9.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
       "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -5478,7 +5399,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -5491,42 +5411,117 @@
         }
       }
     },
+    "node_modules/@ngx-formly/schematics/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "optional": true,
+      "peer": 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"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/@ngx-formly/schematics/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==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/@ngx-formly/schematics/node_modules/jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "license": "MIT"
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
     },
     "node_modules/@ngx-formly/schematics/node_modules/magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
       "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-      "license": "MIT",
       "dependencies": {
         "sourcemap-codec": "^1.4.4"
       }
     },
+    "node_modules/@ngx-formly/schematics/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@ngx-formly/schematics/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/@ngx-formly/schematics/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
     "node_modules/@ngx-formly/schematics/node_modules/source-map": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
     },
+    "node_modules/@ngx-formly/schematics/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/@ngx-translate/core": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-15.0.0.tgz",
-      "integrity": "sha512-Am5uiuR0bOOxyoercDnAA3rJVizo4RRqJHo8N3RqJ+XfzVP/I845yEnMADykOHvM6HkVm4SZSnJBOiz0Anx5BA==",
-      "license": "SEE LICENSE IN LICENSE",
-      "engines": {
-        "node": "^16.13.0 || >=18.10.0"
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.3.tgz",
+      "integrity": "sha512-UPse66z9tRUmIpeorYodXBQY6O4foUmj9jy9cCuuja7lqdOwRBWPzCWqc+qYIXv5L2QoqZdxgHtqoUz+Q9weSA==",
+      "dependencies": {
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=16.0.0",
-        "@angular/core": ">=16.0.0",
-        "rxjs": "^6.5.5 || ^7.4.0"
+        "@angular/common": ">=16",
+        "@angular/core": ">=16"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -5534,7 +5529,6 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -5548,7 +5542,6 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -5558,7 +5551,6 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -5571,7 +5563,6 @@
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@nodro7/angular-mydatepicker/-/angular-mydatepicker-0.14.0.tgz",
       "integrity": "sha512-NLUqU2Hpy3OQn/2xp5FDIqBlb87o9LCYRShnA9tfbQIPQIKay4sSexK6XPswZ3ccXkvrgRMhFDZpv10JURqahA==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       }
@@ -5581,17 +5572,15 @@
       "resolved": "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz",
       "integrity": "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12.4.0"
       }
     },
     "node_modules/@npmcli/agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz",
+      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "agent-base": "^7.1.0",
         "http-proxy-agent": "^7.0.0",
@@ -5600,48 +5589,45 @@
         "socks-proxy-agent": "^8.0.3"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz",
-      "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.1.tgz",
+      "integrity": "sha512-BBWMMxeQzalmKadyimwb2/VVQyJB01PH0HhVSNLHNBDZN/M/h/02P6f8fxedIiFhpMj11SO9Ep5tKTBE7zL2nw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "@npmcli/promise-spawn": "^7.0.0",
-        "ini": "^4.1.3",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "ini": "^5.0.0",
         "lru-cache": "^10.0.1",
-        "npm-pick-manifest": "^9.0.0",
-        "proc-log": "^4.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "proc-log": "^5.0.0",
         "promise-inflight": "^1.0.1",
         "promise-retry": "^2.0.1",
         "semver": "^7.3.5",
-        "which": "^4.0.0"
+        "which": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/git/node_modules/isexe": {
@@ -5649,7 +5635,6 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
       "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=16"
       }
@@ -5658,15 +5643,13 @@
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/@npmcli/git/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^3.1.1"
       },
@@ -5674,53 +5657,50 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
-      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz",
+      "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "npm-bundled": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
+        "npm-bundled": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "bin": {
         "installed-package-contents": "bin/index.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/node-gyp": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
-      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz",
+      "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
-      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.1.0.tgz",
+      "integrity": "sha512-t6G+6ZInT4X+tqj2i+wlLIeCKnKOTuz9/VFYDtj+TGTur5q7sp/OYrQA19LdBbWfXDOi0Y4jtedV6xtB8zQ9ug==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "@npmcli/git": "^5.0.0",
+        "@npmcli/git": "^6.0.0",
         "glob": "^10.2.2",
-        "hosted-git-info": "^7.0.0",
-        "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^6.0.0",
-        "proc-log": "^4.0.0",
+        "hosted-git-info": "^8.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "normalize-package-data": "^7.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.5.3"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/glob": {
@@ -5728,7 +5708,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
       "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -5741,135 +5720,421 @@
         "glob": "dist/esm/bin.mjs"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/hosted-git-info": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.0.2.tgz",
+      "integrity": "sha512-sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/@npmcli/package-json/node_modules/normalize-package-data": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.0.tgz",
+      "integrity": "sha512-k6U0gKRIuNCTkwHGZqblCfLfBRh+w1vI6tBo+IeJwq2M8FUiOqhX7GH+GArQGScA7azd1WfyRCvxoXDO3hQDIA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^8.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz",
+      "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ==",
+      "dev": true,
+      "dependencies": {
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/redact": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.0.0.tgz",
+      "integrity": "sha512-/1uFzjVcfzqrgCeGW7+SZ4hv0qLWmKXVzFahZGJ6QuJBj6Myt9s17+JL86i76NV9YSnJRcGXJYQbAU0rn1YTCQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/run-script": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.0.2.tgz",
+      "integrity": "sha512-cJXiUlycdizQwvqE1iaAb4VRUM3RX09/8q46zjvy+ct9GhfZRWd7jXYVc1tn/CfRlGPVkX/u4sstRlepsm7hfw==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/node-gyp": "^4.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "node-gyp": "^11.0.0",
+        "proc-log": "^5.0.0",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^10.0.1"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "ISC"
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
     },
-    "node_modules/@npmcli/package-json/node_modules/normalize-package-data": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
-      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-license": "^3.0.4"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/promise-spawn": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
-      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "which": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "ISC",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=16"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/promise-spawn/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/redact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
-      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "ISC",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/run-script": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
-      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/package-json": "^5.0.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "node-gyp": "^10.0.0",
-        "proc-log": "^4.0.0",
-        "which": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/run-script/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "ISC",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">=16"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -5877,7 +6142,6 @@
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=14"
@@ -5888,7 +6152,6 @@
       "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
       "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
@@ -5901,231 +6164,253 @@
       "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-2.2.0.tgz",
       "integrity": "sha512-UWRmygBsyj4bVXvDiqSccwT1kmsorcwQwaIy30yVh8T+Gspx4OlC0shX1y+ZuwXZvgnafmpRYKks0bAu9urJew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@xml-tools/parser": "^1.0.11",
         "prettier": ">=2.4.0"
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
-      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz",
+      "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
-      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz",
+      "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
-      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz",
+      "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
-      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz",
+      "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz",
+      "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz",
+      "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
-      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz",
+      "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
-      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz",
+      "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
-      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz",
+      "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
-      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz",
+      "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz",
+      "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
-      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz",
+      "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
-      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz",
+      "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
-      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz",
+      "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
-      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz",
+      "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
-      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz",
+      "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
-      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz",
+      "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
-      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz",
+      "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
-      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz",
+      "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -6135,18 +6420,16 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
       "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz",
-      "integrity": "sha512-sIoeipsisK5eTLW3XuNZYcal83AfslBbgI7LnV+3VrXwpasKPGHwo2ZdwhCd2IXAkuJ02Iyu7MyV0aQRM9i/3g==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.0.5.tgz",
+      "integrity": "sha512-4nBJZF8HvSdj/RoyIixAfOuKEQaEBsEBtohIow8iHX1wcLax558d70O/ZM6EOh2FQxmEaxUe1x4KwBQIha8RxA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.12",
-        "@angular-devkit/schematics": "18.2.12",
+        "@angular-devkit/core": "19.0.5",
+        "@angular-devkit/schematics": "19.0.5",
         "jsonc-parser": "3.3.1"
       },
       "engines": {
@@ -6156,26 +6439,24 @@
       }
     },
     "node_modules/@sigstore/bundle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
-      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.0.0.tgz",
+      "integrity": "sha512-XDUYX56iMPAn/cdgh/DTJxz5RWmqKV4pwvUAEKEWJl+HzKdCd/24wUa9JYNMlDSCb7SUHAdtksxYX779Nne/Zg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@sigstore/protobuf-specs": "^0.3.2"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
+      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
@@ -6183,56 +6464,52 @@
       "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
       "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@sigstore/sign": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
-      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.0.0.tgz",
+      "integrity": "sha512-UjhDMQOkyDoktpXoc5YPJpJK6IooF2gayAr5LvXI4EL7O0vd58okgfRcxuaH+YTdhvb5aa1Q9f+WJ0c2sVuYIw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
+        "@sigstore/bundle": "^3.0.0",
+        "@sigstore/core": "^2.0.0",
         "@sigstore/protobuf-specs": "^0.3.2",
-        "make-fetch-happen": "^13.0.1",
-        "proc-log": "^4.2.0",
+        "make-fetch-happen": "^14.0.1",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/tuf": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
-      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.0.0.tgz",
+      "integrity": "sha512-9Xxy/8U5OFJu7s+OsHzI96IX/OzjF/zj0BSSaWhgJgTqtlBhQIV2xdrQI5qxLD7+CWWDepadnXAxzaZ3u9cvRw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@sigstore/protobuf-specs": "^0.3.2",
-        "tuf-js": "^2.2.1"
+        "tuf-js": "^3.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/verify": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
-      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.0.0.tgz",
+      "integrity": "sha512-Ggtq2GsJuxFNUvQzLoXqRwS4ceRfLAJnrIHUDrzAD0GgnOhwujJkKkxM/s5Bako07c3WtAs/sZo5PJq7VHjeDg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.1.0",
+        "@sigstore/bundle": "^3.0.0",
+        "@sigstore/core": "^2.0.0",
         "@sigstore/protobuf-specs": "^0.3.2"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sindresorhus/merge-streams": {
@@ -6240,7 +6517,6 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -6252,26 +6528,24 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
       "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@stencil/core": {
-      "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
-      "license": "MIT",
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.23.0.tgz",
+      "integrity": "sha512-9vI8ywhoqlaDEmrcntejrZ9X76Tddv2JyWakjVpqJAdDNXgf520sYkyjzGT0p8VJfPtSaKm6pMtl5sAH1r9cFg==",
       "bin": {
         "stencil": "bin/stencil"
       },
       "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "node": ">=16.0.0",
+        "npm": ">=7.10.0"
       }
     },
     "node_modules/@stylistic/eslint-plugin": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.12.0.tgz",
-      "integrity": "sha512-IvD2WXbOoSp0zNpyYbjdSyEjZtut78RYfj2WIlbChE7HFuposTK5X1hc5+4AyqYcjLXYdD5oo/sJtqMGFNRb1w==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.12.1.tgz",
+      "integrity": "sha512-fubZKIHSPuo07FgRTn6S4Nl0uXPRPYVNpyZzIDGfp7Fny6JjNus6kReLD7NI380JXi4HtUTSOZ34LBuNPO1XLQ==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^8.13.0",
@@ -6291,30 +6565,26 @@
       "version": "0.23.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
       "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@trapezedev/gradle-parse": {
-      "version": "7.0.10",
-      "resolved": "https://registry.npmjs.org/@trapezedev/gradle-parse/-/gradle-parse-7.0.10.tgz",
-      "integrity": "sha512-k822Is3jGroqOTKF0gAFm80LmhFJWBAyZvNtyuXq6uQUzDDe2fj/gHwixP6VFzlpaWKLP7IuR609Xv8gwJCXyg==",
-      "dev": true,
-      "license": "SEE LICENSE"
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@trapezedev/gradle-parse/-/gradle-parse-7.1.3.tgz",
+      "integrity": "sha512-WQVF5pEJ5o/mUyvfGTG9nBKx9Te/ilKM3r2IT69GlbaooItT5ao7RyF1MUTBNjHLPk/xpGUY3c6PyVnjDlz0Vw==",
+      "dev": true
     },
     "node_modules/@trapezedev/project": {
-      "version": "7.0.10",
-      "resolved": "https://registry.npmjs.org/@trapezedev/project/-/project-7.0.10.tgz",
-      "integrity": "sha512-UjwsStjhHq/+D1bWREmFDoyKql+qFIgJX93zQLg7R6CyWZUdtlGP2hU3l7tsVRtjJBVXpVu5mj8tdwJJoABO3A==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@trapezedev/project/-/project-7.1.3.tgz",
+      "integrity": "sha512-GANh8Ey73MechZrryfJoILY9hBnWqzS6AdB53zuWBCBbaiImyblXT41fWdN6pB2f5+cNI2FAUxGfVhl+LeEVbQ==",
       "dev": true,
-      "license": "SEE LICENSE",
       "dependencies": {
         "@ionic/utils-fs": "^3.1.5",
         "@ionic/utils-subprocess": "^2.1.8",
         "@prettier/plugin-xml": "^2.2.0",
-        "@trapezedev/gradle-parse": "7.0.10",
+        "@trapezedev/gradle-parse": "7.1.3",
         "@xmldom/xmldom": "^0.7.5",
         "conventional-changelog": "^3.1.4",
-        "cross-fetch": "^3.1.5",
         "cross-spawn": "^7.0.3",
         "diff": "^5.1.0",
         "env-paths": "^3.0.0",
@@ -6323,7 +6593,6 @@
         "kleur": "^4.1.5",
         "lodash": "^4.17.21",
         "mergexml": "^1.2.3",
-        "npm-watch": "^0.9.0",
         "plist": "^3.0.4",
         "prettier": "^2.7.1",
         "prompts": "^2.4.2",
@@ -6342,7 +6611,6 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
       "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -6352,7 +6620,6 @@
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
       "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -6365,7 +6632,6 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
       "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -6374,52 +6640,46 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
       "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
       "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
       "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
       "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@tufjs/canonical-json": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
       "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@tufjs/models": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
-      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz",
+      "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.4"
+        "minimatch": "^9.0.5"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@types/body-parser": {
@@ -6427,7 +6687,6 @@
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
       "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -6438,7 +6697,6 @@
       "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
       "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6448,7 +6706,6 @@
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6458,7 +6715,6 @@
       "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
       "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
@@ -6468,38 +6724,53 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
       "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/cordova": {
       "version": "11.0.3",
       "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.3.tgz",
-      "integrity": "sha512-kyuRQ40/NWQVhqGIHq78Ehu2Bf9Mlg0LhmSmis6ZFJK7z933FRfYi8tHe/k/0fB+PGfCf95rJC6TO7dopaFvAg==",
-      "license": "MIT"
+      "integrity": "sha512-kyuRQ40/NWQVhqGIHq78Ehu2Bf9Mlg0LhmSmis6ZFJK7z933FRfYi8tHe/k/0fB+PGfCf95rJC6TO7dopaFvAg=="
     },
     "node_modules/@types/cors": {
       "version": "2.8.17",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
       "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "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,
-      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -6508,11 +6779,10 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
-      "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz",
+      "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -6525,7 +6795,6 @@
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
       "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -6538,7 +6807,6 @@
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
       "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6552,32 +6820,28 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/http-proxy": {
       "version": "1.17.15",
       "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
       "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/jasmine": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz",
-      "integrity": "sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.5.tgz",
+      "integrity": "sha512-SaCZ3kM5NjOiJqMRYwHpLbTfUC2Dyk1KS3QanNFsUYPGTk70CWVK/J9ueun6zNhw/UkgV7xl8V4ZLQZNRbfnNw==",
+      "dev": true
     },
     "node_modules/@types/jasminewd2": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.13.tgz",
       "integrity": "sha512-aJ3wj8tXMpBrzQ5ghIaqMisD8C3FIrcO6sDKHqFbuqAsI7yOxj0fA7MrRCPLZHIVUjERIwsMmGn/vB0UQ9u0Hg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/jasmine": "*"
       }
@@ -6586,46 +6850,31 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/mute-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
-      "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.16.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz",
-      "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==",
+      "version": "20.17.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.10.tgz",
+      "integrity": "sha512-/jrvh5h6NXhEauFFexRin69nA0uHJ5gwk4iDivp/DeoEua3uwCUto6PC86IpRITBOs4+6i2I56K5x5b6WYGXHA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -6635,7 +6884,6 @@
       "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
       "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6644,50 +6892,31 @@
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
       "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/q": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-      "integrity": "sha512-qYi3YV9inU/REEfxwVcGZzbS3KG/Xs90lv0Pr+lDtuVjBPGd1A+eciXzVSaRvLify132BfcvhvEjeVahrUl0Ug==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/qs": {
       "version": "6.9.17",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
       "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/retry": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
       "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/selenium-webdriver": {
-      "version": "3.0.26",
-      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.26.tgz",
-      "integrity": "sha512-dyIGFKXfUFiwkMfNGn1+F6b80ZjR3uSYv1j6xVJSDlft5waZ2cwkHW4e7zNzvq7hiEackcgvBpmnXZrI1GltPg==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -6698,7 +6927,6 @@
       "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
       "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
@@ -6708,7 +6936,6 @@
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
       "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
         "@types/node": "*",
@@ -6719,490 +6946,129 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/sockjs": {
-      "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/uuid": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/wrap-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
-      "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/ws": {
-      "version": "8.5.13",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
-      "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
-      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/type-utils": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
-      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
-      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",
-      "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.13.0",
-        "@typescript-eslint/visitor-keys": "8.13.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
-      "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
+    "node_modules/@types/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
+      "dev": true
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.13",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+      "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
       "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
-      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.1.tgz",
+      "integrity": "sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "debug": "^4.3.4",
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/type-utils": "8.18.1",
+        "@typescript-eslint/utils": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
+      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0"
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
+      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
-      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.1.tgz",
+      "integrity": "sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0"
+        "@typescript-eslint/typescript-estree": "8.18.1",
+        "@typescript-eslint/utils": "8.18.1",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
-      "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7213,13 +7079,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",
-      "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
+      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.13.0",
-        "@typescript-eslint/visitor-keys": "8.13.0",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -7234,35 +7100,20 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
-      "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz",
-      "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.1.tgz",
+      "integrity": "sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.13.0",
-        "@typescript-eslint/types": "8.13.0",
-        "@typescript-eslint/typescript-estree": "8.13.0"
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7272,44 +7123,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
-      "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",
-      "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
+      "integrity": "sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.13.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "@typescript-eslint/types": "8.18.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
-      "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
-      "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7318,31 +7144,11 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
       "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.6.0"
       },
@@ -7351,163 +7157,148 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -7516,7 +7307,6 @@
       "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz",
       "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "chevrotain": "7.1.1"
       }
@@ -7525,8 +7315,8 @@
       "version": "0.7.13",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
       "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==",
+      "deprecated": "this version is no longer supported, please update to at least 0.8.*",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -7535,29 +7325,25 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "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,
-      "license": "Apache-2.0"
+      "dev": true
     },
     "node_modules/@yarnpkg/lockfile": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
     "node_modules/abbrev": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
       "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -7567,7 +7353,6 @@
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -7576,6 +7361,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/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/acorn": {
       "version": "8.14.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
@@ -7588,32 +7382,20 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
       },
@@ -7625,15 +7407,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
       "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/adjust-sourcemap-loader": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
       "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
@@ -7647,7 +7427,6 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -7657,25 +7436,11 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/adm-zip": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz",
-      "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0"
-      }
-    },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
@@ -7685,7 +7450,6 @@
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -7715,7 +7479,6 @@
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
       "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -7733,7 +7496,6 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -7746,7 +7508,6 @@
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
       "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7756,7 +7517,6 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -7775,7 +7535,6 @@
       "engines": [
         "node >= 0.8.0"
       ],
-      "license": "Apache-2.0",
       "bin": {
         "ansi-html": "bin/ansi-html"
       }
@@ -7784,22 +7543,22 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "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==",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
@@ -7807,7 +7566,6 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -7821,7 +7579,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -7834,7 +7591,6 @@
       "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
       "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
@@ -7843,22 +7599,19 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
+      "dev": true
     },
     "node_modules/aria-query": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
       "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">= 0.4"
       }
@@ -7868,7 +7621,6 @@
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
       "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.5",
         "is-array-buffer": "^3.0.4"
@@ -7884,22 +7636,19 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/array-ify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
       "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/array-includes": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
       "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -7920,27 +7669,15 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array.prototype.findlastindex": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
       "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -7957,16 +7694,15 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7976,16 +7712,15 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7995,20 +7730,18 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8022,44 +7755,21 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.8"
+        "node": ">=0.10.0"
       }
     },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "dev": true
+    },
     "node_modules/ast-types": {
       "version": "0.13.4",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
       "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.1"
       },
@@ -8072,7 +7782,6 @@
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8081,15 +7790,13 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -8113,7 +7820,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.23.3",
         "caniuse-lite": "^1.0.30001646",
@@ -8137,7 +7843,6 @@
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -8148,46 +7853,26 @@
         "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,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
-      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/axobject-query": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
       "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/b4a": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
-      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
-      "dev": true,
-      "license": "Apache-2.0"
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
+      "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
+      "dev": true
     },
     "node_modules/babel-loader": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
-      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+      "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-cache-dir": "^4.0.0",
         "schema-utils": "^4.0.0"
@@ -8201,14 +7886,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+      "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -8220,7 +7904,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -8230,7 +7913,6 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
       "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.2",
         "core-js-compat": "^3.38.0"
@@ -8240,13 +7922,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
-      "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+      "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -8256,23 +7937,20 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz",
+      "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==",
       "dev": true,
-      "license": "Apache-2.0",
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
-      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz",
+      "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==",
       "dev": true,
-      "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
         "bare-events": "^2.0.0",
@@ -8281,11 +7959,10 @@
       }
     },
     "node_modules/bare-os": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
-      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz",
+      "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "optional": true
     },
     "node_modules/bare-path": {
@@ -8293,21 +7970,19 @@
       "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
       "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
       "dev": true,
-      "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
         "bare-os": "^2.1.0"
       }
     },
     "node_modules/bare-stream": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
-      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.1.tgz",
+      "integrity": "sha512-eVZbtKM+4uehzrsj49KtCy3Pbg7kO1pJ3SKZ1SFrIH/0pnj9scuGGgUlNDf/7qS8WKtGdiJY5Kyhs/ivYPTB/g==",
       "dev": true,
-      "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "streamx": "^2.18.0"
+        "streamx": "^2.21.0"
       }
     },
     "node_modules/base64-js": {
@@ -8327,15 +8002,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/base64id": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
       "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^4.5.0 || >= 5.9"
       }
@@ -8345,7 +8018,6 @@
       "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
       "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -8354,17 +8026,93 @@
       "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/beasties": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.1.0.tgz",
+      "integrity": "sha512-+Ssscd2gVG24qRNC+E2g88D+xsQW4xwakWtKAiGEQ3Pw54/FGdyo9RrfxhGhEv6ilFVbB7r3Lgx+QnAxnSpECw==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "htmlparser2": "^9.0.0",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.47",
+        "postcss-media-query-parser": "^0.2.3"
+      }
     },
-    "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==",
+    "node_modules/beasties/node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/beasties/node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "tweetnacl": "^0.14.3"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/beasties/node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/beasties/node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/beasties/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/big-integer": {
@@ -8372,7 +8120,6 @@
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
       "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
       "dev": true,
-      "license": "Unlicense",
       "engines": {
         "node": ">=0.6"
       }
@@ -8382,7 +8129,6 @@
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -8392,7 +8138,6 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -8404,29 +8149,12 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "license": "MIT",
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
       }
     },
-    "node_modules/blocking-proxy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
-      "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "blocking-proxy": "built/lib/bin.js"
-      },
-      "engines": {
-        "node": ">=6.9.x"
-      }
-    },
     "node_modules/body-parser": {
       "version": "1.20.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
@@ -8456,7 +8184,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -8466,7 +8193,6 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -8478,15 +8204,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/bonjour-service": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
       "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "multicast-dns": "^7.2.5"
@@ -8496,15 +8220,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/bplist-creator": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz",
       "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "stream-buffers": "2.2.x"
       }
@@ -8514,7 +8236,6 @@
       "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz",
       "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big-integer": "1.6.x"
       },
@@ -8527,7 +8248,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -8537,7 +8257,6 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -8546,9 +8265,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+      "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
       "dev": true,
       "funding": [
         {
@@ -8564,12 +8283,11 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -8578,53 +8296,6 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/browserstack": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.6.1.tgz",
-      "integrity": "sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "https-proxy-agent": "^2.2.1"
-      }
-    },
-    "node_modules/browserstack/node_modules/agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/browserstack/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/browserstack/node_modules/https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -8643,7 +8314,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -8654,7 +8324,6 @@
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -8663,15 +8332,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/bundle-name": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
       "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "run-applescript": "^7.0.0"
       },
@@ -8687,19 +8354,17 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^10.0.1",
@@ -8707,13 +8372,22 @@
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/cacache/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/cacache/node_modules/glob": {
@@ -8721,7 +8395,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
       "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -8741,21 +8414,88 @@
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/cacache/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/cacache/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+      "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8769,7 +8509,6 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8779,7 +8518,6 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8789,7 +8527,6 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
       "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "camelcase": "^5.3.1",
         "map-obj": "^4.0.0",
@@ -8803,9 +8540,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001668",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
-      "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
+      "version": "1.0.30001689",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz",
+      "integrity": "sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==",
       "dev": true,
       "funding": [
         {
@@ -8820,24 +8557,21 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "CC-BY-4.0"
+      ]
     },
     "node_modules/capacitor-blob-writer": {
-      "version": "1.1.17",
-      "resolved": "https://registry.npmjs.org/capacitor-blob-writer/-/capacitor-blob-writer-1.1.17.tgz",
-      "integrity": "sha512-IixJbl0k4NQ+aPo+UbDvHJxztnaGymVMCkYoHKTjj3F3KDTsMEl5iK7fEZkQ5jhQabe8YJKW0wTGu6Qm/RmXrw==",
-      "license": "MIT",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/capacitor-blob-writer/-/capacitor-blob-writer-1.1.18.tgz",
+      "integrity": "sha512-Bv473r0kGwtMuQ3s38GbuqgeVLisl59GOBf7yv0RzXq025qg7/gK2wll6VR1gC3ex6lgJ8/5ngnppHTgibs7EQ==",
       "peerDependencies": {
         "@capacitor/core": ">=3.0.0",
         "@capacitor/filesystem": ">=1.0.0"
       }
     },
     "node_modules/capacitor-ios-autofill-save-password": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/capacitor-ios-autofill-save-password/-/capacitor-ios-autofill-save-password-3.0.0.tgz",
-      "integrity": "sha512-FGWralgZ47FtpRcIaJP+IcNDZfmoaCUmkeGBKo84V3nYMKQwQbpN9wLIzXa+TtHj8h1SenRuSR2eTsQBrRewAQ==",
-      "license": "MIT",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/capacitor-ios-autofill-save-password/-/capacitor-ios-autofill-save-password-4.0.0.tgz",
+      "integrity": "sha512-CNswfilVSy5gLLjoWd4h0HUSJCExn6DDjWLQF6xucmLmdP3CKoqVNPieJOJBLqoIm4d1xfOkHFpolha2cr2ZWA==",
       "peerDependencies": {
         "@capacitor/core": "^6.0.0"
       }
@@ -8846,39 +8580,30 @@
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/capacitor-secure-storage-plugin/-/capacitor-secure-storage-plugin-0.10.0.tgz",
       "integrity": "sha512-dV4E+HTZAJWC3gef7sBXaAkkb6wvcZHyXjJIHXNb3yz9gRQ/5VMLqCxa0khqpwgWh5oIbo4XFxg3g5tEkfaNMg==",
-      "license": "MIT",
       "peerDependencies": {
         "@capacitor/core": "^6.0.0"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
     "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==",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/chart.js": {
       "version": "4.4.7",
@@ -8895,7 +8620,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz",
       "integrity": "sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==",
-      "license": "MIT",
       "peerDependencies": {
         "chart.js": ">=2.8.0",
         "date-fns": ">=2.0.0"
@@ -8913,7 +8637,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz",
       "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==",
-      "license": "MIT",
       "peerDependencies": {
         "chart.js": ">=3.0.0"
       }
@@ -8935,34 +8658,23 @@
       "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz",
       "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "regexp-to-ast": "0.5.0"
       }
     },
     "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "devOptional": true,
-      "license": "MIT",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.2.tgz",
+      "integrity": "sha512-/b57FK+bblSU+dfewfFe0rT1YjVDfOmeLQwCAuC+vwvgLkXboATqqmy+Ipux6JrF6L5joe5CBnFOw+gLWH6yKg==",
+      "dev": 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"
+        "readdirp": "^4.0.1"
       },
       "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "node": ">= 14.16.0"
       },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/chownr": {
@@ -8970,7 +8682,6 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -8980,7 +8691,6 @@
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       }
@@ -8988,15 +8698,13 @@
     "node_modules/classlist.js": {
       "version": "1.1.20150312",
       "resolved": "https://registry.npmjs.org/classlist.js/-/classlist.js-1.1.20150312.tgz",
-      "integrity": "sha512-eR8yB970+yGslcTnJnROX2icsMa8v/KVLv/sgv3NhSvZSHgam64XNSF2TyJnKIfsnTFJBcTdrIneYqUIrvxLpg==",
-      "license": "Dedicated to the public domain"
+      "integrity": "sha512-eR8yB970+yGslcTnJnROX2icsMa8v/KVLv/sgv3NhSvZSHgam64XNSF2TyJnKIfsnTFJBcTdrIneYqUIrvxLpg=="
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -9005,7 +8713,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
       "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -9017,7 +8724,6 @@
       "version": "2.9.2",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
       "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -9030,7 +8736,6 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
       "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^7.0.0"
@@ -9047,7 +8752,6 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
       "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9060,7 +8764,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9072,15 +8775,13 @@
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
       "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
       "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9093,7 +8794,6 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
       "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -9110,7 +8810,6 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
       "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^10.3.0",
         "get-east-asian-width": "^1.0.0",
@@ -9128,7 +8827,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -9144,7 +8842,6 @@
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
       "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 12"
       }
@@ -9154,7 +8851,6 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -9164,48 +8860,11 @@
         "node": ">=12"
       }
     },
-    "node_modules/cliui/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cliui/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cliui/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,
-      "license": "MIT"
-    },
     "node_modules/cliui/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9222,7 +8881,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
       "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -9232,7 +8890,6 @@
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -9242,12 +8899,23 @@
         "node": ">=6"
       }
     },
+    "node_modules/clone-deep/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/color": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
       "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1",
         "color-string": "^1.9.0"
@@ -9257,66 +8925,42 @@
       }
     },
     "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==",
-      "dev": true,
-      "license": "MIT",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "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==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "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,
-      "license": "MIT",
       "dependencies": {
         "color-name": "^1.0.0",
         "simple-swizzle": "^0.2.2"
       }
     },
-    "node_modules/color/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color/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,
-      "license": "MIT"
-    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.1.90"
       }
@@ -9326,7 +8970,6 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -9339,7 +8982,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 12"
       }
@@ -9349,7 +8991,6 @@
       "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
       "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 12.0.0"
       }
@@ -9358,15 +8999,13 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
       "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/compare-func": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
       "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-ify": "^1.0.0",
         "dot-prop": "^5.1.0"
@@ -9375,15 +9014,13 @@
     "node_modules/compare-versions": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
-      "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==",
-      "license": "MIT"
+      "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg=="
     },
     "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,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -9393,7 +9030,6 @@
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
       },
@@ -9406,7 +9042,6 @@
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
       "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "compressible": "~2.0.18",
@@ -9425,7 +9060,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -9434,15 +9068,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/compression/node_modules/negotiator": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
       "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9451,15 +9083,13 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
@@ -9475,7 +9105,6 @@
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -9485,7 +9114,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -9494,15 +9122,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -9515,7 +9141,6 @@
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9525,7 +9150,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.25.tgz",
       "integrity": "sha512-ryhi3fd1mKf3fSjbLXOfK2D06YwKNic1nC9mWqybBHdObPd8KJ2vjaXZfYj1U23t+V8T8n0d7gwnc9XbIdFbyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "conventional-changelog-angular": "^5.0.12",
         "conventional-changelog-atom": "^2.0.8",
@@ -9548,7 +9172,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz",
       "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0",
         "q": "^1.5.1"
@@ -9562,7 +9185,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz",
       "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -9575,7 +9197,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz",
       "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -9588,7 +9209,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz",
       "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0",
         "lodash": "^4.17.15",
@@ -9603,7 +9223,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz",
       "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "add-stream": "^1.0.0",
         "conventional-changelog-writer": "^5.0.0",
@@ -9629,7 +9248,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz",
       "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -9642,7 +9260,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz",
       "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -9655,7 +9272,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz",
       "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -9668,7 +9284,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz",
       "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -9681,7 +9296,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz",
       "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0",
         "q": "^1.5.1"
@@ -9695,7 +9309,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
       "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -9705,7 +9318,6 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz",
       "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "conventional-commits-filter": "^2.0.7",
         "dateformat": "^3.0.0",
@@ -9729,7 +9341,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -9739,7 +9350,6 @@
       "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz",
       "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash.ismatch": "^4.4.0",
         "modify-values": "^1.0.0"
@@ -9753,7 +9363,6 @@
       "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz",
       "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-text-path": "^1.0.1",
         "JSONStream": "^1.0.4",
@@ -9773,15 +9382,13 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/cookie": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
       "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9790,22 +9397,19 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/cookiejar": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
       "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/copy-anything": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
       "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-what": "^3.14.1"
       },
@@ -9818,7 +9422,6 @@
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz",
       "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.1",
@@ -9838,74 +9441,13 @@
         "webpack": "^5.1.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
-      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.2",
-        "ignore": "^5.2.4",
-        "path-type": "^5.0.0",
-        "slash": "^5.1.0",
-        "unicorn-magic": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/path-type": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
-      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/core-js-compat": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
-      "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.3"
+        "browserslist": "^4.24.2"
       },
       "funding": {
         "type": "opencollective",
@@ -9913,169 +9455,61 @@
       }
     },
     "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,
-      "license": "MIT"
+      "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/cors": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
       "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/critters": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz",
-      "integrity": "sha512-Oyqew0FGM0wYUSNqR0L6AteO5MpMoUU0rhKRieXeiKs+PmRTxiJMyaunYB2KF6fQ3dzChXKCpbFOEJx3OQ1v/Q==",
-      "deprecated": "Ownership of Critters has moved to the Nuxt team, who will be maintaining the project going forward. If you'd like to keep using Critters, please switch to the actively-maintained fork at https://github.com/danielroe/beasties",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "css-select": "^5.1.0",
-        "dom-serializer": "^2.0.0",
-        "domhandler": "^5.0.2",
-        "htmlparser2": "^8.0.2",
-        "postcss": "^8.4.23",
-        "postcss-media-query-parser": "^0.2.3"
-      }
-    },
-    "node_modules/critters/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/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,
-      "license": "MIT",
-      "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/critters/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/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,
-      "license": "MIT"
-    },
-    "node_modules/critters/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/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,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "object-assign": "^4",
+        "vary": "^1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
+    "node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "node-fetch": "^2.6.12"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -10090,7 +9524,6 @@
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
       "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -10100,7 +9533,6 @@
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
       "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.33",
@@ -10132,16 +9564,15 @@
       }
     },
     "node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
         "nth-check": "^2.0.1"
       },
       "funding": {
@@ -10153,7 +9584,6 @@
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -10166,7 +9596,6 @@
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -10178,14 +9607,12 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
       "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/d3": {
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
       "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -10226,7 +9653,6 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -10238,7 +9664,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
       "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10247,7 +9672,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
       "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -10263,7 +9687,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
       "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-      "license": "ISC",
       "dependencies": {
         "d3-path": "1 - 3"
       },
@@ -10275,7 +9698,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10284,7 +9706,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
       "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "^3.2.0"
       },
@@ -10296,7 +9717,6 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-      "license": "ISC",
       "dependencies": {
         "delaunator": "5"
       },
@@ -10308,7 +9728,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
       "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10317,7 +9736,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
       "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-selection": "3"
@@ -10330,7 +9748,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
       "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-      "license": "ISC",
       "dependencies": {
         "commander": "7",
         "iconv-lite": "0.6",
@@ -10355,7 +9772,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -10364,7 +9780,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -10373,7 +9788,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
       "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
-      "license": "ISC",
       "dependencies": {
         "d3-dsv": "1 - 3"
       },
@@ -10385,7 +9799,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
       "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-quadtree": "1 - 3",
@@ -10399,7 +9812,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10408,7 +9820,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -10420,7 +9831,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
       "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10429,7 +9839,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -10441,7 +9850,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10450,7 +9858,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
       "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10459,7 +9866,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
       "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10468,7 +9874,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
       "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10477,7 +9882,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -10493,7 +9897,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -10506,7 +9909,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10515,7 +9917,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -10527,7 +9928,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -10539,7 +9939,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -10551,7 +9950,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10560,7 +9958,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
       "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-dispatch": "1 - 3",
@@ -10579,7 +9976,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
       "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -10596,30 +9992,15 @@
       "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
       "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/data-uri-to-buffer": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
       "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
@@ -10629,7 +10010,6 @@
       "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
       "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.6",
         "es-errors": "^1.3.0",
@@ -10647,7 +10027,6 @@
       "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
       "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
@@ -10665,7 +10044,6 @@
       "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
       "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.6",
         "es-errors": "^1.3.0",
@@ -10679,19 +10057,12 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=0.11"
-      },
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
       }
     },
     "node_modules/date-format": {
@@ -10699,7 +10070,6 @@
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
       "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       }
@@ -10709,19 +10079,17 @@
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
       "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -10737,7 +10105,6 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10747,7 +10114,6 @@
       "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
       "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "decamelize": "^1.1.0",
         "map-obj": "^1.0.0"
@@ -10764,7 +10130,6 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10774,7 +10139,6 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -10790,7 +10154,6 @@
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
       }
@@ -10799,15 +10162,13 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/default-browser": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
       "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bundle-name": "^4.1.0",
         "default-browser-id": "^5.0.0"
@@ -10824,7 +10185,6 @@
       "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
       "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -10832,78 +10192,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/default-gateway/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/default-gateway/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-gateway/node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/default-gateway/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,
-      "license": "ISC"
-    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "license": "MIT",
       "dependencies": {
         "clone": "^1.0.2"
       },
@@ -10916,7 +10208,6 @@
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -10934,7 +10225,6 @@
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
       "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -10947,7 +10237,6 @@
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -10965,7 +10254,6 @@
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
       "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ast-types": "^0.13.4",
         "escodegen": "^2.1.0",
@@ -10980,7 +10268,6 @@
       "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
       "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "globby": "^11.0.1",
         "graceful-fs": "^4.2.4",
@@ -10998,13 +10285,47 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/del/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/del/node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/del/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -11015,11 +10336,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/del/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/delaunator": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
       "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
-      "license": "ISC",
       "dependencies": {
         "robust-predicates": "^3.0.2"
       }
@@ -11029,7 +10358,6 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -11039,7 +10367,6 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11049,35 +10376,35 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10"
       }
     },
     "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/dezalgo": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
       "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -11087,15 +10414,13 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
       "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -11105,7 +10430,6 @@
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -11113,12 +10437,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/dir-glob/node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/dns-packet": {
       "version": "5.6.1",
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
       "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
       },
@@ -11127,16 +10459,15 @@
       }
     },
     "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/dom-serialize": {
@@ -11144,7 +10475,6 @@
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
       "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "custom-event": "~1.0.0",
         "ent": "~2.2.0",
@@ -11153,15 +10483,14 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
@@ -11177,17 +10506,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ],
-      "license": "BSD-2-Clause"
+      ]
     },
     "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "domelementtype": "^2.3.0"
+        "domelementtype": "^2.2.0"
       },
       "engines": {
         "node": ">= 4"
@@ -11197,15 +10524,14 @@
       }
     },
     "node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
       },
       "funding": {
         "url": "https://github.com/fb55/domutils?sponsor=1"
@@ -11216,7 +10542,6 @@
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
       "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-obj": "^2.0.0"
       },
@@ -11224,12 +10549,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
       "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "readable-stream": "^2.0.2"
       }
@@ -11238,15 +10576,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/duplexer2/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,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -11261,15 +10597,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/duplexer2/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,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -11278,47 +10612,25 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/ecc-jsbn/node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.36",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz",
-      "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.5.74",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz",
+      "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==",
+      "dev": true
     },
     "node_modules/elementtree": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
       "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "sax": "1.1.4"
       },
@@ -11330,15 +10642,13 @@
       "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,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -11348,7 +10658,6 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11358,7 +10667,6 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
@@ -11369,7 +10677,6 @@
       "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,
-      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -11379,7 +10686,6 @@
       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
       "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
@@ -11401,17 +10707,32 @@
       "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
       "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
     },
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.17.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
       "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -11421,27 +10742,25 @@
       }
     },
     "node_modules/ent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.1.tgz",
-      "integrity": "sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.2.tgz",
+      "integrity": "sha512-kKvD1tO6BM+oK9HzCPpUdRb4vKFQY/FPTFmurMvh6LlN68VMrdj77w8yp51/kDbpkFOS9J8w5W6zIzgM2H8/hw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "punycode": "^1.4.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "punycode": "^1.4.1",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "devOptional": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
+      "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"
       }
@@ -11451,7 +10770,6 @@
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -11461,7 +10779,6 @@
       "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
       "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -11473,15 +10790,13 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
       "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "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,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "prr": "~1.0.1"
@@ -11495,64 +10810,64 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.23.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.6.tgz",
+      "integrity": "sha512-Ifco6n3yj2tMZDWNLyloZrytt9lqqlwvS83P3HtaETR0NUOYnIULGGHpktqYGObGy+8wc1okO25p8TjemhImvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "data-view-buffer": "^1.0.1",
         "data-view-byte-length": "^1.0.1",
         "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
         "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.7",
+        "get-intrinsic": "^1.2.6",
         "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
+        "internal-slot": "^1.1.0",
         "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
+        "is-data-view": "^1.0.2",
         "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
+        "is-regex": "^1.2.1",
         "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
+        "is-string": "^1.1.1",
         "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.0.0",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-regex-test": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
         "typed-array-buffer": "^1.0.2",
         "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
+        "typed-array-byte-offset": "^1.0.3",
+        "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11562,14 +10877,10 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
       "engines": {
         "node": ">= 0.4"
       }
@@ -11579,7 +10890,6 @@
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -11588,15 +10898,13 @@
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
       "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/es-object-atoms": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
       "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -11609,7 +10917,6 @@
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
       "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.4",
         "has-tostringtag": "^1.0.2",
@@ -11624,21 +10931,19 @@
       "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
       "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.0"
       }
     },
     "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==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11647,30 +10952,12 @@
         "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,
-      "license": "MIT"
-    },
-    "node_modules/es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es6-promise": "^4.0.3"
-      }
-    },
     "node_modules/esbuild": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
-      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
+      "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -11678,38 +10965,37 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.23.0",
-        "@esbuild/android-arm": "0.23.0",
-        "@esbuild/android-arm64": "0.23.0",
-        "@esbuild/android-x64": "0.23.0",
-        "@esbuild/darwin-arm64": "0.23.0",
-        "@esbuild/darwin-x64": "0.23.0",
-        "@esbuild/freebsd-arm64": "0.23.0",
-        "@esbuild/freebsd-x64": "0.23.0",
-        "@esbuild/linux-arm": "0.23.0",
-        "@esbuild/linux-arm64": "0.23.0",
-        "@esbuild/linux-ia32": "0.23.0",
-        "@esbuild/linux-loong64": "0.23.0",
-        "@esbuild/linux-mips64el": "0.23.0",
-        "@esbuild/linux-ppc64": "0.23.0",
-        "@esbuild/linux-riscv64": "0.23.0",
-        "@esbuild/linux-s390x": "0.23.0",
-        "@esbuild/linux-x64": "0.23.0",
-        "@esbuild/netbsd-x64": "0.23.0",
-        "@esbuild/openbsd-arm64": "0.23.0",
-        "@esbuild/openbsd-x64": "0.23.0",
-        "@esbuild/sunos-x64": "0.23.0",
-        "@esbuild/win32-arm64": "0.23.0",
-        "@esbuild/win32-ia32": "0.23.0",
-        "@esbuild/win32-x64": "0.23.0"
+        "@esbuild/aix-ppc64": "0.24.0",
+        "@esbuild/android-arm": "0.24.0",
+        "@esbuild/android-arm64": "0.24.0",
+        "@esbuild/android-x64": "0.24.0",
+        "@esbuild/darwin-arm64": "0.24.0",
+        "@esbuild/darwin-x64": "0.24.0",
+        "@esbuild/freebsd-arm64": "0.24.0",
+        "@esbuild/freebsd-x64": "0.24.0",
+        "@esbuild/linux-arm": "0.24.0",
+        "@esbuild/linux-arm64": "0.24.0",
+        "@esbuild/linux-ia32": "0.24.0",
+        "@esbuild/linux-loong64": "0.24.0",
+        "@esbuild/linux-mips64el": "0.24.0",
+        "@esbuild/linux-ppc64": "0.24.0",
+        "@esbuild/linux-riscv64": "0.24.0",
+        "@esbuild/linux-s390x": "0.24.0",
+        "@esbuild/linux-x64": "0.24.0",
+        "@esbuild/netbsd-x64": "0.24.0",
+        "@esbuild/openbsd-arm64": "0.24.0",
+        "@esbuild/openbsd-x64": "0.24.0",
+        "@esbuild/sunos-x64": "0.24.0",
+        "@esbuild/win32-arm64": "0.24.0",
+        "@esbuild/win32-ia32": "0.24.0",
+        "@esbuild/win32-x64": "0.24.0"
       }
     },
     "node_modules/esbuild-wasm": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz",
-      "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.24.0.tgz",
+      "integrity": "sha512-xhNn5tL1AhkPg4ft59yXT6FkwKXiPSYyz1IeinJHUJpjvOHOIPvdmFQc0pGdjxlKSbzZc2mNmtVOWAR1EF/JAg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -11718,11 +11004,10 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -11731,17 +11016,18 @@
       "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,
-      "license": "MIT"
+      "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==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/escodegen": {
@@ -11749,7 +11035,6 @@
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -11771,66 +11056,68 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
+      "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.0",
+        "@eslint/core": "^0.9.0",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "9.17.0",
+        "@eslint/plugin-kit": "^0.2.3",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
+        "@humanwhocodes/retry": "^0.4.1",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-import-resolver-node": {
@@ -11838,7 +11125,6 @@
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
       "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.13.0",
@@ -11850,7 +11136,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -11890,35 +11175,11 @@
         }
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-import-resolver-typescript/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/eslint-module-utils": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.1.tgz",
-      "integrity": "sha512-EwcbfLOhwVMAfatfqLecR2yv3dE5+kQ8kx+Rrt0DvDXEVwW86KQ/xbMDQhtp5l42VXukD5SOF8mQQHbaNtO0CQ==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -11936,7 +11197,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -11962,11 +11222,10 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
-      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.8",
@@ -11976,7 +11235,7 @@
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.9.0",
+        "eslint-module-utils": "^2.12.0",
         "hasown": "^2.0.2",
         "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
@@ -11985,13 +11244,14 @@
         "object.groupby": "^1.0.3",
         "object.values": "^1.2.0",
         "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
@@ -11999,7 +11259,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -12010,30 +11269,15 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/eslint-plugin-import/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,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12046,19 +11290,17 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "50.2.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.2.4.tgz",
-      "integrity": "sha512-020jA+dXaXdb+TML3ZJBvpPmzwbNROjnYuTYi/g6A5QEmEjhptz4oPJDKkOGMIByNxsPpdTLzSU1HYVqebOX1w==",
+      "version": "50.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.1.tgz",
+      "integrity": "sha512-UWyaYi6iURdSfdVVqvfOs2vdCVz0J40O/z/HTsv2sFjdjmdlUI/qlKLOTmwbPQ2tAfQnE5F9vqx+B+poF71DBQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "@es-joy/jsdoccomment": "~0.48.0",
+        "@es-joy/jsdoccomment": "~0.49.0",
         "are-docs-informative": "^0.0.2",
         "comment-parser": "1.4.1",
         "debug": "^4.3.6",
@@ -12077,25 +11319,11 @@
         "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint-plugin-prefer-arrow": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
       "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "eslint": ">=2.0.0"
       }
@@ -12109,235 +11337,77 @@
         "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
         "eslint": "^9.0.0 || ^8.0.0"
       },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
-      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/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,
-      "license": "MIT",
-      "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/eslint/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/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,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/eslint/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,
-      "license": "MIT",
-      "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/eslint/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/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,
-      "license": "MIT"
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint/node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+    "node_modules/eslint-scope": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+    "node_modules/eslint/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,
-      "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
+        "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": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint/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==",
+    "node_modules/eslint/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "node_modules/eslint/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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/eslint/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,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12345,32 +11415,6 @@
         "node": "*"
       }
     },
-    "node_modules/eslint/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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/espree": {
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
@@ -12393,7 +11437,6 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -12407,7 +11450,6 @@
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
       "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -12420,7 +11462,6 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -12433,7 +11474,6 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -12443,7 +11483,6 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12453,7 +11492,6 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -12462,15 +11500,13 @@
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
@@ -12480,7 +11516,6 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
       "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -12503,24 +11538,13 @@
       "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,
-      "license": "ISC"
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
+      "dev": true
     },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
       "dev": true,
-      "license": "(MIT OR WTFPL)",
       "engines": {
         "node": ">=6"
       }
@@ -12529,15 +11553,13 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
       "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "dev": true,
-      "license": "Apache-2.0"
+      "dev": true
     },
     "node_modules/express": {
       "version": "4.21.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
       "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -12584,7 +11606,6 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
       "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -12594,7 +11615,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -12604,7 +11624,6 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -12614,7 +11633,6 @@
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
       "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~2.0.0",
@@ -12632,15 +11650,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/express/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,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -12649,15 +11665,13 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/external-editor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
       "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
@@ -12672,7 +11686,6 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -12685,7 +11698,6 @@
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "os-tmpdir": "~1.0.2"
       },
@@ -12693,35 +11705,22 @@
         "node": ">=0.6.0"
       }
     },
-    "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"
-      ],
-      "license": "MIT"
-    },
     "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==",
-      "license": "MIT"
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-fifo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
       "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
       "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -12733,30 +11732,39 @@
         "node": ">=8.6.0"
       }
     },
+    "node_modules/fast-glob/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==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "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==",
-      "license": "MIT"
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fast-uri": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
-      "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+      "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
       "dev": true
     },
     "node_modules/fastq": {
@@ -12764,7 +11772,6 @@
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
       "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -12774,7 +11781,6 @@
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
@@ -12787,7 +11793,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pend": "~1.2.0"
       }
@@ -12797,7 +11802,6 @@
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -12808,31 +11812,37 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/figures/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/file-saver-es": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/file-saver-es/-/file-saver-es-2.0.5.tgz",
-      "integrity": "sha512-Kg0lt+is9nOyi/VDms9miScNGot25jVFbjFccXuCL/shd2Q+rt70MALxHVkXllsX83JEBLiHQNjDPGd/6FIOoQ==",
-      "license": "MIT"
+      "integrity": "sha512-Kg0lt+is9nOyi/VDms9miScNGot25jVFbjFccXuCL/shd2Q+rt70MALxHVkXllsX83JEBLiHQNjDPGd/6FIOoQ=="
     },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -12845,7 +11855,6 @@
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -12864,7 +11873,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -12873,15 +11881,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/finalhandler/node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -12894,7 +11900,6 @@
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
       "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "common-path-prefix": "^3.0.0",
         "pkg-dir": "^7.0.0"
@@ -12911,7 +11916,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -12928,54 +11932,33 @@
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "bin": {
         "flat": "cli.js"
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true,
-      "license": "ISC"
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
+      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "dev": true
     },
     "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==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -12983,7 +11966,6 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -12998,7 +11980,6 @@
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
       "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.3"
       }
@@ -13008,7 +11989,6 @@
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
       "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
@@ -13020,22 +12000,11 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -13046,14 +12015,13 @@
       }
     },
     "node_modules/formidable": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz",
-      "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz",
+      "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dezalgo": "^1.0.4",
-        "hexoid": "^1.0.0",
+        "hexoid": "^2.0.0",
         "once": "^1.4.0"
       },
       "funding": {
@@ -13065,7 +12033,6 @@
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13075,7 +12042,6 @@
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
       "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       },
@@ -13089,7 +12055,6 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13098,15 +12063,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fs-extra": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
       "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -13121,7 +12084,6 @@
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
       "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
@@ -13133,16 +12095,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "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,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -13156,22 +12115,21 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
-      "license": "MIT",
       "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==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.7.tgz",
+      "integrity": "sha512-2g4x+HqTJKM9zcJqBSpjoRmdcPFtJM60J3xJisTQSXBWka5XqyBN/2tNUgma1mztTXyDuUsEtYe5qcs7xYzYQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13185,7 +12143,6 @@
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -13195,7 +12152,6 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -13205,17 +12161,15 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
-      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -13224,17 +12178,21 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
+      "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "dunder-proto": "^1.0.0",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13248,7 +12206,6 @@
       "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
       "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@hutson/parse-repository-url": "^3.0.0",
         "hosted-git-info": "^4.0.0",
@@ -13262,67 +12219,28 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/get-pkg-repo/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/get-pkg-repo/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/get-pkg-repo/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/get-pkg-repo/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,
-      "license": "MIT"
-    },
     "node_modules/get-pkg-repo/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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/get-pkg-repo/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,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -13337,15 +12255,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/get-pkg-repo/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,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -13355,7 +12271,6 @@
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -13366,7 +12281,6 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -13384,7 +12298,6 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -13403,7 +12316,6 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -13419,7 +12331,6 @@
       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
       "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.5",
         "es-errors": "^1.3.0",
@@ -13437,7 +12348,6 @@
       "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.1.tgz",
       "integrity": "sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
       },
@@ -13446,52 +12356,24 @@
       }
     },
     "node_modules/get-uri": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
-      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
+      "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "basic-ftp": "^5.0.2",
         "data-uri-to-buffer": "^6.0.2",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.2.0"
+        "debug": "^4.3.4"
       },
       "engines": {
         "node": ">= 14"
       }
     },
-    "node_modules/get-uri/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/git-raw-commits": {
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz",
       "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dargs": "^7.0.0",
         "lodash": "^4.17.15",
@@ -13511,7 +12393,6 @@
       "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
       "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "gitconfiglocal": "^1.0.0",
         "pify": "^2.3.0"
@@ -13525,7 +12406,6 @@
       "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz",
       "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "meow": "^8.0.0",
         "semver": "^6.0.0"
@@ -13542,7 +12422,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -13552,7 +12431,6 @@
       "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
       "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==",
       "dev": true,
-      "license": "BSD",
       "dependencies": {
         "ini": "^1.3.2"
       }
@@ -13561,15 +12439,13 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/glob": {
       "version": "7.2.3",
@@ -13577,7 +12453,6 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -13594,31 +12469,28 @@
       }
     },
     "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==",
-      "devOptional": true,
-      "license": "ISC",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
     "node_modules/glob/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,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -13629,7 +12501,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13642,7 +12513,6 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -13652,7 +12522,6 @@
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
       "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.2.1",
         "gopd": "^1.0.1"
@@ -13665,34 +12534,32 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13702,15 +12569,13 @@
       "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/gradle-to-js": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/gradle-to-js/-/gradle-to-js-2.0.1.tgz",
       "integrity": "sha512-is3hDn9zb8XXnjbEeAEIqxTpLHUiGBqjegLmXPuyMBfKAggpadWFku4/AP8iYAGBX6qR9/5UIUIp47V0XI3aMw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "lodash.merge": "^4.6.2"
       },
@@ -13722,14 +12587,12 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/hammerjs": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
       "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -13738,15 +12601,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/handlebars": {
       "version": "4.7.8",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
       "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.2",
@@ -13768,111 +12629,34 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "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,
-      "license": "ISC",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/har-validator/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,
-      "license": "MIT",
-      "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/har-validator/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,
-      "license": "MIT"
-    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.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,
-      "license": "MIT",
       "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==",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
@@ -13880,7 +12664,6 @@
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -13889,11 +12672,13 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -13902,11 +12687,10 @@
       }
     },
     "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==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -13919,7 +12703,6 @@
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -13935,7 +12718,6 @@
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -13948,17 +12730,15 @@
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
     },
     "node_modules/hexoid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
-      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz",
+      "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13968,7 +12748,6 @@
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
       "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -13981,7 +12760,6 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -13993,15 +12771,13 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "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,
-      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -14013,15 +12789,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/hpack.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,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -14036,15 +12810,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/hpack.js/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,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -14063,20 +12835,18 @@
           "type": "patreon",
           "url": "https://patreon.com/mdevils"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/htmlparser2": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
       "dev": true,
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
@@ -14085,34 +12855,85 @@
           "url": "https://github.com/sponsors/fb55"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "entities": "^4.4.0"
+        "domutils": "^3.1.0",
+        "entities": "^4.5.0"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "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,
-      "license": "BSD-2-Clause"
+      "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,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -14129,7 +12950,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -14138,15 +12958,13 @@
       "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,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
@@ -14161,7 +12979,6 @@
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
       "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "^7.1.0",
         "debug": "^4.3.4"
@@ -14175,7 +12992,6 @@
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
       "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.15",
         "debug": "^4.3.6",
@@ -14188,40 +13004,13 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.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,
-      "license": "MIT",
-      "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-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
@@ -14233,7 +13022,6 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=8.12.0"
       }
@@ -14243,7 +13031,6 @@
       "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
       "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.18"
       }
@@ -14252,7 +13039,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14265,7 +13051,6 @@
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -14290,37 +13075,27 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "BSD-3-Clause"
+      ]
     },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
-    "node_modules/ignore-by-default": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
-      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/ignore-walk": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
-      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz",
+      "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minimatch": "^9.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/image-size": {
@@ -14328,7 +13103,6 @@
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "bin": {
         "image-size": "bin/image-size.js"
@@ -14337,26 +13111,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -14373,7 +13138,6 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -14383,7 +13147,6 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14394,7 +13157,6 @@
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -14403,17 +13165,15 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "license": "ISC"
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
-      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz",
+      "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/inquirer": {
@@ -14421,7 +13181,6 @@
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
       "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.0",
@@ -14440,110 +13199,49 @@
       "engines": {
         "node": ">=8.0.0"
       }
-    },
-    "node_modules/inquirer/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/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,
-      "license": "MIT",
-      "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/inquirer/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/inquirer/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/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,
-      "license": "MIT"
-    },
-    "node_modules/inquirer/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==",
+    },
+    "node_modules/inquirer/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 10"
       }
     },
     "node_modules/inquirer/node_modules/mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
-    "node_modules/inquirer/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/inquirer/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "tslib": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
+        "npm": ">=2.0.0"
       }
     },
+    "node_modules/inquirer/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14553,18 +13251,16 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/ionicons": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
-      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
-      "license": "MIT",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.4.0.tgz",
+      "integrity": "sha512-ZK94MMqgzMCPPMhmk8Ouu6goyVHFIlw/ACP6oe3FrikcI0N7CX0xcwVaEbUc0G/v3W0shI93vo+9ve/KpvcNhQ==",
       "dependencies": {
-        "@stencil/core": "^2.18.0"
+        "@stencil/core": "^4.0.3"
       }
     },
     "node_modules/ip-address": {
@@ -14572,7 +13268,6 @@
       "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
       "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "jsbn": "1.1.0",
         "sprintf-js": "^1.1.3"
@@ -14586,20 +13281,19 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
       "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14612,17 +13306,33 @@
       "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-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -14633,7 +13343,6 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -14642,14 +13351,13 @@
       }
     },
     "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==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz",
+      "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14659,11 +13367,10 @@
       }
     },
     "node_modules/is-bun-module": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.2.1.tgz",
-      "integrity": "sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
+      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^7.6.3"
       }
@@ -14673,7 +13380,6 @@
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -14682,11 +13388,10 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
+      "integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -14698,12 +13403,13 @@
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -14714,13 +13420,13 @@
       }
     },
     "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==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14730,16 +13436,15 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -14750,27 +13455,54 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "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==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -14783,7 +13515,6 @@
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
       "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-docker": "^3.0.0"
       },
@@ -14797,44 +13528,31 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
       "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -14847,7 +13565,6 @@
       "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
       "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=16"
       },
@@ -14860,19 +13577,18 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.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==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14886,7 +13602,6 @@
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
       "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14896,43 +13611,15 @@
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
       "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-path-inside": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-is-inside": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14942,33 +13629,29 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
       "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "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==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
       "dev": true,
-      "license": "MIT",
-      "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==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14977,12 +13660,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-shared-array-buffer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
       "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7"
       },
@@ -14998,7 +13692,6 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -15007,13 +13700,13 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15023,13 +13716,14 @@
       }
     },
     "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==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15043,7 +13737,6 @@
       "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
       "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "text-extensions": "^1.0.0"
       },
@@ -15056,7 +13749,6 @@
       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
       "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.14"
       },
@@ -15071,14 +13763,12 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -15086,14 +13776,44 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "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==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz",
+      "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -15103,35 +13823,34 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
       "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/isbinaryfile": {
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
       "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8.0.0"
       },
@@ -15143,32 +13862,22 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true,
-      "license": "ISC"
+      "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,
-      "license": "MIT",
       "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,
-      "license": "MIT"
-    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -15178,7 +13887,6 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -15195,7 +13903,6 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -15205,35 +13912,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -15248,7 +13931,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15258,7 +13940,6 @@
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -15272,7 +13953,6 @@
       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
       "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
-      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
@@ -15283,78 +13963,33 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/jasmine": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
-      "integrity": "sha512-KbdGQTf5jbZgltoHs31XGiChAPumMSY64OZMWLNYnEnMfG5uwGBhffePwuskexjT+/Jea/gU3qAU8344hNohSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "exit": "^0.1.2",
-        "glob": "^7.0.6",
-        "jasmine-core": "~2.8.0"
-      },
-      "bin": {
-        "jasmine": "bin/jasmine.js"
-      }
-    },
     "node_modules/jasmine-core": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.3.0.tgz",
-      "integrity": "sha512-zsOmeBKESky4toybvWEikRiZ0jHoBEu79wNArLfMdSnlLMZx3Xcp6CSm2sUcYyoJC+Uyj8LBJap/MUbVSfJ27g==",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.5.0.tgz",
+      "integrity": "sha512-NHOvoPO6o9gVR6pwqEACTEpbgcH+JJ6QDypyymGbSUIFIFsMMbBJ/xsFNud8MSClfnWclXd7RQlAZBz7yVo5TQ==",
+      "dev": true
     },
     "node_modules/jasmine-spec-reporter": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-7.0.0.tgz",
       "integrity": "sha512-OtC7JRasiTcjsaCBPtMO0Tl8glCejM4J4/dNuOJdA8lBjz4PmWjYQ6pzb0uzpBNAWJMDudYuj9OdXJWqM2QTJg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "colors": "1.4.0"
       }
     },
-    "node_modules/jasmine/node_modules/jasmine-core": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
-      "integrity": "sha512-SNkOkS+/jMZvLhuSx1fjhcNWUC/KG6oVyFUGkSBEr9n1axSNduWU8GlI7suaHXr4yxjet6KjrUZxUTE5WzzWwQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jasminewd2": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-      "integrity": "sha512-Rn0nZe4rfDhzA63Al3ZGh0E+JTmM6ESZYXJGKuqKGZObsAB9fwXPD03GjtIEvJBDOhN94T5MzbwZSqzFHSQPzg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6.9.x"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/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,
-      "license": "MIT",
+        "supports-color": "^8.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
@@ -15362,7 +13997,6 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -15378,7 +14012,6 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
       "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -15387,15 +14020,13 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -15407,25 +14038,22 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
       "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/jsdoc-type-pratt-parser": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
       "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
       }
     },
     "node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -15437,59 +14065,45 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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,
-      "license": "(AFL-2.1 OR BSD-3-Clause)"
-    },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT"
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "ISC"
+      "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,
-      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -15500,15 +14114,13 @@
     "node_modules/jsonc-parser": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "license": "MIT"
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -15523,15 +14135,13 @@
       "dev": true,
       "engines": [
         "node >= 0.2.0"
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/JSONStream": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
       "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
-      "license": "(MIT OR Apache-2.0)",
       "dependencies": {
         "jsonparse": "^1.2.0",
         "through": ">=2.2.7 <3"
@@ -15543,81 +14153,11 @@
         "node": "*"
       }
     },
-    "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,
-      "license": "MIT",
-      "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/jszip": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
-      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
-      "dev": true,
-      "license": "(MIT OR GPL-3.0-or-later)",
-      "dependencies": {
-        "lie": "~3.3.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.3.6",
-        "setimmediate": "^1.0.5"
-      }
-    },
-    "node_modules/jszip/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,
-      "license": "MIT"
-    },
-    "node_modules/jszip/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,
-      "license": "MIT",
-      "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/jszip/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,
-      "license": "MIT"
-    },
-    "node_modules/jszip/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,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/karma": {
       "version": "6.4.4",
       "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.4.tgz",
       "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@colors/colors": "1.5.0",
         "body-parser": "^1.19.0",
@@ -15656,7 +14196,6 @@
       "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
       "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "which": "^1.2.1"
       }
@@ -15666,7 +14205,6 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -15679,7 +14217,6 @@
       "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
       "integrity": "sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "istanbul-lib-coverage": "^3.2.0",
         "istanbul-lib-instrument": "^5.1.0",
@@ -15697,7 +14234,6 @@
       "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz",
       "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-report": "^3.0.0",
@@ -15714,7 +14250,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -15725,7 +14260,6 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
       "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^2.0.5",
@@ -15742,7 +14276,6 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
       "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=6"
       }
@@ -15752,7 +14285,6 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
@@ -15766,7 +14298,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -15779,7 +14310,6 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -15790,7 +14320,6 @@
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -15803,7 +14332,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -15813,7 +14341,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15823,7 +14350,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -15834,7 +14360,6 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -15851,7 +14376,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -15864,7 +14388,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -15874,7 +14397,6 @@
       "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz",
       "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "jasmine-core": "^4.1.0"
       },
@@ -15890,7 +14412,6 @@
       "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.1.0.tgz",
       "integrity": "sha512-sPQE1+nlsn6Hwb5t+HHwyy0A1FNCVKuL1192b+XNauMYWThz2kweiBVW1DqloRpVvZIJkIoHVB7XRpK78n1xbQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "jasmine-core": "^4.0.0 || ^5.0.0",
         "karma": "^6.0.0",
@@ -15901,84 +14422,79 @@
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.1.tgz",
       "integrity": "sha512-VYz/BjjmC3klLJlLwA4Kw8ytk0zDSmbbDLNs794VnWmkcCB7I9aAL/D48VNQtmITyPvea2C3jdUMfc3kAoy0PQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/karma-source-map-support": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
       "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "source-map-support": "^0.5.5"
       }
     },
-    "node_modules/karma/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/karma/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,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/karma/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": 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"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
     "node_modules/karma/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/karma/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==",
+    "node_modules/karma/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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/karma/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,
-      "license": "MIT"
-    },
     "node_modules/karma/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,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -15986,13 +14502,36 @@
         "node": "*"
       }
     },
+    "node_modules/karma/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/karma/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/karma/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -16008,7 +14547,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16018,7 +14556,6 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -16036,7 +14573,6 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -16055,7 +14591,6 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -16065,7 +14600,6 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16075,7 +14609,6 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
       "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -16085,7 +14618,6 @@
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
       "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "picocolors": "^1.0.0",
         "shell-quote": "^1.8.1"
@@ -16096,7 +14628,6 @@
       "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
       "integrity": "sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^2.1.0",
         "lodash.assign": "^3.2.0",
@@ -16108,7 +14639,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -16117,15 +14647,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/less": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
       "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "copy-anything": "^2.0.1",
         "parse-node-version": "^1.0.1",
@@ -16152,7 +14680,6 @@
       "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.2.0.tgz",
       "integrity": "sha512-MYUxjSQSBUQmowc0l5nPieOYwMzGPUaTzB6inNW/bdPEG9zOL3eAAD1Qw5ZxSPk7we5dMojHwNODYMV1hq4EVg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 18.12.0"
       },
@@ -16179,7 +14706,6 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "pify": "^4.0.1",
@@ -16194,7 +14720,6 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "bin": {
         "mime": "cli.js"
@@ -16208,7 +14733,6 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=6"
@@ -16219,7 +14743,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "optional": true,
       "bin": {
         "semver": "bin/semver"
@@ -16230,7 +14753,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16241,7 +14763,6 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -16255,7 +14776,6 @@
       "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
       "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "webpack-sources": "^3.0.0"
       },
@@ -16268,29 +14788,17 @@
         }
       }
     },
-    "node_modules/lie": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
-      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "immediate": "~3.0.5"
-      }
-    },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/listr2": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
-      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz",
+      "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^4.0.0",
         "colorette": "^2.0.20",
@@ -16308,7 +14816,6 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
       "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -16321,7 +14828,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -16333,22 +14839,19 @@
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
       "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/listr2/node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/listr2/node_modules/string-width": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
       "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^10.3.0",
         "get-east-asian-width": "^1.0.0",
@@ -16366,7 +14869,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -16382,7 +14884,6 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
       "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "string-width": "^7.0.0",
@@ -16396,37 +14897,43 @@
       }
     },
     "node_modules/lmdb": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz",
-      "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.1.5.tgz",
+      "integrity": "sha512-46Mch5Drq+A93Ss3gtbg+Xuvf5BOgIuvhKDWoGa3HcPHI6BL2NCOkRdSx1D4VfzwrxhnsjbyIVsLRlQHu6URvw==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "msgpackr": "^1.10.2",
+        "msgpackr": "^1.11.2",
         "node-addon-api": "^6.1.0",
         "node-gyp-build-optional-packages": "5.2.2",
-        "ordered-binary": "^1.4.1",
+        "ordered-binary": "^1.5.3",
         "weak-lru-cache": "^1.2.2"
       },
       "bin": {
         "download-lmdb-prebuilds": "bin/download-prebuilds.js"
       },
       "optionalDependencies": {
-        "@lmdb/lmdb-darwin-arm64": "3.0.13",
-        "@lmdb/lmdb-darwin-x64": "3.0.13",
-        "@lmdb/lmdb-linux-arm": "3.0.13",
-        "@lmdb/lmdb-linux-arm64": "3.0.13",
-        "@lmdb/lmdb-linux-x64": "3.0.13",
-        "@lmdb/lmdb-win32-x64": "3.0.13"
+        "@lmdb/lmdb-darwin-arm64": "3.1.5",
+        "@lmdb/lmdb-darwin-x64": "3.1.5",
+        "@lmdb/lmdb-linux-arm": "3.1.5",
+        "@lmdb/lmdb-linux-arm64": "3.1.5",
+        "@lmdb/lmdb-linux-x64": "3.1.5",
+        "@lmdb/lmdb-win32-x64": "3.1.5"
       }
     },
+    "node_modules/lmdb/node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
       "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^4.0.0",
@@ -16442,7 +14949,6 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "error-ex": "^1.3.1",
         "json-parse-better-errors": "^1.0.1"
@@ -16456,7 +14962,6 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -16466,7 +14971,6 @@
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
@@ -16476,7 +14980,6 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
       "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       }
@@ -16486,7 +14989,6 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -16501,21 +15003,18 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT"
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
     "node_modules/lodash._baseassign": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
       "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._basecopy": "^3.0.0",
         "lodash.keys": "^3.0.0"
@@ -16525,22 +15024,19 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash._bindcallback": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
       "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash._createassigner": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
       "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._bindcallback": "^3.0.0",
         "lodash._isiterateecall": "^3.0.0",
@@ -16551,22 +15047,19 @@
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash.assign": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
       "integrity": "sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._baseassign": "^3.0.0",
         "lodash._createassigner": "^3.0.0",
@@ -16577,36 +15070,31 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
       "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
       "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash.ismatch": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
       "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lodash.keys": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
       "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._getnative": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
@@ -16617,100 +15105,27 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-symbols/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==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "license": "MIT",
-      "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/log-symbols/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==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-symbols/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==",
-      "license": "MIT"
-    },
-    "node_modules/log-symbols/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==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+      "dev": true
     },
-    "node_modules/log-symbols/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==",
-      "license": "MIT",
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-update": {
@@ -16718,7 +15133,6 @@
       "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
       "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^7.0.0",
         "cli-cursor": "^5.0.0",
@@ -16738,7 +15152,6 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
       "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "environment": "^1.0.0"
       },
@@ -16754,7 +15167,6 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
       "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -16767,7 +15179,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -16780,7 +15191,6 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
       "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^5.0.0"
       },
@@ -16795,15 +15205,13 @@
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
       "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/log-update/node_modules/is-fullwidth-code-point": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
       "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-east-asian-width": "^1.0.0"
       },
@@ -16819,7 +15227,6 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
       "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-function": "^5.0.0"
       },
@@ -16835,7 +15242,6 @@
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
       "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "onetime": "^7.0.0",
         "signal-exit": "^4.1.0"
@@ -16852,7 +15258,6 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
       "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "is-fullwidth-code-point": "^5.0.0"
@@ -16869,7 +15274,6 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
       "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^10.3.0",
         "get-east-asian-width": "^1.0.0",
@@ -16887,7 +15291,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -16903,7 +15306,6 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
       "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "string-width": "^7.0.0",
@@ -16921,7 +15323,6 @@
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
       "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "date-format": "^4.0.14",
         "debug": "^4.3.4",
@@ -16938,7 +15339,6 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -16948,7 +15348,6 @@
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz",
       "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -16957,9 +15356,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
@@ -16970,7 +15369,6 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -16985,31 +15383,28 @@
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
+      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^4.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/map-obj": {
@@ -17017,7 +15412,6 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
       "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -17025,22 +15419,29 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.0.0.tgz",
+      "integrity": "sha512-4MqMiKP90ybymYvsut0CH2g4XWbfLtmlCkXmtmdcDCxNB+mQcu1w/1+L/VD7vi/PSv7X2JYV7SCcR+jiPXnQtA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/memfs": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz",
-      "integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.15.0.tgz",
+      "integrity": "sha512-q9MmZXd2rRWHS6GU3WEm3HyiXZyyoA1DqdOhEq0lxPBmKb5S7IAOwX0RgUCwJfqjelDCySa5h8ujOy24LqsWcw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@jsonjoy.com/json-pack": "^1.0.3",
         "@jsonjoy.com/util": "^1.3.0",
@@ -17060,7 +15461,6 @@
       "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
       "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/minimist": "^1.2.0",
         "camelcase-keys": "^6.2.2",
@@ -17086,7 +15486,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -17099,15 +15498,13 @@
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/meow/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,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -17120,7 +15517,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -17136,7 +15532,6 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -17149,7 +15544,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/normalize-package-data": "^2.4.0",
         "normalize-package-data": "^2.5.0",
@@ -17165,7 +15559,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-up": "^4.1.0",
         "read-pkg": "^5.2.0",
@@ -17183,7 +15576,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
@@ -17193,7 +15585,6 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -17206,7 +15597,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
       "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
@@ -17216,7 +15606,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -17226,7 +15615,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
       "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -17239,7 +15627,6 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
       "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -17248,15 +15635,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -17266,7 +15651,6 @@
       "resolved": "https://registry.npmjs.org/mergexml/-/mergexml-1.2.4.tgz",
       "integrity": "sha512-yiOlDqcVCz7AG1eSboonc18FTlfqDEKYfGoAV3Lul98u6YRV/s0kjtf4bjk47t0hLTFJR0BSYMd6BpmX3xDjNQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@xmldom/xmldom": "^0.7.0",
         "formidable": "^3.5.1",
@@ -17278,7 +15662,6 @@
       "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz",
       "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6.0"
       }
@@ -17288,7 +15671,6 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -17298,7 +15680,6 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -17312,7 +15693,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -17325,7 +15705,6 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
       "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -17338,7 +15717,6 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -17348,7 +15726,6 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -17360,7 +15737,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -17370,7 +15746,6 @@
       "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
       "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -17383,7 +15758,6 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -17396,17 +15770,15 @@
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
-      "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0",
         "tapable": "^2.2.1"
@@ -17426,15 +15798,13 @@
       "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -17450,7 +15820,6 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -17460,7 +15829,6 @@
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
       "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0",
@@ -17475,7 +15843,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
       "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -17485,7 +15852,6 @@
       "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
       "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
@@ -17494,18 +15860,17 @@
       }
     },
     "node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.0.tgz",
+      "integrity": "sha512-2v6aXUXwLP1Epd/gc32HAMIWoczx+fZwEPRHm/VwtrJzRGwR1qGZXEYV3Zp8ZjjbwaZhMrM6uHV4KVkk+XCc2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
@@ -17516,7 +15881,6 @@
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
       "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -17529,7 +15893,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -17541,15 +15904,13 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -17562,7 +15923,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -17574,15 +15934,13 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/minipass-sized": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
       "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -17595,7 +15953,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -17607,49 +15964,61 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 18"
       }
     },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/minizlib/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+    "node_modules/minizlib/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
       "dev": true,
-      "license": "ISC"
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "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,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -17661,15 +16030,13 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/modify-values": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
       "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17679,24 +16046,22 @@
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
       "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "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,
-      "license": "MIT"
+      "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/msgpackr": {
       "version": "1.11.2",
       "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz",
       "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
       "optionalDependencies": {
         "msgpackr-extract": "^3.0.2"
       }
@@ -17707,7 +16072,6 @@
       "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "node-gyp-build-optional-packages": "5.2.2"
@@ -17729,7 +16093,6 @@
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
@@ -17739,13 +16102,12 @@
       }
     },
     "node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/nanoid": {
@@ -17759,7 +16121,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -17771,15 +16132,13 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/native-run": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/native-run/-/native-run-2.0.1.tgz",
       "integrity": "sha512-XfG1FBZLM50J10xH9361whJRC9SHZ0Bub4iNRhhI61C8Jv0e1ud19muex6sNKB51ibQNUJNuYn25MuYET/rE6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-fs": "^3.1.7",
         "@ionic/utils-terminal": "^2.3.4",
@@ -17800,12 +16159,20 @@
         "node": ">=16.0.0"
       }
     },
+    "node_modules/native-run/node_modules/ini": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/native-run/node_modules/split2": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
       "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 10.x"
       }
@@ -17814,15 +16181,13 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/needle": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
       "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.3",
@@ -17840,15 +16205,13 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
       "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true,
-      "license": "ISC",
       "optional": true
     },
     "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==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -17857,67 +16220,62 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
       "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/ng2-charts": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-4.1.1.tgz",
-      "integrity": "sha512-iHwXDbmX86lfeH8VRcsaW2tJATsuAZo4kvvC/Yk2l35zOHjevja1qBvO6BAibiDazi9r9aS6ZRJOqWPsz1pP2w==",
-      "license": "ISC",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-7.0.0.tgz",
+      "integrity": "sha512-HofyPPkz7yOX6Dr9JfV/SDddzmmqCFYCKbn71jeDiyWPRjrj99yTBCyqYtjzzNrnlTfWwbdvynYZ4GAhu/lbgQ==",
       "dependencies": {
         "lodash-es": "^4.17.15",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/cdk": ">=14.0.0",
-        "@angular/common": ">=14.0.0",
-        "@angular/core": ">=14.0.0",
+        "@angular/cdk": ">=18.0.0",
+        "@angular/common": ">=18.0.0",
+        "@angular/core": ">=18.0.0",
+        "@angular/platform-browser": ">=18.0.0",
         "chart.js": "^3.4.0 || ^4.0.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/ngx-cookie-service": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-18.0.0.tgz",
-      "integrity": "sha512-hkkUckzZTXXWtFgvVkT2hg6mwYMLXioXDZWBsVCOy9gYkADjsj0N5VViO7eo2izQ0VcMPd/Etog1trf/T4oZMQ==",
-      "license": "MIT",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-19.0.0.tgz",
+      "integrity": "sha512-itxGY1BlIRoEjEtDsSsRKnJuiQteTMLKPNHrykiH06tjUQ1bi3orE7YKU1D210VBqVy1jNrB7hKuGOOIQtQJDA==",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "tslib": "^2.8.0"
       },
       "peerDependencies": {
-        "@angular/common": "^18.0.0-rc.0",
-        "@angular/core": "^18.0.0-rc.0"
+        "@angular/common": "^19.0.0",
+        "@angular/core": "^19.0.0"
       }
     },
     "node_modules/ngx-device-detector": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-8.0.0.tgz",
-      "integrity": "sha512-ik6EwUKnlN+xwoWHzyJp5+V+QRWYrmpTqAvRwa16xBnAVd7/i3jElN7MZjs/InwcYz7AW3XcSNeu+XRvtHgb9w==",
-      "license": "MIT",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-9.0.0.tgz",
+      "integrity": "sha512-zpio/wqH1GnxIpWCdA7cp5fmWf7YLycgzfXzQHmB9vaS7eAcqpBF5mxDS65IhE7TzNTJziDrYJCT+9tVqBcsDg==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "^18.0.0",
-        "@angular/core": "^18.0.0"
+        "@angular/common": "^19.0.0",
+        "@angular/core": "^19.0.0"
       }
     },
     "node_modules/ngx-spinner": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/ngx-spinner/-/ngx-spinner-16.0.2.tgz",
-      "integrity": "sha512-MZpOHb3dvSqD6xiEdR+EtOfPY2r1kfA7t5Hv5IVwi7gkbTwVgnqxDWdOYJ/HW1pSZ5iEGhqlJqWg6CysLmNfHQ==",
-      "license": "MIT",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-spinner/-/ngx-spinner-17.0.0.tgz",
+      "integrity": "sha512-VWDSvLlCnaWqu0W1L+ybQIRHTbd+GffkX1sWs++iMPXMGVJ2ZCuzW32FHnu+p0regMUHU8r1/rvUcFD0YooJxQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -17927,36 +16285,11 @@
         "@angular/core": ">=15.0.0"
       }
     },
-    "node_modules/nice-napi": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
-      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "!win32"
-      ],
-      "dependencies": {
-        "node-addon-api": "^3.0.0",
-        "node-gyp-build": "^4.2.2"
-      }
-    },
-    "node_modules/nice-napi/node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/node-abi": {
-      "version": "3.67.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.67.0.tgz",
-      "integrity": "sha512-bLn/fU/ALVBE9wj+p4Y21ZJWYFjUXLXPi/IewyLZkx3ApxKDNBWCKdReeKOtD8dWpOdDCeMyLh6ZewzcLsG2Nw==",
+      "version": "3.71.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz",
+      "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -17965,18 +16298,17 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
       "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -17997,47 +16329,32 @@
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true,
-      "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz",
-      "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.0.0.tgz",
+      "integrity": "sha512-zQS+9MTTeCMgY0F3cWPyJyRFAkVltQ1uXm+xXu/ES6KFgC6Czo1Seb9vQW2wNxSX2OrDTiqL0ojtkFxBQ0ypIw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
         "glob": "^10.3.10",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^13.0.0",
-        "nopt": "^7.0.0",
-        "proc-log": "^4.1.0",
+        "make-fetch-happen": "^14.0.3",
+        "nopt": "^8.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.3.5",
-        "tar": "^6.2.1",
-        "which": "^4.0.0"
+        "tar": "^7.4.3",
+        "which": "^5.0.0"
       },
       "bin": {
         "node-gyp": "bin/node-gyp.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.3.tgz",
-      "integrity": "sha512-EMS95CMJzdoSKoIiXo8pxKoL8DYxwIZXYlLmgPb8KUv794abpnLK6ynsCAWNliOjREKruYKdzbh76HHYUHX7nw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp-build-optional-packages": {
@@ -18045,7 +16362,7 @@
       "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
       "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.1"
       },
@@ -18055,223 +16372,131 @@
         "node-gyp-build-optional-packages-test": "build-test.js"
       }
     },
-    "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/node-gyp/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/node-gyp/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+    "node_modules/node-gyp-build-optional-packages/node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
+      "optional": true,
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/node-html-parser": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
-      "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "css-select": "^4.2.1",
-        "he": "1.2.0"
-      }
-    },
-    "node_modules/node-html-parser/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,
-      "license": "BSD-2-Clause",
-      "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/node-html-parser/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,
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "node": ">=8"
       }
     },
-    "node_modules/node-html-parser/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+    "node_modules/node-gyp/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
       "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/node-html-parser/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+    "node_modules/node-gyp/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/node-html-parser/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+    "node_modules/node-gyp/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/nodemon": {
-      "version": "2.0.22",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
-      "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
+    "node_modules/node-gyp/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chokidar": "^3.5.2",
-        "debug": "^3.2.7",
-        "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.1.2",
-        "pstree.remy": "^1.1.8",
-        "semver": "^5.7.1",
-        "simple-update-notifier": "^1.0.7",
-        "supports-color": "^5.5.0",
-        "touch": "^3.1.0",
-        "undefsafe": "^2.0.5"
-      },
       "bin": {
-        "nodemon": "bin/nodemon.js"
+        "mkdirp": "dist/cjs/src/bin.js"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nodemon"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/nodemon/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==",
+    "node_modules/node-gyp/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/nodemon/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/node-gyp/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ms": "^2.1.1"
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/nodemon/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/node-gyp/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
+        "node": ">=18"
       }
     },
-    "node_modules/nodemon/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+    "node_modules/node-html-parser": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
+      "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+      "dependencies": {
+        "css-select": "^4.2.1",
+        "he": "1.2.0"
       }
     },
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true
+    },
     "node_modules/nopt": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.0.0.tgz",
+      "integrity": "sha512-1L/fTJ4UmV/lUxT2Uf006pfZKTvAgCF+chz+0OgBHO8u2Z67pE7AaAUUj7CJy0lXqHmymUvGFt6NE9R3HER0yw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "abbrev": "^2.0.0"
       },
@@ -18279,7 +16504,7 @@
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/normalize-package-data": {
@@ -18287,7 +16512,6 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
       "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^4.0.1",
         "is-core-module": "^2.5.0",
@@ -18303,7 +16527,6 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18313,130 +16536,120 @@
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/npm-bundled": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
-      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz",
+      "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "npm-normalize-package-bin": "^3.0.0"
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-install-checks": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
-      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz",
+      "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "semver": "^7.1.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-normalize-package-bin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
-      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.0.tgz",
+      "integrity": "sha512-ZTE0hbwSdTNL+Stx2zxSqdu2KZfNDcrtrLdIk7XGnQFYBWYDho/ORvXtn5XEePcL3tFpGjHCV3X3xrtDh7eZ+A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "proc-log": "^4.0.0",
+        "hosted-git-info": "^8.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.3.5",
-        "validate-npm-package-name": "^5.0.0"
+        "validate-npm-package-name": "^6.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg/node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.0.2.tgz",
+      "integrity": "sha512-sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg/node_modules/lru-cache": {
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/npm-packlist": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz",
-      "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz",
+      "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "ignore-walk": "^6.0.4"
+        "ignore-walk": "^7.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-pick-manifest": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
-      "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz",
+      "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "npm-install-checks": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0",
-        "npm-package-arg": "^11.0.0",
+        "npm-install-checks": "^7.1.0",
+        "npm-normalize-package-bin": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
-      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz",
+      "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "@npmcli/redact": "^2.0.0",
+        "@npmcli/redact": "^3.0.0",
         "jsonparse": "^1.3.1",
-        "make-fetch-happen": "^13.0.0",
+        "make-fetch-happen": "^14.0.0",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
-        "minizlib": "^2.1.2",
-        "npm-package-arg": "^11.0.0",
-        "proc-log": "^4.0.0"
+        "minipass-fetch": "^4.0.0",
+        "minizlib": "^3.0.1",
+        "npm-package-arg": "^12.0.0",
+        "proc-log": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-run-path": {
@@ -18444,7 +16657,6 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -18452,26 +16664,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/npm-watch": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.9.0.tgz",
-      "integrity": "sha512-C5Rgh5+jvY33K1EH8Qjr1hfpH9Nhasc90QJ0W+JyKg2ogE0LOCZI4xirC8QmywW7XinyBpynwxlrN6aPfjc3Hw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "nodemon": "^2.0.7",
-        "through2": "^4.0.2"
-      },
-      "bin": {
-        "npm-watch": "cli.js"
-      }
-    },
     "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,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -18479,32 +16676,20 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "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,
-      "license": "Apache-2.0",
-      "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,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -18517,7 +16702,6 @@
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -18527,7 +16711,6 @@
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
       "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.5",
         "define-properties": "^1.2.1",
@@ -18546,7 +16729,6 @@
       "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
       "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -18565,7 +16747,6 @@
       "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
       "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -18580,7 +16761,6 @@
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
       "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -18597,15 +16777,13 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -18618,7 +16796,6 @@
       "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -18628,7 +16805,6 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -18637,7 +16813,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -18653,7 +16828,6 @@
       "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
       "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "default-browser": "^5.2.1",
         "define-lazy-prop": "^3.0.0",
@@ -18667,28 +16841,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/open/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-inside-container": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -18705,7 +16862,6 @@
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
       "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "license": "MIT",
       "dependencies": {
         "bl": "^4.1.0",
         "chalk": "^4.1.0",
@@ -18724,89 +16880,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/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==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "license": "MIT",
-      "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/ora/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==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/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==",
-      "license": "MIT"
-    },
-    "node_modules/ora/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==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/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==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ordered-binary": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
       "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
     "node_modules/os-name": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
       "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "macos-release": "^2.5.0",
         "windows-release": "^4.0.0"
@@ -18823,7 +16908,6 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18833,7 +16917,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -18849,7 +16932,6 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -18861,16 +16943,12 @@
       }
     },
     "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -18881,7 +16959,6 @@
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
       "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.2",
         "is-network-error": "^1.0.0",
@@ -18899,7 +16976,6 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -18909,26 +16985,24 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/pac-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz",
+      "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/quickjs-emscripten": "^0.23.0",
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "get-uri": "^6.0.1",
         "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.5",
+        "https-proxy-agent": "^7.0.6",
         "pac-resolver": "^7.0.1",
-        "socks-proxy-agent": "^8.0.4"
+        "socks-proxy-agent": "^8.0.5"
       },
       "engines": {
         "node": ">= 14"
@@ -18939,7 +17013,6 @@
       "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
       "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "degenerator": "^5.0.0",
         "netmask": "^2.0.2"
@@ -18949,57 +17022,47 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
     },
     "node_modules/pacote": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
-      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/git": "^5.0.0",
-        "@npmcli/installed-package-contents": "^2.0.1",
-        "@npmcli/package-json": "^5.1.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "@npmcli/run-script": "^8.0.0",
-        "cacache": "^18.0.0",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz",
+      "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/git": "^6.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "@npmcli/run-script": "^9.0.0",
+        "cacache": "^19.0.0",
         "fs-minipass": "^3.0.0",
         "minipass": "^7.0.2",
-        "npm-package-arg": "^11.0.0",
-        "npm-packlist": "^8.0.0",
-        "npm-pick-manifest": "^9.0.0",
-        "npm-registry-fetch": "^17.0.0",
-        "proc-log": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
+        "npm-packlist": "^9.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-registry-fetch": "^18.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "sigstore": "^2.2.0",
-        "ssri": "^10.0.0",
+        "sigstore": "^3.0.0",
+        "ssri": "^12.0.0",
         "tar": "^6.1.11"
       },
       "bin": {
         "pacote": "bin/index.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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,
-      "license": "(MIT AND Zlib)"
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -19008,11 +17071,10 @@
       }
     },
     "node_modules/parse-imports": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz",
-      "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz",
+      "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "es-module-lexer": "^1.5.3",
         "slashes": "^3.0.12"
@@ -19026,7 +17088,6 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -19044,27 +17105,24 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
       "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -19075,7 +17133,6 @@
       "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz",
       "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "entities": "^4.3.0",
         "parse5": "^7.0.0",
@@ -19085,12 +17142,23 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
+    "node_modules/parse5-html-rewriting-stream/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/parse5-sax-parser": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz",
       "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parse5": "^7.0.0"
       },
@@ -19098,12 +17166,23 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
+    "node_modules/parse5/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -19113,7 +17192,6 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -19123,24 +17201,15 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
-      "license": "MIT",
       "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,
-      "license": "(WTFPL OR MIT)"
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -19149,15 +17218,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
       "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "dev": true,
-      "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -19173,53 +17240,43 @@
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
       "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
       "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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,
-      "license": "MIT"
+      "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/picomatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -19232,42 +17289,17 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/piscina": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz",
-      "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.7.0.tgz",
+      "integrity": "sha512-b8hvkpp9zS0zsfa939b/jXbe64Z2gZv0Ha7FYPNUiDIB1y2AtxcOZdfP8xN8HFjUaqQiT9gRlfjAsoL8vdJ1Iw==",
       "dev": true,
-      "license": "MIT",
       "optionalDependencies": {
-        "nice-napi": "^1.0.2"
+        "@napi-rs/nice": "^1.0.1"
       }
     },
     "node_modules/pkg-dir": {
@@ -19275,7 +17307,6 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
       "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-up": "^6.3.0"
       },
@@ -19291,7 +17322,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
       "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^7.1.0",
         "path-exists": "^5.0.0"
@@ -19308,7 +17338,6 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
       "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^6.0.0"
       },
@@ -19324,7 +17353,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
       "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^1.0.0"
       },
@@ -19340,7 +17368,6 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
       "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^4.0.0"
       },
@@ -19356,7 +17383,6 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
       "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
@@ -19366,7 +17392,6 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
       "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12.20"
       },
@@ -19379,7 +17404,6 @@
       "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
       "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.8",
         "base64-js": "^1.5.1",
@@ -19394,7 +17418,6 @@
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
       "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -19404,15 +17427,14 @@
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
       "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
       "dev": true,
       "funding": [
         {
@@ -19428,11 +17450,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -19443,7 +17464,6 @@
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
       "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^9.0.0",
         "jiti": "^1.20.0",
@@ -19474,15 +17494,13 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
       "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/postcss-modules-extract-imports": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
       "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -19491,14 +17509,13 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -19509,13 +17526,12 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -19529,7 +17545,6 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "icss-utils": "^5.0.0"
       },
@@ -19541,11 +17556,10 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+      "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -19558,15 +17572,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/prebuild-install": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
       "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -19592,382 +17604,121 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/prebuild-install/node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "node_modules/prebuild-install/node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.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,
-      "license": "MIT"
-    },
-    "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,
-      "license": "ISC"
-    },
-    "node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/prompts/node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/protractor": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/protractor/-/protractor-7.0.0.tgz",
-      "integrity": "sha512-UqkFjivi4GcvUQYzqGYNe0mLzfn5jiLmO8w9nMhQoJRLhy2grJonpga2IWhI6yJO30LibWXJJtA4MOIZD2GgZw==",
-      "deprecated": "We have news to share - Protractor is deprecated and will reach end-of-life by Summer 2023. To learn more and find out about other options please refer to this post on the Angular blog. Thank you for using and contributing to Protractor. https://goo.gle/state-of-e2e-in-angular",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/q": "^0.0.32",
-        "@types/selenium-webdriver": "^3.0.0",
-        "blocking-proxy": "^1.0.0",
-        "browserstack": "^1.5.1",
-        "chalk": "^1.1.3",
-        "glob": "^7.0.3",
-        "jasmine": "2.8.0",
-        "jasminewd2": "^2.1.0",
-        "q": "1.4.1",
-        "saucelabs": "^1.5.0",
-        "selenium-webdriver": "3.6.0",
-        "source-map-support": "~0.4.0",
-        "webdriver-js-extender": "2.1.0",
-        "webdriver-manager": "^12.1.7",
-        "yargs": "^15.3.1"
-      },
-      "bin": {
-        "protractor": "bin/protractor",
-        "webdriver-manager": "bin/webdriver-manager"
-      },
-      "engines": {
-        "node": ">=10.13.x"
-      }
-    },
-    "node_modules/protractor/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/protractor/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/protractor/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/protractor/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/protractor/node_modules/cliui/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/protractor/node_modules/cliui/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,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/protractor/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,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/protractor/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,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/protractor/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,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "dev": true
     },
-    "node_modules/protractor/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==",
+    "node_modules/prebuild-install/node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/protractor/node_modules/q": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-      "integrity": "sha512-/CdEdaw49VZVmyIDGUQKDDT53c7qBkO6g5CefWz91Ae+l4+cRtcDYwMTXh6me4O8TMldeGHG3N2Bl84V78Ywbg==",
-      "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
+    "node_modules/prebuild-install/node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
       }
     },
-    "node_modules/protractor/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==",
+    "node_modules/prebuild-install/node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/protractor/node_modules/source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "source-map": "^0.5.6"
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/protractor/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==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
+      "bin": {
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/protractor/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+    "node_modules/proc-log": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/protractor/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,
-      "license": "ISC"
+    "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/protractor/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+    "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/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.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": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/protractor/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
       },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prompts/node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -19977,7 +17728,6 @@
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -19991,26 +17741,24 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/proxy-agent": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
-      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "http-proxy-agent": "^7.0.1",
-        "https-proxy-agent": "^7.0.3",
+        "https-proxy-agent": "^7.0.6",
         "lru-cache": "^7.14.1",
-        "pac-proxy-agent": "^7.0.1",
+        "pac-proxy-agent": "^7.1.0",
         "proxy-from-env": "^1.1.0",
-        "socks-proxy-agent": "^8.0.2"
+        "socks-proxy-agent": "^8.0.5"
       },
       "engines": {
         "node": ">= 14"
@@ -20021,7 +17769,6 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -20030,37 +17777,20 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "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,
-      "license": "MIT",
       "optional": 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,
-      "license": "MIT"
-    },
-    "node_modules/pstree.remy": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
-      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "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==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -20070,8 +17800,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/q": {
       "version": "1.5.1",
@@ -20079,7 +17808,6 @@
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6.0",
         "teleport": ">=0.2.0"
@@ -20090,7 +17818,6 @@
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
       "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.9"
       }
@@ -20128,22 +17855,19 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/queue-tick": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
       "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/quick-lru": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -20153,7 +17877,6 @@
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -20163,7 +17886,6 @@
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -20173,7 +17895,6 @@
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
       "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -20189,7 +17910,6 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -20202,7 +17922,6 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -20217,15 +17936,13 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/rc/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,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20235,7 +17952,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
       "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
@@ -20250,7 +17966,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
       "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-up": "^2.0.0",
         "read-pkg": "^3.0.0"
@@ -20264,7 +17979,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^2.0.0"
       },
@@ -20277,7 +17991,6 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -20291,7 +18004,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-try": "^1.0.0"
       },
@@ -20304,7 +18016,6 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^1.1.0"
       },
@@ -20317,7 +18028,6 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -20327,7 +18037,6 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -20336,15 +18045,13 @@
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/read-pkg/node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -20357,7 +18064,6 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pify": "^3.0.0"
       },
@@ -20370,7 +18076,6 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -20380,7 +18085,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -20389,7 +18093,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -20400,29 +18103,16 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "devOptional": true,
-      "license": "MIT",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "dev": true,
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 14.16.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/redent": {
@@ -20430,7 +18120,6 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
       "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "indent-string": "^4.0.0",
         "strip-indent": "^3.0.0"
@@ -20443,22 +18132,41 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
       "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
+      "dev": true
+    },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz",
+      "integrity": "sha512-B5dj6usc5dkk8uFliwjwDHM8To5/QwdKz9JcBZ8Ic4G1f0YmeeJTtE/ZTdgRFPAfxZFiUaPhZ1Jcs4qeagItGQ==",
       "dev": true,
-      "license": "Apache-2.0"
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "dunder-proto": "^1.0.0",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.2.0",
+        "which-builtin-type": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
       "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -20470,14 +18178,13 @@
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
@@ -20486,27 +18193,24 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
       "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/regexp-to-ast": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz",
       "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
+      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20516,16 +18220,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
-      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.2.0",
         "regjsgen": "^0.8.0",
-        "regjsparser": "^0.11.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -20537,15 +18240,13 @@
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
       "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
-      "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "jsesc": "~3.0.2"
       },
@@ -20553,12 +18254,23 @@
         "regjsparser": "bin/parser"
       }
     },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/replace": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/replace/-/replace-1.2.2.tgz",
       "integrity": "sha512-C4EDifm22XZM2b2JOYe6Mhn+lBsLBAvLbK8drfUQLTfD1KYl/n3VaW/CDju0Ny4w3xTtegBpg8YNSpFJPUDSjA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "2.4.2",
         "minimatch": "3.0.5",
@@ -20572,35 +18284,82 @@
         "node": ">= 6"
       }
     },
+    "node_modules/replace/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==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/replace/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,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/replace/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==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/replace/node_modules/cliui": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^6.2.0"
       }
     },
+    "node_modules/replace/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==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/replace/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==",
+      "dev": true
+    },
+    "node_modules/replace/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/replace/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,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -20609,12 +18368,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/replace/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/replace/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,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -20627,7 +18394,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
       "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -20640,7 +18406,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -20656,27 +18421,36 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/replace/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==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/replace/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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/replace/node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^6.0.0",
         "decamelize": "^1.2.0",
@@ -20699,7 +18473,6 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -20708,81 +18481,11 @@
         "node": ">=6"
       }
     },
-    "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,
-      "license": "Apache-2.0",
-      "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/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,
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "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,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/request/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,
-      "license": "MIT",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20791,7 +18494,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20800,22 +18502,19 @@
       "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,
-      "license": "ISC"
+      "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,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -20833,7 +18532,6 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -20843,7 +18541,6 @@
       "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
       "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
       }
@@ -20853,7 +18550,6 @@
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
       "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
@@ -20870,7 +18566,6 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -20885,7 +18580,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20894,7 +18588,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
       "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -20906,15 +18599,13 @@
     "node_modules/restore-cursor/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==",
-      "license": "ISC"
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -20924,7 +18615,6 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -20934,15 +18624,13 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
       "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/rimraf": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
       "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^9.2.0"
       },
@@ -20961,7 +18649,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
       "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "minimatch": "^8.0.2",
@@ -20980,7 +18667,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
       "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -20996,7 +18682,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
       "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=8"
       }
@@ -21004,23 +18689,20 @@
     "node_modules/roboto-fontface": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
-      "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==",
-      "license": "Apache-2.0"
+      "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="
     },
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
-      "license": "Unlicense"
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
-      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz",
+      "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -21030,38 +18712,33 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.4",
-        "@rollup/rollup-android-arm64": "4.22.4",
-        "@rollup/rollup-darwin-arm64": "4.22.4",
-        "@rollup/rollup-darwin-x64": "4.22.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
-        "@rollup/rollup-linux-arm64-musl": "4.22.4",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-musl": "4.22.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
-        "@rollup/rollup-win32-x64-msvc": "4.22.4",
+        "@rollup/rollup-android-arm-eabi": "4.28.1",
+        "@rollup/rollup-android-arm64": "4.28.1",
+        "@rollup/rollup-darwin-arm64": "4.28.1",
+        "@rollup/rollup-darwin-x64": "4.28.1",
+        "@rollup/rollup-freebsd-arm64": "4.28.1",
+        "@rollup/rollup-freebsd-x64": "4.28.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.28.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.28.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.28.1",
+        "@rollup/rollup-linux-arm64-musl": "4.28.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.28.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.28.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.28.1",
+        "@rollup/rollup-linux-x64-gnu": "4.28.1",
+        "@rollup/rollup-linux-x64-musl": "4.28.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.28.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.28.1",
+        "@rollup/rollup-win32-x64-msvc": "4.28.1",
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rollup/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/rsvp": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
       "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "0.12.* || 4.* || 6.* || >= 7.*"
       }
@@ -21071,7 +18748,6 @@
       "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
       "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -21084,7 +18760,6 @@
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -21108,7 +18783,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -21116,37 +18790,26 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
-      "license": "BSD-3-Clause"
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
     },
     "node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "license": "Apache-2.0",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
+        "tslib": "^2.1.0"
       }
     },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "license": "0BSD"
-    },
     "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -21173,19 +18836,17 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21197,18 +18858,16 @@
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "license": "MIT"
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.77.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
-      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "version": "1.80.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.7.tgz",
+      "integrity": "sha512-MVWvN0u5meytrSjsU7AWsbhoXi1sc58zADXFllfZzbsBT1GHjjar6JwBINYPRrkx/zqnQ6uqbQuHgE95O+C+eQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -21216,14 +18875,16 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz",
-      "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.3.tgz",
+      "integrity": "sha512-gosNorT1RCkuCMyihv6FBRR7BMV06oKRAs+l4UMp1mlcVg9rWN6KMmUj3igjQwmYys4mDP3etEYJgiHRbgHCHA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "neo-async": "^2.6.2"
       },
@@ -21259,68 +18920,17 @@
         }
       }
     },
-    "node_modules/saucelabs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz",
-      "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
-      "dev": true,
-      "dependencies": {
-        "https-proxy-agent": "^2.2.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/saucelabs/node_modules/agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/saucelabs/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/saucelabs/node_modules/https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
     "node_modules/sax": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
       "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -21328,7 +18938,7 @@
         "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -21340,7 +18950,6 @@
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -21357,82 +18966,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
       "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/selenium-webdriver": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
-      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jszip": "^3.1.3",
-        "rimraf": "^2.5.4",
-        "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      }
-    },
-    "node_modules/selenium-webdriver/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/selenium-webdriver/node_modules/tmp": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
-      "integrity": "sha512-HXdTB7lvMwcb55XFfrTM8CPr/IYREk4hVBFaQ4b/6nInrluSL86hfHm7vu0luYKCfyBZp2trCjpc8caC3vVM3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "os-tmpdir": "~1.0.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/selenium-webdriver/node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/selenium-webdriver/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      }
+      "dev": true
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
       "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
@@ -21446,7 +18986,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -21459,7 +18998,6 @@
       "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
       "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -21484,7 +19022,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -21493,15 +19030,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -21509,19 +19044,11 @@
         "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,
-      "license": "MIT"
-    },
     "node_modules/send/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,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -21531,7 +19058,6 @@
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -21541,7 +19067,6 @@
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -21560,7 +19085,6 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -21570,7 +19094,6 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -21580,7 +19103,6 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -21595,29 +19117,25 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true,
-      "license": "ISC"
+      "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,
-      "license": "MIT"
+      "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/serve-static": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
       "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
@@ -21633,7 +19151,6 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -21642,15 +19159,13 @@
       "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -21668,7 +19183,6 @@
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -21679,26 +19193,17 @@
         "node": ">= 0.4"
       }
     },
-    "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,
-      "license": "MIT"
-    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -21712,7 +19217,6 @@
       "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "color": "^4.2.3",
         "detect-libc": "^2.0.2",
@@ -21730,12 +19234,26 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/sharp/node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sharp/node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "dev": true
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -21748,32 +19266,86 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
       "dev": true,
-      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21787,7 +19359,6 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=14"
       },
@@ -21796,21 +19367,20 @@
       }
     },
     "node_modules/sigstore": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
-      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.0.0.tgz",
+      "integrity": "sha512-PHMifhh3EN4loMcHCz6l3v/luzgT3za+9f8subGgeMNjbJjzH4Ij/YoX3Gvu+kaouJRIlVdTHHCREADYf+ZteA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
+        "@sigstore/bundle": "^3.0.0",
+        "@sigstore/core": "^2.0.0",
         "@sigstore/protobuf-specs": "^0.3.2",
-        "@sigstore/sign": "^2.3.2",
-        "@sigstore/tuf": "^2.3.4",
-        "@sigstore/verify": "^1.2.1"
+        "@sigstore/sign": "^3.0.0",
+        "@sigstore/tuf": "^3.0.0",
+        "@sigstore/verify": "^2.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/simple-concat": {
@@ -21831,8 +19401,7 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
@@ -21853,7 +19422,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -21865,7 +19433,6 @@
       "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz",
       "integrity": "sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bplist-creator": "0.1.0",
         "bplist-parser": "0.3.1",
@@ -21877,7 +19444,6 @@
       "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
       "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big-integer": "1.6.x"
       },
@@ -21890,7 +19456,6 @@
       "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,
-      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.3.1"
       }
@@ -21899,62 +19464,37 @@
       "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,
-      "license": "MIT"
-    },
-    "node_modules/simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "~7.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/simple-update-notifier/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
+      "dev": true
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/slashes": {
       "version": "3.0.12",
       "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
       "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -21967,59 +19507,21 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/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,
-      "license": "MIT"
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
       }
     },
     "node_modules/socket.io": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
-      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
@@ -22038,18 +19540,33 @@
       "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
       "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "~4.3.4",
         "ws": "~8.17.1"
       }
     },
+    "node_modules/socket.io-adapter/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
       "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
@@ -22058,12 +19575,45 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": 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,
-      "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
@@ -22075,7 +19625,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -22085,7 +19634,6 @@
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
       "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ip-address": "^9.0.5",
         "smart-buffer": "^4.2.0"
@@ -22096,13 +19644,12 @@
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.1.1",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "socks": "^2.8.3"
       },
@@ -22115,7 +19662,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
       "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
@@ -22125,7 +19671,6 @@
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -22135,7 +19680,6 @@
       "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz",
       "integrity": "sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "iconv-lite": "^0.6.3",
         "source-map-js": "^1.0.2"
@@ -22156,7 +19700,6 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -22167,7 +19710,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -22176,15 +19718,13 @@
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
-      "license": "MIT"
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
     },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
       "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -22195,7 +19735,6 @@
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
@@ -22205,15 +19744,13 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
       "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-      "dev": true,
-      "license": "CC-BY-3.0"
+      "dev": true
     },
     "node_modules/spdx-expression-parse": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
       "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
@@ -22223,15 +19760,13 @@
       "version": "3.0.20",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
       "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
-      "dev": true,
-      "license": "CC0-1.0"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "handle-thing": "^2.0.0",
@@ -22248,7 +19783,6 @@
       "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "detect-node": "^2.0.4",
@@ -22263,7 +19797,6 @@
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
       "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "through": "2"
       },
@@ -22276,7 +19809,6 @@
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
       "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "readable-stream": "^3.0.0"
       }
@@ -22285,60 +19817,24 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "dev": true
     },
     "node_modules/ssh-config": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
       "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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,
-      "license": "MIT",
-      "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/sshpk/node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/stable-hash": {
@@ -22352,7 +19848,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -22362,7 +19857,6 @@
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
       "integrity": "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==",
       "dev": true,
-      "license": "Unlicense",
       "engines": {
         "node": ">= 0.10.0"
       }
@@ -22372,7 +19866,6 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -22382,15 +19875,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/stream-combiner2/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,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -22405,15 +19896,13 @@
       "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/stream-combiner2/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,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -22423,7 +19912,6 @@
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
       "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "date-format": "^4.0.14",
         "debug": "^4.3.4",
@@ -22438,7 +19926,6 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -22453,7 +19940,6 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
-      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -22463,17 +19949,15 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/streamx": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.19.0.tgz",
-      "integrity": "sha512-5z6CNR4gtkPbwlxyEqoDGDmWIzoNJqCBt4Eac1ICP9YaIT08ct712cFj0u1rx4F8luAuL+3Qc+RFIdI4OX00kg==",
+      "version": "2.21.1",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz",
+      "integrity": "sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
         "queue-tick": "^1.0.1",
@@ -22487,7 +19971,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -22497,7 +19980,6 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -22513,7 +19995,6 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -22524,16 +20005,18 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22543,16 +20026,19 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -22562,7 +20048,6 @@
       "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
       "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -22579,7 +20064,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -22593,7 +20077,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -22606,7 +20089,6 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -22616,7 +20098,6 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -22626,7 +20107,6 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "min-indent": "^1.0.0"
       },
@@ -22639,7 +20119,6 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -22653,7 +20132,6 @@
       "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
       "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.4",
@@ -22675,7 +20153,6 @@
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
       "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dezalgo": "^1.0.4",
         "hexoid": "^1.0.0",
@@ -22686,17 +20163,24 @@
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
-    "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==",
+    "node_modules/superagent/node_modules/hexoid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
       "dev": true,
-      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -22704,7 +20188,6 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -22726,7 +20209,6 @@
           "url": "http://opencollective.com/swiper"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">= 4.7.0"
       }
@@ -22736,17 +20218,15 @@
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
       "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
     },
     "node_modules/synckit": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
-      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
+      "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@pkgr/core": "^0.1.0",
         "tslib": "^2.6.2"
@@ -22763,7 +20243,6 @@
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -22773,7 +20252,6 @@
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
       "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -22791,7 +20269,6 @@
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
       "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0",
         "tar-stream": "^3.1.5"
@@ -22806,7 +20283,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
       "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "b4a": "^1.6.4",
         "fast-fifo": "^1.2.0",
@@ -22818,7 +20294,6 @@
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -22831,7 +20306,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -22844,7 +20318,31 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
       "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "dev": true,
-      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar/node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/tar/node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
       "engines": {
         "node": ">=8"
       }
@@ -22854,7 +20352,6 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -22866,15 +20363,13 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/temp-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
       "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -22884,7 +20379,6 @@
       "resolved": "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz",
       "integrity": "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "del": "^6.0.0",
         "is-stream": "^2.0.0",
@@ -22904,7 +20398,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
       "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -22913,11 +20406,10 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.31.6",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
-      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+      "version": "5.36.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+      "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -22932,17 +20424,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.11",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
+      "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -22966,72 +20457,17 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/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,
-      "license": "MIT",
-      "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/terser-webpack-plugin/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,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/terser-webpack-plugin/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,
-      "license": "MIT"
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/text-decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
-      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
+      "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.4"
       }
@@ -23041,24 +20477,15 @@
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
       "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
     },
-    "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,
-      "license": "MIT"
-    },
     "node_modules/thingies": {
       "version": "1.21.0",
       "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
       "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
       "dev": true,
-      "license": "Unlicense",
       "engines": {
         "node": ">=10.18"
       },
@@ -23070,15 +20497,13 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/through2": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
       "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "readable-stream": "3"
       }
@@ -23087,99 +20512,49 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/tmp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
       "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.14"
       }
-    },
-    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "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==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/touch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
-      "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "nodetouch": "bin/nodetouch.js"
-      }
-    },
-    "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,
-      "license": "BSD-3-Clause",
+    },
+    "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==",
+      "devOptional": true,
       "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "is-number": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=8.0"
       }
     },
-    "node_modules/tough-cookie/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.6"
       }
     },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/tree-dump": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz",
       "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
       },
@@ -23196,7 +20571,6 @@
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
       }
@@ -23206,17 +20580,15 @@
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
       "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=16"
       },
@@ -23229,7 +20601,6 @@
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -23273,7 +20644,6 @@
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
       "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -23286,7 +20656,6 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
       "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -23297,22 +20666,20 @@
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "node_modules/tuf-js": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
-      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz",
+      "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@tufjs/models": "2.0.1",
-        "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.1"
+        "@tufjs/models": "3.0.1",
+        "debug": "^4.3.6",
+        "make-fetch-happen": "^14.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/tunnel-agent": {
@@ -23320,7 +20687,6 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -23328,19 +20694,11 @@
         "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,
-      "license": "Unlicense"
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -23353,7 +20711,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -23366,7 +20723,6 @@
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -23380,7 +20736,6 @@
       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
       "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
@@ -23395,7 +20750,6 @@
       "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
       "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
@@ -23411,18 +20765,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz",
+      "integrity": "sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.13",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23432,18 +20786,17 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
         "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23456,25 +20809,22 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
       "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
-      "dev": true,
-      "license": "MIT"
+      "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,
-      "license": "MIT",
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -23488,7 +20838,6 @@
       "resolved": "https://registry.npmjs.org/typescript-strict-plugin/-/typescript-strict-plugin-2.4.4.tgz",
       "integrity": "sha512-OXcWHQk+pW9gqEL/Mb1eTgj/Yiqk1oHBERr9v4VInPOYN++p+cXejmQK/h/VlUPGD++FXQ8pgiqVMyEtxU4T6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "^3.0.0",
         "execa": "^4.0.0",
@@ -23501,28 +20850,11 @@
         "update-strict-comments": "dist/cli/update-strict-comments/index.js"
       }
     },
-    "node_modules/typescript-strict-plugin/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/typescript-strict-plugin/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,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -23536,62 +20868,17 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/typescript-strict-plugin/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/typescript-strict-plugin/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,
-      "license": "MIT"
-    },
-    "node_modules/typescript-strict-plugin/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/typescript-strict-plugin/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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/typescript-strict-plugin/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -23609,7 +20896,6 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -23624,9 +20910,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.38",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
-      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
+      "version": "0.7.39",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.39.tgz",
+      "integrity": "sha512-IZ6acm6RhQHNibSt7+c09hhvsKy9WUr4DVbeq9U8o71qxyYtJpQeDxQnMrVqnIFMLcQjHO0I9wgfO2vIahht4w==",
       "dev": true,
       "funding": [
         {
@@ -23642,17 +20928,18 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
-      "license": "MIT",
+      "bin": {
+        "ua-parser-js": "script/cli.js"
+      },
       "engines": {
         "node": "*"
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.19.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
-      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==",
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -23662,41 +20949,34 @@
       }
     },
     "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==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/undefsafe": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
-      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
       "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -23706,7 +20986,6 @@
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -23720,7 +20999,6 @@
       "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
       "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -23730,7 +21008,6 @@
       "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,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -23740,7 +21017,6 @@
       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -23749,29 +21025,27 @@
       }
     },
     "node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "unique-slug": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/unique-string": {
@@ -23779,7 +21053,6 @@
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
       "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "crypto-random-string": "^2.0.0"
       },
@@ -23792,7 +21065,6 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -23802,7 +21074,6 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -23812,15 +21083,14 @@
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "dev": true,
       "funding": [
         {
@@ -23836,10 +21106,9 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -23852,7 +21121,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -23861,7 +21129,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -23869,15 +21136,13 @@
     "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==",
-      "license": "MIT"
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "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,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -23890,7 +21155,6 @@
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
-      "license": "MIT",
       "bin": {
         "uuid": "dist/esm/bin/uuid"
       }
@@ -23899,15 +21163,13 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -23918,20 +21180,18 @@
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/validate-npm-package-name": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.0.tgz",
+      "integrity": "sha512-d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/vary": {
@@ -23939,32 +21199,15 @@
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "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==",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "node_modules/vite": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
-      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
+      "version": "5.4.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+      "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -24027,7 +21270,6 @@
         "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -24044,7 +21286,6 @@
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -24061,7 +21302,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -24078,7 +21318,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -24095,7 +21334,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -24112,7 +21350,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -24129,7 +21366,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -24146,7 +21382,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -24163,7 +21398,6 @@
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24180,7 +21414,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24197,7 +21430,6 @@
         "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24214,7 +21446,6 @@
         "loong64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24231,7 +21462,6 @@
         "mips64el"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24248,7 +21478,6 @@
         "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24265,7 +21494,6 @@
         "riscv64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24282,7 +21510,6 @@
         "s390x"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24299,7 +21526,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -24316,7 +21542,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -24333,7 +21558,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -24350,7 +21574,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -24367,7 +21590,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -24384,7 +21606,6 @@
         "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -24401,7 +21622,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -24416,7 +21636,6 @@
       "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -24445,325 +21664,75 @@
         "@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/vite/node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.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,
-      "license": "MIT",
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "license": "MIT",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/weak-lru-cache": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
-      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/webdriver-js-extender": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
-      "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/selenium-webdriver": "^3.0.0",
-        "selenium-webdriver": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.x"
-      }
-    },
-    "node_modules/webdriver-manager": {
-      "version": "12.1.9",
-      "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.9.tgz",
-      "integrity": "sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "adm-zip": "^0.5.2",
-        "chalk": "^1.1.1",
-        "del": "^2.2.0",
-        "glob": "^7.0.3",
-        "ini": "^1.3.4",
-        "minimist": "^1.2.0",
-        "q": "^1.4.1",
-        "request": "^2.87.0",
-        "rimraf": "^2.5.2",
-        "semver": "^5.3.0",
-        "xml2js": "^0.4.17"
-      },
-      "bin": {
-        "webdriver-manager": "bin/webdriver-manager"
-      },
-      "engines": {
-        "node": ">=6.9.x"
-      }
-    },
-    "node_modules/webdriver-manager/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webdriver-manager/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webdriver-manager/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,
-      "license": "MIT",
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webdriver-manager/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webdriver-manager/node_modules/del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "globby": "^5.0.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "rimraf": "^2.2.8"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webdriver-manager/node_modules/globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha512-HJRTIH2EeH44ka+LWig+EqT2ONSYpVlNfx6pyd592/VF1TbfljJ7elwie7oSwcViLGqOdWocSdu2txwBF9bjmQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "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/webdriver-manager/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "license": "ISC"
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
     },
-    "node_modules/webdriver-manager/node_modules/is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==",
+    "node_modules/void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webdriver-manager/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/webdriver-manager/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,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/webdriver-manager/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==",
+    "node_modules/watchpack": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/webdriver-manager/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
       }
     },
-    "node_modules/webdriver-manager/node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "defaults": "^1.0.3"
       }
     },
-    "node_modules/webdriver-manager/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+    "node_modules/weak-lru-cache": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      }
+      "optional": true
     },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
     "node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.5",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -24802,7 +21771,6 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
       "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^4.6.0",
@@ -24828,11 +21796,10 @@
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz",
-      "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz",
+      "integrity": "sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.13",
         "@types/connect-history-api-fallback": "^1.5.4",
@@ -24847,8 +21814,7 @@
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
+        "express": "^4.19.2",
         "graceful-fs": "^4.2.6",
         "html-entities": "^2.4.0",
         "http-proxy-middleware": "^2.0.3",
@@ -24856,14 +21822,13 @@
         "launch-editor": "^2.6.1",
         "open": "^10.0.3",
         "p-retry": "^6.2.0",
-        "rimraf": "^5.0.5",
         "schema-utils": "^4.2.0",
         "selfsigned": "^2.4.1",
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^7.1.0",
-        "ws": "^8.16.0"
+        "webpack-dev-middleware": "^7.4.2",
+        "ws": "^8.18.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
@@ -24887,25 +21852,40 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+    "node_modules/webpack-dev-server/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "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"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": ">= 8.10.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/webpack-dev-server/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==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
@@ -24913,7 +21893,6 @@
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
       "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -24938,7 +21917,6 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -24946,20 +21924,49 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/rimraf": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
-      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+    "node_modules/webpack-dev-server/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/webpack-dev-server/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "glob": "^10.3.7"
+        "picomatch": "^2.2.1"
       },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/webpack-merge": {
@@ -24967,7 +21974,6 @@
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
       "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
@@ -24982,7 +21988,6 @@
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -24992,7 +21997,6 @@
       "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
       "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "typed-assert": "^1.0.8"
       },
@@ -25014,7 +22018,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -25031,7 +22034,6 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -25041,7 +22043,6 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -25055,7 +22056,6 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -25064,22 +22064,19 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/webpack/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,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -25098,7 +22095,6 @@
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -25113,7 +22109,6 @@
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -25123,7 +22118,6 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -25134,7 +22128,6 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -25146,17 +22139,64 @@
       }
     },
     "node_modules/which-boxed-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -25166,15 +22206,13 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.16.tgz",
+      "integrity": "sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.7",
@@ -25193,15 +22231,13 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/windows-release": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
       "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "execa": "^4.0.2"
       },
@@ -25217,7 +22253,6 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -25226,15 +22261,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -25250,7 +22283,6 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -25263,91 +22295,17 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/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,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/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,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/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,
-      "license": "MIT"
-    },
     "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==",
-      "dev": true,
-      "license": "ISC"
+      "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,
-      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -25359,15 +22317,13 @@
       "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,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
       "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -25389,7 +22345,6 @@
       "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
       "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "simple-plist": "^1.1.0",
         "uuid": "^7.0.3"
@@ -25403,7 +22358,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
       "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -25413,7 +22367,6 @@
       "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
       "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sax": "^1.2.4"
       },
@@ -25425,15 +22378,13 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
       "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/xml2js": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
       "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -25447,7 +22398,6 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       }
@@ -25457,7 +22407,6 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
       "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.0"
       }
@@ -25467,7 +22416,6 @@
       "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
       "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6.0"
       }
@@ -25477,7 +22425,6 @@
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.4"
       }
@@ -25487,7 +22434,6 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -25496,15 +22442,13 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -25523,7 +22467,6 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -25533,7 +22476,6 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -25543,7 +22485,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
@@ -25554,7 +22495,6 @@
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -25564,7 +22504,6 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -25577,7 +22516,6 @@
       "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
       "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -25586,10 +22524,9 @@
       }
     },
     "node_modules/zone.js": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
-      "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==",
-      "license": "MIT"
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.0.tgz",
+      "integrity": "sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA=="
     }
   }
 }
diff --git a/ui/package.json b/ui/package.json
index 9d3cf3ecb95..318ce7c2cf9 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,31 +4,31 @@
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
-    "@angular/animations": "18.2.12",
-    "@angular/common": "18.2.12",
-    "@angular/core": "18.2.12",
-    "@angular/forms": "18.2.12",
-    "@angular/platform-browser": "18.2.12",
-    "@angular/platform-browser-dynamic": "18.2.12",
-    "@angular/router": "18.2.12",
-    "@angular/service-worker": "18.2.12",
+    "@angular/animations": "19.0.3",
+    "@angular/common": "19.0.3",
+    "@angular/core": "19.0.3",
+    "@angular/forms": "19.0.3",
+    "@angular/platform-browser": "19.0.3",
+    "@angular/platform-browser-dynamic": "19.0.3",
+    "@angular/router": "19.0.3",
+    "@angular/service-worker": "19.0.3",
+    "@awesome-cordova-plugins/core": "^6.12.0",
+    "@awesome-cordova-plugins/file-opener": "^6.12.0",
     "@capacitor-community/file-opener": "^6.0.1",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.2",
-    "@capacitor/core": "^6.1.2",
+    "@capacitor/core": "^6.2.0",
     "@capacitor/filesystem": "^6.0.2",
     "@capacitor/ios": "^6.2.0",
     "@capacitor/splash-screen": "^6.0.3",
-    "@ionic-native/core": "^5.36.0",
-    "@ionic-native/file-opener": "^5.36.0",
-    "@ionic/angular": "^6.7.5",
-    "@ngx-formly/core": "^6.3.11",
-    "@ngx-formly/ionic": "^6.3.11",
-    "@ngx-formly/schematics": "^6.3.10",
-    "@ngx-translate/core": "^15.0.0",
+    "@ionic/angular": "^7.8.6",
+    "@ngx-formly/core": "^6.3.12",
+    "@ngx-formly/ionic": "^6.3.12",
+    "@ngx-formly/schematics": "^6.3.12",
+    "@ngx-translate/core": "^16.0.3",
     "@nodro7/angular-mydatepicker": "^0.14.0",
     "capacitor-blob-writer": "^1.1.17",
-    "capacitor-ios-autofill-save-password": "^3.0.0",
+    "capacitor-ios-autofill-save-password": "^4.0.0",
     "capacitor-secure-storage-plugin": "^0.10.0",
     "chart.js": "^4.4.7",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -38,37 +38,38 @@
     "classlist.js": "^1.1.20150312",
     "compare-versions": "^6.1.1",
     "d3": "^7.9.0",
-    "date-fns": "^2.30.0",
+    "date-fns": "^4.1.0",
     "file-saver-es": "^2.0.5",
-    "ng2-charts": "4.1.1",
-    "ngx-cookie-service": "18.0.0",
-    "ngx-device-detector": "^8.0.0",
-    "ngx-spinner": "^16.0.2",
+    "ng2-charts": "7.0.0",
+    "ngx-cookie-service": "19.0.0",
+    "ngx-device-detector": "^9.0.0",
+    "ngx-spinner": "^17.0.0",
     "roboto-fontface": "^0.10.0",
-    "rxjs": "~6.6.7",
+    "rxjs": "~7.8.1",
     "swiper": "11.1.15",
     "tslib": "^2.8.1",
     "uuid": "^11.0.3",
-    "zone.js": "~0.14.10"
+    "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.2.12",
-    "@angular-devkit/core": "18.2.12",
-    "@angular-devkit/schematics": "18.2.12",
-    "@angular-eslint/builder": "^18.4.1",
-    "@angular-eslint/eslint-plugin": "^18.4.1",
-    "@angular-eslint/eslint-plugin-template": "^18.4.1",
-    "@angular-eslint/template-parser": "^18.4.1",
-    "@angular/cli": "18.2.12",
-    "@angular/compiler": "18.2.12",
-    "@angular/compiler-cli": "18.2.12",
-    "@angular/language-service": "18.2.12",
+    "@angular-devkit/build-angular": "^19.0.3",
+    "@angular-devkit/core": "^19.0.5",
+    "@angular-devkit/schematics": "^19.0.5",
+    "@angular-eslint/builder": "^19.0.2",
+    "@angular-eslint/eslint-plugin": "^19.0.2",
+    "@angular-eslint/eslint-plugin-template": "^19.0.2",
+    "@angular-eslint/template-parser": "^19.0.2",
+    "@angular/cli": "^19.0.5",
+    "@angular/compiler": "19.0.3",
+    "@angular/compiler-cli": "19.0.3",
+    "@angular/language-service": "19.0.3",
     "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "6.2.0",
-    "@ionic/angular-toolkit": "^11.0.1",
+    "@ionic/angular-toolkit": "^12.1.1",
     "@ionic/cli": "^7.2.0",
-    "@stylistic/eslint-plugin": "^2.12.0",
-    "@types/jasmine": "~4.3.6",
+    "@schematics/angular": "^19.0.5",
+    "@stylistic/eslint-plugin": "^2.12.1",
+    "@types/jasmine": "~5.1.5",
     "@types/jasminewd2": "~2.0.13",
     "@types/json-schema": "^7.0.15",
     "@types/node": "^20.12.6",
@@ -76,17 +77,17 @@
     "@types/range-parser": "^1.2.7",
     "@types/send": "^0.17.4",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.0",
+    "@typescript-eslint/parser": "^8.18.0",
     "@typescript-eslint/types": "^8.18.0",
-    "eslint": "^8.57.0",
+    "eslint": "^9.16.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",
-    "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-jsdoc": "50.2.4",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsdoc": "50.6.1",
     "eslint-plugin-prefer-arrow": "1.2.3",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "jasmine-core": "~5.3.0",
+    "jasmine-core": "~5.5.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
@@ -94,9 +95,8 @@
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
-    "protractor": "^7.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "~5.4.5",
+    "typescript": "~5.6.3",
     "typescript-strict-plugin": "^2.4.4"
   },
   "scripts": {
diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index 27d05b4410d..d9809a8ede4 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -16,6 +16,7 @@ import { Language } from "./shared/type/language";
 @Component({
   selector: "app-root",
   templateUrl: "app.component.html",
+  standalone: false,
 })
 export class AppComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index 104179b52e5..58af2d37c2d 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -9,6 +9,7 @@ import { IonicModule, IonicRouteStrategy } from "@ionic/angular";
 import { FORMLY_CONFIG } from "@ngx-formly/core";
 import { TranslateLoader, TranslateModule, TranslateService } from "@ngx-translate/core";
 import { AngularMyDatePickerModule } from "@nodro7/angular-mydatepicker";
+import { provideCharts, withDefaultRegisterables } from "ng2-charts";
 import { CookieService } from "ngx-cookie-service";
 import { DeviceDetectorService } from "ngx-device-detector";
 import { AppRoutingModule } from "./app-routing.module";
@@ -64,6 +65,7 @@ import { UserModule } from "./user/user.module";
     CheckForUpdateService,
     AppService,
     AppStateTracker,
+    provideCharts(withDefaultRegisterables()),
   ],
   bootstrap: [AppComponent],
 })
diff --git a/ui/src/app/app.service.ts b/ui/src/app/app.service.ts
index 6903c33c1a8..69172d83672 100644
--- a/ui/src/app/app.service.ts
+++ b/ui/src/app/app.service.ts
@@ -4,9 +4,7 @@ import { App } from "@capacitor/app";
 import { Capacitor } from "@capacitor/core";
 import { Directory, Encoding, Filesystem } from "@capacitor/filesystem";
 import { AlertController } from "@ionic/angular";
-import { FileOpener } from "@ionic-native/file-opener";
 import { TranslateService } from "@ngx-translate/core";
-import { saveAs } from "file-saver-es";
 import { DeviceDetectorService, DeviceInfo } from "ngx-device-detector";
 import { BehaviorSubject, Subject } from "rxjs";
 import { environment } from "src/environments";
@@ -56,34 +54,6 @@ export class AppService {
     return null;
   }
 
-  static async writeAndOpenFile(data: Blob, fileName: string) {
-    if (!AppService.platform) {
-      saveAs(data, fileName);
-    }
-
-    const reader = new FileReader();
-    reader.readAsDataURL(data);
-    reader.onloadend = async function () {
-      try {
-        const result = await Filesystem.writeFile({
-          path: fileName,
-          data: reader.result.toString(),
-          directory: Directory.Data,
-          recursive: true,
-          encoding: Encoding.UTF8,
-        });
-
-        FileOpener.open(result.uri, data.type)
-          .then(() => console.log("File is opened"))
-          .catch(e => console.log("Error opening file", e));
-
-        console.log("Wrote file", result.uri);
-      } catch (e) {
-        console.error("Unable to write file", e);
-      }
-    };
-  }
-
   public listen() {
     // Don't use in web
     if (AppService.platform === "web") {
diff --git a/ui/src/app/edge/edge.component.ts b/ui/src/app/edge/edge.component.ts
index c0acc0aa952..f2f5f9d6728 100644
--- a/ui/src/app/edge/edge.component.ts
+++ b/ui/src/app/edge/edge.component.ts
@@ -11,6 +11,7 @@ import { ChannelAddress, Edge, Service, Websocket } from "src/app/shared/shared"
     <ion-content></ion-content>
          <ion-router-outlet id="content"></ion-router-outlet>
     `,
+    standalone: false,
 })
 export class EdgeComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts b/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts
index ee3b75080e1..a3760f08e2d 100644
--- a/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts
+++ b/ui/src/app/edge/history/Controller/ChannelThreshold/chart/totalchart.component.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/share
 @Component({
   selector: "totalChart",
   templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class TotalChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.ts b/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.ts
index 54403badbeb..ebb74845fee 100644
--- a/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.ts
+++ b/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
     selector: "channelthresholdWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.ts b/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.ts
index 5d6f53c8e92..6f20c753fb2 100644
--- a/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.ts
+++ b/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.ts
@@ -4,5 +4,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 @Component({
     selector: "overview",
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts
index 05e4a18475e..accd7d72999 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/chart.ts
@@ -9,6 +9,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
   selector: "gridOptimizedChargeChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class GridOptimizedChargeChartComponent extends AbstractHistoryChart {
   public static getChartData(component: EdgeConfig.Component, translate: TranslateService): HistoryUtils.ChartData {
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts
index e8ae6a7188b..fdf06a94f49 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/chart/sellToGridLimitChart.component.ts
@@ -9,6 +9,7 @@ import { ChannelAddress } from "src/app/shared/shared";
 @Component({
   selector: "sellToGridLimitChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class SellToGridLimitChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.ts b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.ts
index 67cd22d5d32..d11c3482857 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.ts
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/flat/flat.ts
@@ -7,6 +7,7 @@ import { Filter } from "src/app/shared/components/shared/filter";
 @Component({
     selector: "gridOptimizedChargeWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
     protected FORMAT_SECONDS_TO_DURATION = Converter.FORMAT_SECONDS_TO_DURATION(this.translate.currentLang);
diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.ts b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.ts
index f5e4cab17f3..867174e975c 100644
--- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.ts
+++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.ts
@@ -5,5 +5,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 @Component({
     selector: "gridoptimizedcharge-chart-overview",
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
index c1ef75ccd39..5432672dd8c 100644
--- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
@@ -12,6 +12,7 @@ import { ColorUtils } from "src/app/shared/utils/color/color.utils";
 @Component({
     selector: "scheduleChart",
     templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+    standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.ts b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.ts
index 126647bbd92..fc64481c9b8 100644
--- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.ts
+++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/flat/flat.ts
@@ -7,6 +7,7 @@ import { ChannelAddress, CurrentData } from "src/app/shared/shared";
 @Component({
     selector: "timeOfUseTariffWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/overview/overview.ts b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/overview/overview.ts
index 51ed8f95a67..1d850679996 100644
--- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/overview/overview.ts
+++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/overview/overview.ts
@@ -3,5 +3,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 
 @Component({
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts
index 06f0098e904..458d8ac56c7 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/chart/chart.ts
@@ -9,6 +9,7 @@ import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/share
 @Component({
   selector: "totalChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class TotalChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts
index 94ef64537de..46a3e12c8e3 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/chart/chart.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/share
 @Component({
   selector: "detailChart",
   templateUrl: "../../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/details.overview.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/details.overview.ts
index df7cf0ec298..a0a9877aa1c 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/details.overview.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/details/details.overview.ts
@@ -3,5 +3,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 
 @Component({
   templateUrl: "./details.overview.html",
+  standalone: false,
 })
 export class DetailsOverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.ts
index 36aba75e504..dd3632cdd63 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/flat/flat.ts
@@ -7,6 +7,7 @@ import { EdgeConfig } from "src/app/shared/shared";
 @Component({
     selector: "DigitalOutputWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
     protected FORMAT_SECONDS_TO_DURATION = Converter.FORMAT_SECONDS_TO_DURATION(this.translate.currentLang);
diff --git a/ui/src/app/edge/history/Controller/Io/DigitalOutput/overview/overview.ts b/ui/src/app/edge/history/Controller/Io/DigitalOutput/overview/overview.ts
index c3eeec802be..c90606523f8 100644
--- a/ui/src/app/edge/history/Controller/Io/DigitalOutput/overview/overview.ts
+++ b/ui/src/app/edge/history/Controller/Io/DigitalOutput/overview/overview.ts
@@ -9,6 +9,7 @@ import { ChannelAddress, EdgeConfig, Service } from "src/app/shared/shared";
 @Component({
     selector: "overview",
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview {
 
diff --git a/ui/src/app/edge/history/Controller/Io/heatingelement/chart/chart.ts b/ui/src/app/edge/history/Controller/Io/heatingelement/chart/chart.ts
index 4af9f3d9c88..fbff518e075 100644
--- a/ui/src/app/edge/history/Controller/Io/heatingelement/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Io/heatingelement/chart/chart.ts
@@ -9,6 +9,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
     selector: "controller-io-heatingelement-chart",
     templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+    standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
     public static getChartData(component: EdgeConfig.Component, phaseColors: string[], chartType: "line" | "bar"): HistoryUtils.ChartData {
diff --git a/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.ts b/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.ts
index 677d32f0737..58a972f42ad 100644
--- a/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.ts
+++ b/ui/src/app/edge/history/Controller/Io/heatingelement/flat/flat.ts
@@ -4,6 +4,7 @@ import { AbstractFlatWidget } from "src/app/shared/components/flat/abstract-flat
 @Component({
     selector: "controller-io-heatingelement-widget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
     protected FORMAT_SECONDS_TO_DURATION = this.Converter.FORMAT_SECONDS_TO_DURATION(this.translate.currentLang);
diff --git a/ui/src/app/edge/history/Controller/Io/heatingelement/overview/overview.ts b/ui/src/app/edge/history/Controller/Io/heatingelement/overview/overview.ts
index 2e52219327a..c5a5e8663c2 100644
--- a/ui/src/app/edge/history/Controller/Io/heatingelement/overview/overview.ts
+++ b/ui/src/app/edge/history/Controller/Io/heatingelement/overview/overview.ts
@@ -4,5 +4,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 @Component({
     selector: "controller-io-heatingelement-overview",
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/Controller/ModbusTcpApi/chart/chart.ts b/ui/src/app/edge/history/Controller/ModbusTcpApi/chart/chart.ts
index 987109ea767..a87384ceab3 100644
--- a/ui/src/app/edge/history/Controller/ModbusTcpApi/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/ModbusTcpApi/chart/chart.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
     selector: "modbusTcpApiChart",
     templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+    standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.ts b/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.ts
index 9a857c71826..1dbc789649a 100644
--- a/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.ts
+++ b/ui/src/app/edge/history/Controller/ModbusTcpApi/flat/flat.ts
@@ -6,6 +6,7 @@ import { ChannelAddress } from "src/app/shared/shared";
 @Component({
   selector: "modbusTcpApiWidget",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.ts b/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.ts
index 51ed8f95a67..1d850679996 100644
--- a/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.ts
+++ b/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.ts
@@ -3,5 +3,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 
 @Component({
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/chpsoc/chart.component.ts b/ui/src/app/edge/history/chpsoc/chart.component.ts
index 89019ad7b87..f3b99ac069b 100644
--- a/ui/src/app/edge/history/chpsoc/chart.component.ts
+++ b/ui/src/app/edge/history/chpsoc/chart.component.ts
@@ -10,6 +10,7 @@ import { AbstractHistoryChart } from "../abstracthistorychart";
 @Component({
     selector: "chpsocchart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class ChpSocChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/chpsoc/widget.component.ts b/ui/src/app/edge/history/chpsoc/widget.component.ts
index 9056355309b..76f9a4cf592 100644
--- a/ui/src/app/edge/history/chpsoc/widget.component.ts
+++ b/ui/src/app/edge/history/chpsoc/widget.component.ts
@@ -10,6 +10,7 @@ import { calculateActiveTimeOverPeriod } from "../shared";
 @Component({
     selector: ChpSocWidgetComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class ChpSocWidgetComponent extends AbstractHistoryWidget implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/common/autarchy/chart/chart.ts b/ui/src/app/edge/history/common/autarchy/chart/chart.ts
index 8a17580e381..29fb0ec2738 100644
--- a/ui/src/app/edge/history/common/autarchy/chart/chart.ts
+++ b/ui/src/app/edge/history/common/autarchy/chart/chart.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, Utils } from "src/app/shared/shared";
 @Component({
   selector: "autarchychart",
   templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/autarchy/flat/flat.ts b/ui/src/app/edge/history/common/autarchy/flat/flat.ts
index 429cca30b54..7176f22709f 100644
--- a/ui/src/app/edge/history/common/autarchy/flat/flat.ts
+++ b/ui/src/app/edge/history/common/autarchy/flat/flat.ts
@@ -6,6 +6,7 @@ import { ChannelAddress, CurrentData, Utils } from "../../../../../shared/shared
 @Component({
     selector: "autarchyWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/common/autarchy/overview/overview.ts b/ui/src/app/edge/history/common/autarchy/overview/overview.ts
index 51ed8f95a67..1d850679996 100644
--- a/ui/src/app/edge/history/common/autarchy/overview/overview.ts
+++ b/ui/src/app/edge/history/common/autarchy/overview/overview.ts
@@ -3,5 +3,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 
 @Component({
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/common/consumption/chart/chart.ts b/ui/src/app/edge/history/common/consumption/chart/chart.ts
index 95498d67819..c11bd097b8d 100644
--- a/ui/src/app/edge/history/common/consumption/chart/chart.ts
+++ b/ui/src/app/edge/history/common/consumption/chart/chart.ts
@@ -11,6 +11,7 @@ import { ChannelAddress, Edge, EdgeConfig, Utils } from "src/app/shared/shared";
 @Component({
   selector: "consumptionchart",
   templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts b/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts
index 0dcc4470d01..9375b6a7d67 100644
--- a/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts
+++ b/ui/src/app/edge/history/common/consumption/details/chart/consumptionMeter.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, ChartConstants, EdgeConfig } from "src/app/shared/share
 @Component({
   selector: "consumptionMeterChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ConsumptionMeterChartDetailsComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts b/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts
index fc5e130c6cf..21c44acc3e1 100644
--- a/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts
+++ b/ui/src/app/edge/history/common/consumption/details/chart/evcs.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, ChartConstants, Edge, EdgeConfig } from "src/app/shared
 @Component({
     selector: "evcsChart",
     templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+    standalone: false,
 })
 export class EvcsChartDetailsComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/consumption/details/chart/sum.ts b/ui/src/app/edge/history/common/consumption/details/chart/sum.ts
index cf25ef1a843..bdd58531cff 100644
--- a/ui/src/app/edge/history/common/consumption/details/chart/sum.ts
+++ b/ui/src/app/edge/history/common/consumption/details/chart/sum.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
   selector: "sumChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class SumChartDetailsComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/consumption/details/details.overview.ts b/ui/src/app/edge/history/common/consumption/details/details.overview.ts
index 645fd4194dd..d73e5cc4de1 100644
--- a/ui/src/app/edge/history/common/consumption/details/details.overview.ts
+++ b/ui/src/app/edge/history/common/consumption/details/details.overview.ts
@@ -9,6 +9,7 @@ import { Role } from "src/app/shared/type/role";
 
 @Component({
   templateUrl: "./details.overview.html",
+  standalone: false,
 })
 export class DetailsOverviewComponent extends AbstractHistoryChartOverview {
   protected navigationButtons: NavigationOption[] = [];
diff --git a/ui/src/app/edge/history/common/consumption/flat/flat.ts b/ui/src/app/edge/history/common/consumption/flat/flat.ts
index a862b6ad406..3e5b5f0b6ad 100644
--- a/ui/src/app/edge/history/common/consumption/flat/flat.ts
+++ b/ui/src/app/edge/history/common/consumption/flat/flat.ts
@@ -6,6 +6,7 @@ import { ChannelAddress, CurrentData, EdgeConfig } from "../../../../../shared/s
 @Component({
     selector: "consumptionWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/common/consumption/overview/overview.ts b/ui/src/app/edge/history/common/consumption/overview/overview.ts
index 7ba779ea15c..8d722971951 100644
--- a/ui/src/app/edge/history/common/consumption/overview/overview.ts
+++ b/ui/src/app/edge/history/common/consumption/overview/overview.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, EdgeConfig, Service } from "src/app/shared/shared";
 
 @Component({
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview {
 
diff --git a/ui/src/app/edge/history/common/energy/chart/chart.ts b/ui/src/app/edge/history/common/energy/chart/chart.ts
index 57fb9bbc3aa..cee407f80de 100644
--- a/ui/src/app/edge/history/common/energy/chart/chart.ts
+++ b/ui/src/app/edge/history/common/energy/chart/chart.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, EdgeConfig, Utils } from "src/app/shared/shared";
 @Component({
   selector: "energychart",
   templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/energy/flat/flat.ts b/ui/src/app/edge/history/common/energy/flat/flat.ts
index 49db6041eb6..39043d06ea3 100644
--- a/ui/src/app/edge/history/common/energy/flat/flat.ts
+++ b/ui/src/app/edge/history/common/energy/flat/flat.ts
@@ -11,6 +11,7 @@ import { ChannelAddress, CurrentData, Utils } from "../../../../../shared/shared
 @Component({
     selector: "energy",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/common/grid/chart/chart.ts b/ui/src/app/edge/history/common/grid/chart/chart.ts
index 08cba19030f..fd47aa2e864 100644
--- a/ui/src/app/edge/history/common/grid/chart/chart.ts
+++ b/ui/src/app/edge/history/common/grid/chart/chart.ts
@@ -13,6 +13,7 @@ import { ChartAnnotationState } from "src/app/shared/type/general";
 @Component({
   selector: "gridchart",
   templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/grid/details/chart/chart.ts b/ui/src/app/edge/history/common/grid/details/chart/chart.ts
index 33f056e342c..683f967e58f 100644
--- a/ui/src/app/edge/history/common/grid/details/chart/chart.ts
+++ b/ui/src/app/edge/history/common/grid/details/chart/chart.ts
@@ -11,6 +11,7 @@ import { ChannelAddress } from "src/app/shared/shared";
 @Component({
   selector: "gridDetailsChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/grid/details/details.overview.ts b/ui/src/app/edge/history/common/grid/details/details.overview.ts
index 421922ae866..e79ce22b6e8 100644
--- a/ui/src/app/edge/history/common/grid/details/details.overview.ts
+++ b/ui/src/app/edge/history/common/grid/details/details.overview.ts
@@ -9,6 +9,7 @@ import { Role } from "src/app/shared/type/role";
 
 @Component({
   templateUrl: "./details.overview.html",
+  standalone: false,
 })
 export class DetailsOverviewComponent extends AbstractHistoryChartOverview {
   protected navigationButtons: NavigationOption[] = [];
diff --git a/ui/src/app/edge/history/common/grid/flat/flat.ts b/ui/src/app/edge/history/common/grid/flat/flat.ts
index bb7d272b6cf..3c6603321ea 100644
--- a/ui/src/app/edge/history/common/grid/flat/flat.ts
+++ b/ui/src/app/edge/history/common/grid/flat/flat.ts
@@ -7,6 +7,7 @@ import { TimeUtils } from "src/app/shared/utils/time/timeutils";
 @Component({
   selector: "gridWidget",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/common/grid/overview/overview.ts b/ui/src/app/edge/history/common/grid/overview/overview.ts
index 20982339233..bf2695525fd 100644
--- a/ui/src/app/edge/history/common/grid/overview/overview.ts
+++ b/ui/src/app/edge/history/common/grid/overview/overview.ts
@@ -10,6 +10,7 @@ import { EdgeConfig, Service } from "src/app/shared/shared";
 
 @Component({
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview {
     protected navigationButtons: NavigationOption[] = [];
diff --git a/ui/src/app/edge/history/common/production/chart/totalChart.ts b/ui/src/app/edge/history/common/production/chart/totalChart.ts
index c378fe61510..4d38fc2f5d1 100644
--- a/ui/src/app/edge/history/common/production/chart/totalChart.ts
+++ b/ui/src/app/edge/history/common/production/chart/totalChart.ts
@@ -10,6 +10,7 @@ import { ChannelAddress } from "../../../../../shared/shared";
 @Component({
   selector: "productionTotalChart",
   templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class TotalChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/production/details/chart/charger.ts b/ui/src/app/edge/history/common/production/details/chart/charger.ts
index 7673bac3ffd..8cd557f5f4c 100644
--- a/ui/src/app/edge/history/common/production/details/chart/charger.ts
+++ b/ui/src/app/edge/history/common/production/details/chart/charger.ts
@@ -9,6 +9,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
   selector: "chargerChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ChargerChartDetailsComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/production/details/chart/productionMeter.ts b/ui/src/app/edge/history/common/production/details/chart/productionMeter.ts
index 634398525b7..448b235211b 100644
--- a/ui/src/app/edge/history/common/production/details/chart/productionMeter.ts
+++ b/ui/src/app/edge/history/common/production/details/chart/productionMeter.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
   selector: "productionMeterChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class ProductionMeterChartDetailsComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/production/details/chart/sum.ts b/ui/src/app/edge/history/common/production/details/chart/sum.ts
index 3f87fbfc389..460e4c85d22 100644
--- a/ui/src/app/edge/history/common/production/details/chart/sum.ts
+++ b/ui/src/app/edge/history/common/production/details/chart/sum.ts
@@ -12,6 +12,7 @@ import { ChannelAddress, EdgeConfig } from "src/app/shared/shared";
 @Component({
   selector: "sumChart",
   templateUrl: "../../../../../../shared/components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class SumChartDetailsComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/production/details/details.overview.ts b/ui/src/app/edge/history/common/production/details/details.overview.ts
index 985d1698b2b..f4c1d893442 100644
--- a/ui/src/app/edge/history/common/production/details/details.overview.ts
+++ b/ui/src/app/edge/history/common/production/details/details.overview.ts
@@ -9,6 +9,7 @@ import { Role } from "src/app/shared/type/role";
 
 @Component({
   templateUrl: "./details.overview.html",
+  standalone: false,
 })
 export class DetailsOverviewComponent extends AbstractHistoryChartOverview {
   protected navigationButtons: NavigationOption[] = [];
diff --git a/ui/src/app/edge/history/common/production/flat/flat.ts b/ui/src/app/edge/history/common/production/flat/flat.ts
index 9b61575701d..a1a7a027273 100644
--- a/ui/src/app/edge/history/common/production/flat/flat.ts
+++ b/ui/src/app/edge/history/common/production/flat/flat.ts
@@ -6,6 +6,7 @@ import { ChannelAddress, EdgeConfig, Utils } from "../../../../../shared/shared"
 @Component({
   selector: "productionWidget",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/common/production/overview/overview.ts b/ui/src/app/edge/history/common/production/overview/overview.ts
index 6f44c4fe37a..6fe174aa285 100644
--- a/ui/src/app/edge/history/common/production/overview/overview.ts
+++ b/ui/src/app/edge/history/common/production/overview/overview.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, EdgeConfig, Service } from "../../../../../shared/share
 
 @Component({
   templateUrl: "./overview.html",
+  standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview {
   protected chargerComponents: EdgeConfig.Component[] = [];
diff --git a/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts b/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts
index cb4efd7b1fc..bcbad38dc1f 100644
--- a/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts
+++ b/ui/src/app/edge/history/common/selfconsumption/chart/chart.component.ts
@@ -9,6 +9,7 @@ import { ChannelAddress } from "src/app/shared/shared";
 @Component({
     selector: "selfconsumptionChart",
     templateUrl: "../../../../../shared/components/chart/abstracthistorychart.html",
+    standalone: false,
 })
 export class ChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts b/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts
index 4cc5d5fe127..f91f1a90ddb 100644
--- a/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts
+++ b/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts
@@ -6,6 +6,7 @@ import { ChannelAddress, CurrentData, Utils } from "src/app/shared/shared";
 @Component({
     selector: "selfconsumptionWidget",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/history/common/selfconsumption/overview/overview.ts b/ui/src/app/edge/history/common/selfconsumption/overview/overview.ts
index 51ed8f95a67..1d850679996 100644
--- a/ui/src/app/edge/history/common/selfconsumption/overview/overview.ts
+++ b/ui/src/app/edge/history/common/selfconsumption/overview/overview.ts
@@ -3,5 +3,6 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 
 @Component({
     templateUrl: "./overview.html",
+    standalone: false,
 })
 export class OverviewComponent extends AbstractHistoryChartOverview { }
diff --git a/ui/src/app/edge/history/delayedselltogrid/chart.component.ts b/ui/src/app/edge/history/delayedselltogrid/chart.component.ts
index 00a29929efc..ce1d4454d4a 100644
--- a/ui/src/app/edge/history/delayedselltogrid/chart.component.ts
+++ b/ui/src/app/edge/history/delayedselltogrid/chart.component.ts
@@ -11,6 +11,7 @@ import { AbstractHistoryChart } from "../abstracthistorychart";
 @Component({
     selector: "delayedselltogridgchart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class DelayedSellToGridChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.ts b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.ts
index b7b4f44eed3..3729f5d1476 100644
--- a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.ts
+++ b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.ts
@@ -5,6 +5,7 @@ import { Edge, EdgeConfig, Service } from "../../../../shared/shared";
 @Component({
     selector: DelayedSellToGridChartOverviewComponent.SELECTOR,
     templateUrl: "./delayedselltogridchartoverview.component.html",
+    standalone: false,
 })
 export class DelayedSellToGridChartOverviewComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/delayedselltogrid/widget.component.ts b/ui/src/app/edge/history/delayedselltogrid/widget.component.ts
index 7d618d15e6e..7a35ef46991 100644
--- a/ui/src/app/edge/history/delayedselltogrid/widget.component.ts
+++ b/ui/src/app/edge/history/delayedselltogrid/widget.component.ts
@@ -6,6 +6,7 @@ import { Edge, EdgeConfig, Service } from "src/app/shared/shared";
 @Component({
     selector: DelayedSellToGridWidgetComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class DelayedSellToGridWidgetComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/heatpump/chart.component.ts b/ui/src/app/edge/history/heatpump/chart.component.ts
index c77225a674e..ae96fd0faf5 100644
--- a/ui/src/app/edge/history/heatpump/chart.component.ts
+++ b/ui/src/app/edge/history/heatpump/chart.component.ts
@@ -14,6 +14,7 @@ import { AbstractHistoryChart } from "../abstracthistorychart";
 @Component({
     selector: "heatpumpchart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class HeatPumpChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.ts b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.ts
index e17887c4e55..ad8a47f7c6e 100644
--- a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.ts
+++ b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.ts
@@ -6,6 +6,7 @@ import { Edge, EdgeConfig, Service } from "../../../../shared/shared";
 @Component({
     selector: HeatPumpChartOverviewComponent.SELECTOR,
     templateUrl: "./heatpumpchartoverview.component.html",
+    standalone: false,
 })
 export class HeatPumpChartOverviewComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/heatpump/widget.component.ts b/ui/src/app/edge/history/heatpump/widget.component.ts
index 90fc211cca5..4df65667abf 100644
--- a/ui/src/app/edge/history/heatpump/widget.component.ts
+++ b/ui/src/app/edge/history/heatpump/widget.component.ts
@@ -10,6 +10,7 @@ import { AbstractHistoryWidget } from "../abstracthistorywidget";
 @Component({
     selector: HeatpumpWidgetComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class HeatpumpWidgetComponent extends AbstractHistoryWidget implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/history.component.ts b/ui/src/app/edge/history/history.component.ts
index 1e872a6bca5..6d61f56adbf 100644
--- a/ui/src/app/edge/history/history.component.ts
+++ b/ui/src/app/edge/history/history.component.ts
@@ -10,6 +10,7 @@ import { environment } from "src/environments";
 @Component({
   selector: "history",
   templateUrl: "./history.component.html",
+  standalone: false,
 })
 export class HistoryComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/historyparent.component.ts b/ui/src/app/edge/history/historyparent.component.ts
index 4a8c28f551a..2042b719c39 100644
--- a/ui/src/app/edge/history/historyparent.component.ts
+++ b/ui/src/app/edge/history/historyparent.component.ts
@@ -7,5 +7,6 @@ import { Component } from "@angular/core";
     <ion-router-outlet>
 </ion-router-outlet>
     `,
+    standalone: false,
 })
 export class HistoryParentComponent { }
diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.ts b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.ts
index 0cac1b4d2f5..780e8a1fed1 100644
--- a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.ts
+++ b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.ts
@@ -5,6 +5,7 @@ import { Edge, EdgeConfig, Service } from "../../../../../shared/shared";
 @Component({
     selector: AsymmetricPeakshavingChartOverviewComponent.SELECTOR,
     templateUrl: "./asymmetricpeakshavingchartoverview.component.html",
+    standalone: false,
 })
 export class AsymmetricPeakshavingChartOverviewComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/chart.component.ts b/ui/src/app/edge/history/peakshaving/asymmetric/chart.component.ts
index aeb02eda9e6..7eb7ea282c2 100644
--- a/ui/src/app/edge/history/peakshaving/asymmetric/chart.component.ts
+++ b/ui/src/app/edge/history/peakshaving/asymmetric/chart.component.ts
@@ -11,6 +11,7 @@ import { AbstractHistoryChart } from "../../abstracthistorychart";
 @Component({
     selector: "asymmetricpeakshavingchart",
     templateUrl: "../../abstracthistorychart.html",
+    standalone: false,
 })
 export class AsymmetricPeakshavingChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts
index 1d58538f990..797a284111d 100644
--- a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts
+++ b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts
@@ -6,6 +6,7 @@ import { Edge, EdgeConfig, Service } from "src/app/shared/shared";
 @Component({
     selector: AsymmetricPeakshavingWidgetComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class AsymmetricPeakshavingWidgetComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/peakshaving/symmetric/chart.component.ts b/ui/src/app/edge/history/peakshaving/symmetric/chart.component.ts
index 25aa0c7cc0b..6371eb8a81d 100644
--- a/ui/src/app/edge/history/peakshaving/symmetric/chart.component.ts
+++ b/ui/src/app/edge/history/peakshaving/symmetric/chart.component.ts
@@ -10,6 +10,7 @@ import { AbstractHistoryChart } from "../../abstracthistorychart";
 @Component({
     selector: "symmetricpeakshavingchart",
     templateUrl: "../../abstracthistorychart.html",
+    standalone: false,
 })
 export class SymmetricPeakshavingChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.ts b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.ts
index 5734f7485cc..1d0a6100573 100644
--- a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.ts
+++ b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.ts
@@ -5,6 +5,7 @@ import { Edge, EdgeConfig, Service } from "../../../../../shared/shared";
 @Component({
     selector: SymmetricPeakshavingChartOverviewComponent.SELECTOR,
     templateUrl: "./symmetricpeakshavingchartoverview.component.html",
+    standalone: false,
 })
 export class SymmetricPeakshavingChartOverviewComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts
index 62f86d76e86..46d6603894a 100644
--- a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts
+++ b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts
@@ -6,6 +6,7 @@ import { Edge, EdgeConfig, Service } from "src/app/shared/shared";
 @Component({
     selector: SymmetricPeakshavingWidgetComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class SymmetricPeakshavingWidgetComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/peakshaving/timeslot/chart.component.ts b/ui/src/app/edge/history/peakshaving/timeslot/chart.component.ts
index f54aad37448..de1ad3e60b3 100644
--- a/ui/src/app/edge/history/peakshaving/timeslot/chart.component.ts
+++ b/ui/src/app/edge/history/peakshaving/timeslot/chart.component.ts
@@ -11,6 +11,7 @@ import { AbstractHistoryChart } from "../../abstracthistorychart";
 @Component({
     selector: "timeslotpeakshavingchart",
     templateUrl: "../../abstracthistorychart.html",
+    standalone: false,
 })
 export class TimeslotPeakshavingChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.ts b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.ts
index c8c2ed8e7f3..828420c1362 100644
--- a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.ts
+++ b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.ts
@@ -5,6 +5,7 @@ import { Edge, EdgeConfig, Service } from "../../../../../shared/shared";
 @Component({
     selector: TimeslotPeakshavingChartOverviewComponent.SELECTOR,
     templateUrl: "./timeslotpeakshavingchartoverview.component.html",
+    standalone: false,
 })
 export class TimeslotPeakshavingChartOverviewComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts
index 7b23394df53..73869c295c8 100644
--- a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts
+++ b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts
@@ -6,6 +6,7 @@ import { Edge, EdgeConfig, Service } from "src/app/shared/shared";
 @Component({
     selector: TimeslotPeakshavingWidgetComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class TimeslotPeakshavingWidgetComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/storage/chargerchart.component.ts b/ui/src/app/edge/history/storage/chargerchart.component.ts
index d13d435b02f..c0cda83dfcb 100644
--- a/ui/src/app/edge/history/storage/chargerchart.component.ts
+++ b/ui/src/app/edge/history/storage/chargerchart.component.ts
@@ -10,6 +10,7 @@ import { AbstractHistoryChart } from "../abstracthistorychart";
 @Component({
     selector: "storageChargerChart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class StorageChargerChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/storage/esschart.component.ts b/ui/src/app/edge/history/storage/esschart.component.ts
index cd83e95a11f..0f41a18dea5 100644
--- a/ui/src/app/edge/history/storage/esschart.component.ts
+++ b/ui/src/app/edge/history/storage/esschart.component.ts
@@ -10,6 +10,7 @@ import { AbstractHistoryChart } from "../abstracthistorychart";
 @Component({
     selector: "storageESSChart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class StorageESSChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/storage/singlechart.component.ts b/ui/src/app/edge/history/storage/singlechart.component.ts
index 7bd11ca1a41..8be7f1ec9ce 100644
--- a/ui/src/app/edge/history/storage/singlechart.component.ts
+++ b/ui/src/app/edge/history/storage/singlechart.component.ts
@@ -7,12 +7,14 @@ import * as Chart from "chart.js";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { ChartAxis, YAxisType } from "src/app/shared/service/utils";
 
+import { ObjectUtils } from "src/app/shared/utils/object/object.utils";
 import { ChannelAddress, Edge, EdgeConfig, Service, Utils } from "../../../shared/shared";
 import { AbstractHistoryChart } from "../abstracthistorychart";
 
 @Component({
     selector: "storageSingleChart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class StorageSingleChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
@@ -155,7 +157,7 @@ export class StorageSingleChartComponent extends AbstractHistoryChart implements
                                         borderColor: "rgba(0,223,0,1)",
                                     });
                                 }
-                                if ("_sum/EssActivePowerL1" && "_sum/EssActivePowerL2" && "_sum/EssActivePowerL3" in result.data && this.showPhases == true) {
+                                if (ObjectUtils.hasKeys(result.data, ["_sum/EssActivePowerL1", "_sum/EssActivePowerL2", "_sum/EssActivePowerL3"]) && this.showPhases == true) {
                                     if (channelAddress.channelId == "EssActivePowerL1") {
                                         datasets.push({
                                             label: this.translate.instant("General.phase") + " " + "L1",
diff --git a/ui/src/app/edge/history/storage/socchart.component.ts b/ui/src/app/edge/history/storage/socchart.component.ts
index 56594dfb119..7d79d1fce72 100644
--- a/ui/src/app/edge/history/storage/socchart.component.ts
+++ b/ui/src/app/edge/history/storage/socchart.component.ts
@@ -11,6 +11,7 @@ import { AbstractHistoryChart } from "../abstracthistorychart";
 @Component({
     selector: "socStorageChart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class SocStorageChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.ts b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.ts
index 9562ad8825a..d774dad9866 100644
--- a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.ts
+++ b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.ts
@@ -6,6 +6,7 @@ import { Edge, EdgeConfig, Service, Utils } from "../../../../shared/shared";
 @Component({
     selector: StorageChartOverviewComponent.SELECTOR,
     templateUrl: "./storagechartoverview.component.html",
+    standalone: false,
 })
 export class StorageChartOverviewComponent implements OnInit {
 
diff --git a/ui/src/app/edge/history/storage/totalchart.component.ts b/ui/src/app/edge/history/storage/totalchart.component.ts
index d385ed25a80..452cae7557b 100644
--- a/ui/src/app/edge/history/storage/totalchart.component.ts
+++ b/ui/src/app/edge/history/storage/totalchart.component.ts
@@ -8,11 +8,13 @@ import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { ChartAxis, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, Edge, EdgeConfig, Service } from "src/app/shared/shared";
 
+import { ObjectUtils } from "src/app/shared/utils/object/object.utils";
 import { AbstractHistoryChart } from "../abstracthistorychart";
 
 @Component({
     selector: "storageTotalChart",
     templateUrl: "../abstracthistorychart.html",
+    standalone: false,
 })
 export class StorageTotalChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
@@ -111,7 +113,7 @@ export class StorageTotalChartComponent extends AbstractHistoryChart implements
                                     borderColor: "rgba(0,223,0,1)",
                                 });
 
-                            } if ("_sum/EssActivePowerL1" && "_sum/EssActivePowerL2" && "_sum/EssActivePowerL3" in result.data && this.showPhases == true) {
+                            } if (ObjectUtils.hasKeys(result.data, ["_sum/EssActivePowerL1", "_sum/EssActivePowerL2", "_sum/EssActivePowerL3"]) && this.showPhases == true) {
                                 if (channelAddress.channelId == "EssActivePowerL1") {
                                     datasets.push({
                                         label: this.translate.instant("General.phase") + " " + "L1",
diff --git a/ui/src/app/edge/history/storage/widget.component.ts b/ui/src/app/edge/history/storage/widget.component.ts
index 9e4b95790f8..0545e1b99ad 100644
--- a/ui/src/app/edge/history/storage/widget.component.ts
+++ b/ui/src/app/edge/history/storage/widget.component.ts
@@ -9,6 +9,7 @@ import { AbstractHistoryWidget } from "../abstracthistorywidget";
 @Component({
     selector: StorageComponent.SELECTOR,
     templateUrl: "./widget.component.html",
+    standalone: false,
 })
 export class StorageComponent extends AbstractHistoryWidget implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts b/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts
index 31414331d27..1998f808a15 100644
--- a/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts
+++ b/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.ts
@@ -8,6 +8,7 @@ import { ChannelAddress, CurrentData } from "../../../../shared/shared";
 @Component({
   selector: "Controller_Channelthreshold",
   templateUrl: "./Channelthreshold.html",
+  standalone: false,
 })
 export class Controller_ChannelthresholdComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.ts b/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.ts
index 00699abec1c..0c0d5ef3256 100644
--- a/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.ts
+++ b/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.ts
@@ -9,6 +9,7 @@ import { Controller_ChpSocModalComponent } from "./modal/modal.component";
 @Component({
     selector: "Controller_ChpSocComponent",
     templateUrl: "./ChpSoc.html",
+    standalone: false,
 })
 export class Controller_ChpSocComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.ts b/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.ts
index 0c557361d5a..be0198c29c6 100644
--- a/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.ts
@@ -12,6 +12,7 @@ type mode = "MANUAL_ON" | "MANUAL_OFF" | "AUTOMATIC";
 @Component({
     selector: Controller_ChpSocModalComponent.SELECTOR,
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class Controller_ChpSocModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.ts b/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.ts
index 73429cc8694..54d587f1acf 100644
--- a/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.ts
@@ -9,6 +9,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
   selector: "Controller_Ess_FixActivePower",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.ts b/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.ts
index 8e1c941963a..aa3b6d7ece7 100644
--- a/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.ts
@@ -6,6 +6,7 @@ import { ChannelAddress, CurrentData, Utils } from "src/app/shared/shared";
 
 @Component({
   templateUrl: "./modal.html",
+  standalone: false,
 })
 export class ModalComponent extends AbstractModal {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.ts b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.ts
index 6ba344dd692..8e1f7725825 100644
--- a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.ts
@@ -8,6 +8,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
     selector: "Controller_Ess_GridOptimizedCharge",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.ts b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.ts
index c13073bbc2a..82b9a472a39 100644
--- a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/modal.ts
@@ -8,6 +8,7 @@ import { Role } from "src/app/shared/type/role";
 @Component({
     templateUrl: "./modal.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class ModalComponent extends AbstractModal {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/predictionChart.ts b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/predictionChart.ts
index 15ff02bd65f..83123d70ca9 100644
--- a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/predictionChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/modal/predictionChart.ts
@@ -12,6 +12,7 @@ import { ChannelAddress, Edge, EdgeConfig, Service, Utils } from "src/app/shared
 @Component({
     selector: "predictionChart",
     templateUrl: "../../../../../history/abstracthistorychart.html",
+    standalone: false,
 })
 export class PredictionChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.ts
index 83ea71a2b00..4433bd5c2c3 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.ts
@@ -8,6 +8,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
     selector: "Controller_Ess_TimeOfUseTariff",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.ts
index 99819a9d13b..cf2594246f6 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/modal.ts
@@ -7,6 +7,7 @@ import { Controller_Ess_TimeOfUseTariff } from "../Ess_TimeOfUseTariff";
 
 @Component({
     templateUrl: "./modal.html",
+    standalone: false,
 })
 export class ModalComponent extends AbstractModal {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
index 596be299463..1814b01ed84 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
@@ -16,6 +16,7 @@ import { GetScheduleResponse } from "../../../../../../shared/jsonrpc/response/g
 @Component({
     selector: "powerSocChart",
     templateUrl: "../../../../../history/abstracthistorychart.html",
+    standalone: false,
 })
 export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
index f5a9e6748b3..01a05d4f923 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
@@ -19,6 +19,7 @@ import { Controller_Ess_TimeOfUseTariff } from "../Ess_TimeOfUseTariff";
 @Component({
     selector: "statePriceChart",
     templateUrl: "../../../../../history/abstracthistorychart.html",
+    standalone: false,
 })
 export class ScheduleStateAndPriceChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
 
diff --git a/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.ts b/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.ts
index 3e38be561f1..172a7e42cfa 100644
--- a/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.ts
@@ -7,6 +7,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "../../../../../shared/shar
 @Component({
   selector: AdministrationComponent.SELECTOR,
   templateUrl: "./administration.component.html",
+  standalone: false,
 })
 export class AdministrationComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts b/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts
index 19520cb0e68..b72c031a05d 100644
--- a/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/flat/flat.ts
@@ -12,6 +12,7 @@ type ChargeMode = "FORCE_CHARGE" | "EXCESS_POWER" | "OFF";
 @Component({
   selector: "Controller_Evcs",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts b/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts
index e4019eee0c6..07fd36f1ef1 100644
--- a/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/modal/modal.ts
@@ -14,6 +14,7 @@ import { PopoverComponent } from "../popover/popover";
 type ChargeMode = "FORCE_CHARGE" | "EXCESS_POWER";
 @Component({
   templateUrl: "./modal.html",
+  standalone: false,
 })
 export class ModalComponent extends AbstractModal {
 
diff --git a/ui/src/app/edge/live/Controller/Evcs/popover/popover.ts b/ui/src/app/edge/live/Controller/Evcs/popover/popover.ts
index 718bdb5d868..c7913cba287 100644
--- a/ui/src/app/edge/live/Controller/Evcs/popover/popover.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/popover/popover.ts
@@ -5,6 +5,7 @@ import { AbstractModal } from "src/app/shared/components/modal/abstractModal";
 type ChargeMode = "FORCE_CHARGE" | "EXCESS_POWER" | "OFF";
 @Component({
     templateUrl: "./popover.html",
+    standalone: false,
 })
 
 export class PopoverComponent extends AbstractModal {
diff --git a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.ts b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.ts
index b2ac0822479..25648cf2dce 100644
--- a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.ts
+++ b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold.ts
@@ -3,11 +3,13 @@ import { Component } from "@angular/core";
 import { AbstractFlatWidget } from "src/app/shared/components/flat/abstract-flat-widget";
 import { ChannelAddress, CurrentData, Utils } from "src/app/shared/shared";
 import { Icon } from "src/app/shared/type/widget";
+import { StringUtils } from "src/app/shared/utils/string/string.utils";
 import { Controller_Io_ChannelSingleThresholdModalComponent } from "./modal/modal.component";
 
 @Component({
   selector: "Controller_Io_ChannelSingleThresholdComponent",
   templateUrl: "./Io_ChannelSingleThreshold.html",
+  standalone: false,
 })
 export class Controller_Io_ChannelSingleThresholdComponent extends AbstractFlatWidget {
 
@@ -143,9 +145,10 @@ export class Controller_Io_ChannelSingleThresholdComponent extends AbstractFlatW
     }
 
     // True when InputAddress doesnt match any of the following channelIds
-    this.isOtherInputAddress = this.inputChannel.toString() != (null && "_sum/EssSoc" && "_sum/GridActivePower" && "_sum/ProductionActivePower") ? false : true;
+    this.isOtherInputAddress = StringUtils.isNotIn(this.inputChannel.toString(),
+      [null, "_sum/EssSoc", "_sum/GridActivePower", "_sum/ProductionActivePower"]);
 
-    // Switch ON / OFF && BELOW / ABOVE
+    // Switch ON / OF,&& BELOW / ABOVE
     // Threshold greater 0
     if (this.component.properties.threshold > 0) {
 
diff --git a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html
index d56a02325d6..49b85982a56 100644
--- a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.html
@@ -88,10 +88,9 @@
                   <ion-row>
                     <ion-col class="ion-no-padding" size="12">
                       <ion-item lines="none" class="noPadding">
-                        <ion-label class="regularFont" translate>Edge.Index.Widgets.Singlethreshold.dependendOn
-                        </ion-label>
                         <ion-select formControlName="inputMode" [value]="inputMode.value"
-                          (ionChange)="updateInputMode($event)">
+                          (ionChange)="updateInputMode($event)"
+                          [label]="'Edge.Index.Widgets.Singlethreshold.dependendOn' | translate">
                           <ion-select-option value="SOC" translate>General.soc</ion-select-option>
                           <ion-select-option value="PRODUCTION" translate>General.production</ion-select-option>
                           <ion-select-option value="GRIDSELL" translate>General.gridSell</ion-select-option>
@@ -113,9 +112,8 @@
                       <td style="width: 35%" class="align_right">
                         <ion-item lines="inset" class="noPadding">
                           <ion-input class="regularFont" type="number" formControlName="switchedLoadPower"
-                            style="text-align: end;">
+                            style="text-align: end;" label="&nbsp;W" class="regularFont">
                           </ion-input>
-                          <ion-label class="regularFont">&nbsp;W</ion-label>
                         </ion-item>
                       </td>
                     </tr>
@@ -193,15 +191,11 @@
                       <td style="width: 35%" class="align_right">
                         <ion-item lines="inset" class="noPadding">
                           <ion-input class="regularFont" style="text-align: end;" type="number"
-                            formControlName="threshold">
+                            formControlName="threshold"
+                            [label]="inputMode.value !== 'OTHER' 
+                            ? '&nbsp;W' 
+                            : ((inputMode.value === 'OTHER' && inputChannelUnit) ? '&nbsp;{{ inputChannelUnit }}' : '')" class="regularFont">
                           </ion-input>
-                          <ion-label *ngIf="inputMode.value !== 'OTHER'" class="regularFont">&nbsp;W
-                          </ion-label>
-                          <ion-label *ngIf="inputMode.value === 'OTHER'" class="regularFont">
-                            <div *ngIf="inputChannelUnit">
-                              &nbsp;{{ inputChannelUnit }}
-                            </div>
-                          </ion-label>
                         </ion-item>
                       </td>
                     </tr>
diff --git a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.ts b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.ts
index 738b4c396bc..52f67095c23 100644
--- a/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/Io/ChannelSingleThreshold/modal/modal.component.ts
@@ -11,6 +11,7 @@ type inputMode = "SOC" | "GRIDSELL" | "GRIDBUY" | "PRODUCTION" | "OTHER";
 @Component({
   selector: "Io_ChannelSingleThresholdModalComponent",
   templateUrl: "./modal.component.html",
+  standalone: false,
 })
 export class Controller_Io_ChannelSingleThresholdModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.ts b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.ts
index b45630af970..89f686ed24f 100644
--- a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.ts
+++ b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.ts
@@ -8,6 +8,7 @@ import { Controller_Io_FixDigitalOutputModalComponent } from "./modal/modal.comp
 @Component({
   selector: "Controller_Io_FixDigitalOutput",
   templateUrl: "./Io_FixDigitalOutput.html",
+  standalone: false,
 })
 export class Controller_Io_FixDigitalOutputComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.ts b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.ts
index ccc9dafd2b2..0fcb5416eca 100644
--- a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.ts
@@ -7,6 +7,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "src/app/shared/shared";
 @Component({
   selector: "fixdigitaloutput-modal",
   templateUrl: "./modal.component.html",
+  standalone: false,
 })
 export class Controller_Io_FixDigitalOutputModalComponent {
 
diff --git a/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.ts b/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.ts
index 732c697cb1a..b54cec5b791 100644
--- a/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.ts
@@ -10,6 +10,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
     selector: "Controller_Io_HeatingElement",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.ts b/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.ts
index 8a9bd6ad535..4bf0cb81771 100644
--- a/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.ts
@@ -9,6 +9,7 @@ import { Mode, WorkMode } from "src/app/shared/type/general";
 @Component({
     selector: "heatingelement-modal",
     templateUrl: "./modal.html",
+    standalone: false,
 })
 export class ModalComponent extends AbstractModal implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.ts b/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.ts
index 3962850c043..eb0c6a769b2 100644
--- a/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.ts
+++ b/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.ts
@@ -9,6 +9,7 @@ import { Controller_Io_HeatpumpModalComponent } from "./modal/modal.component";
 @Component({
   selector: "Controller_Io_Heatpump",
   templateUrl: "./Io_Heatpump.html",
+  standalone: false,
 })
 export class Controller_Io_HeatpumpComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html
index c83b36d9ad5..7d3e87bb60f 100644
--- a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html
@@ -127,9 +127,8 @@
                 <ion-item class="ion-no-padding" lines="inset">
                   <ion-input id="automaticRecommendationSurplusPower"
                     formControlName="automaticRecommendationSurplusPower" class="regularFont" type="number"
-                    style="text-align: end;">
+                    style="text-align: end;" label="&nbsp;W">
                   </ion-input>
-                  <ion-label class="regularFont">&nbsp;W</ion-label>
                 </ion-item>
               </td>
             </tr>
@@ -164,9 +163,8 @@
                 <td style="width: 35%" class="align_right">
                   <ion-item class="ion-no-padding" lines="inset">
                     <ion-input type="number" formControlName="automaticForceOnSurplusPower" class="regularFont"
-                      style="text-align: end;">
+                      style="text-align: end;" label="&nbsp;W">
                     </ion-input>
-                    <ion-label class="regularFont">&nbsp;W</ion-label>
                   </ion-item>
                 </td>
               </tr>
@@ -220,9 +218,8 @@
                 <td style="width: 35%" class="align_right">
                   <ion-item class="ion-no-padding" lines="inset">
                     <ion-input type="number" formControlName="automaticLockGridBuyPower" class="regularFont"
-                      style="text-align: end;">
+                      style="text-align: end;" label="&nbsp;W">
                     </ion-input>
-                    <ion-label class="regularFont">&nbsp;W</ion-label>
                   </ion-item>
                 </td>
               </tr>
@@ -259,9 +256,8 @@
               <td style="width: 35%" class="align_right">
                 <ion-item lines="inset" class="ion-no-padding">
                   <ion-input formControlName="minimumSwitchingTime" class="regularFont" type="number"
-                    style="text-align: end;">
+                    style="text-align: end;" label="&nbsp;s" class="regularFont">
                   </ion-input>
-                  <ion-label class="regularFont">&nbsp;s</ion-label>
                 </ion-item>
               </td>
             </tr>
diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.ts b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.ts
index d12d02ab21b..d39875d0339 100644
--- a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.ts
@@ -11,6 +11,7 @@ type AutomaticEnableMode = "automaticRecommendationCtrlEnabled" | "automaticForc
 @Component({
   selector: "heatpump-modal",
   templateUrl: "./modal.component.html",
+  standalone: false,
 })
 export class Controller_Io_HeatpumpModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.ts b/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.ts
index 89b23b86751..deae63a8046 100644
--- a/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.ts
+++ b/ui/src/app/edge/live/Controller/ModbusTcpApi/flat/flat.ts
@@ -7,6 +7,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
   selector: "Controller_Api_ModbusTcp",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts b/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts
index ae11a7a121a..c4a8ef62502 100644
--- a/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts
@@ -8,6 +8,7 @@ import { OverrideStatus } from "src/app/shared/type/general";
 
 @Component({
   templateUrl: "./modal.html",
+  standalone: false,
 })
 export class ModalComponent extends AbstractModal {
 
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.ts b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.ts
index 569e45069ed..fb73b321cbb 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.ts
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.ts
@@ -9,6 +9,7 @@ import { Controller_Asymmetric_PeakShavingModalComponent } from "./modal/modal.c
 @Component({
     selector: "Controller_Asymmetric_PeakShaving",
     templateUrl: "./Asymmetric.html",
+    standalone: false,
 })
 export class Controller_Asymmetric_PeakShavingComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html
index d8ec1e36904..0f99848add1 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html
@@ -76,9 +76,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" formControlName="peakShavingPower"
-                                    style="text-align: end;" type="number">
+                                    style="text-align: end;" type="number" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
@@ -91,9 +90,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" formControlName="rechargePower" style="text-align: end;"
-                                    type="number">
+                                    type="number" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.ts b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.ts
index d00c47f25d5..8af40cc8ad5 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.ts
@@ -9,6 +9,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "../../../../../../shared/s
 @Component({
     selector: "asymmetricpeakshaving-modal",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class Controller_Asymmetric_PeakShavingModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.ts b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.ts
index 330b0ed6a28..174f017ee8f 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.ts
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.ts
@@ -8,6 +8,7 @@ import { Controller_Symmetric_PeakShavingModalComponent } from "./modal/modal.co
 @Component({
     selector: "Controller_Symmetric_PeakShaving",
     templateUrl: "./Symmetric.html",
+    standalone: false,
 })
 export class Controller_Symmetric_PeakShavingComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html
index 67f2e47adb3..25ec2b0d9dc 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html
@@ -38,9 +38,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="peakShavingPower"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
@@ -53,9 +52,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="rechargePower"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.ts b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.ts
index aa2f498dc60..64540de15a8 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.ts
@@ -8,6 +8,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "../../../../../../shared/s
 @Component({
     selector: "symmetricpeakshaving-modal",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class Controller_Symmetric_PeakShavingModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.ts b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.ts
index 22c4eb19193..79aed0a9bce 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.ts
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.ts
@@ -8,6 +8,7 @@ import { Controller_Symmetric_TimeSlot_PeakShavingModalComponent } from "./modal
 @Component({
     selector: "Controller_Symmetric_TimeSlot_PeakShaving",
     templateUrl: "./Symmetric_TimeSlot.html",
+    standalone: false,
 })
 export class Controller_Symmetric_TimeSlot_PeakShavingComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html
index d191ab545f2..e997871f447 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html
@@ -38,9 +38,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="peakShavingPower"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
@@ -53,9 +52,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="rechargePower"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
@@ -124,9 +122,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="slowChargePower"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.ts b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.ts
index 21f16820d4b..7b430fea13e 100644
--- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.ts
@@ -8,6 +8,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "../../../../../../shared/s
 @Component({
     selector: "timeslotpeakshaving-modal",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class Controller_Symmetric_TimeSlot_PeakShavingModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.ts b/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.ts
index 091f47eff6c..27f9de5e63f 100644
--- a/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.ts
+++ b/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.ts
@@ -7,6 +7,7 @@ import { Io_Api_DigitalInput_ModalComponent } from "./modal/modal.component";
 @Component({
     selector: "Io_Api_DigitalInput",
     templateUrl: "./Io_Api_DigitalInput.html",
+    standalone: false,
 })
 
 export class Io_Api_DigitalInputComponent extends AbstractFlatWidget {
diff --git a/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts b/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts
index 199010f1217..fab03412088 100644
--- a/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts
+++ b/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts
@@ -9,6 +9,7 @@ import { ChannelAddress, Edge, EdgeConfig, EdgePermission, Service, Websocket }
 @Component({
     selector: "Io_Api_DigitalInputModal",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class Io_Api_DigitalInput_ModalComponent implements OnInit, OnDestroy {
     private static readonly SELECTOR = "Io_Api_DigitalInput_ModalComponent";
diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts
index 0fa1fbf2ea2..67bd4084235 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts
@@ -8,6 +8,7 @@ import { Evcs_Api_ClusterModalComponent } from "./modal/evcsCluster-modal.page";
 @Component({
   selector: "Evcs_Api_Cluster",
   templateUrl: "./Evcs_Api_Cluster.html",
+  standalone: false,
 })
 export class Evcs_Api_ClusterComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts
index f58fe7b24a2..e4a707c112b 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts
@@ -10,6 +10,7 @@ import { Edge, EdgeConfig } from "src/app/shared/shared";
 @Component({
   selector: EvcsChartComponent.SELECTOR,
   templateUrl: "./evcs.chart.html",
+  standalone: false,
 })
 export class EvcsChartComponent implements OnInit, OnChanges {
 
diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts
index 3fbac0a50c9..85c81d5e17e 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts
@@ -11,6 +11,7 @@ type Priority = "CAR" | "STORAGE";
 @Component({
     selector: "Evcs_Api_Cluster-modal",
     templateUrl: "./evcsCluster-modal.page.html",
+    standalone: false,
 })
 export class Evcs_Api_ClusterModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/common/autarchy/flat/flat.ts b/ui/src/app/edge/live/common/autarchy/flat/flat.ts
index e9620384f0e..742fbccf7b4 100644
--- a/ui/src/app/edge/live/common/autarchy/flat/flat.ts
+++ b/ui/src/app/edge/live/common/autarchy/flat/flat.ts
@@ -7,6 +7,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
   selector: "Common_Autarchy",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/common/autarchy/modal/modal.ts b/ui/src/app/edge/live/common/autarchy/modal/modal.ts
index 15ed4d35841..246a6cc3682 100644
--- a/ui/src/app/edge/live/common/autarchy/modal/modal.ts
+++ b/ui/src/app/edge/live/common/autarchy/modal/modal.ts
@@ -6,6 +6,7 @@ import { Role } from "src/app/shared/type/role";
 
 @Component({
   templateUrl: "../../../../../shared/components/formly/formly-field-modal/template.html",
+  standalone: false,
 })
 export class ModalComponent extends AbstractFormlyComponent {
 
diff --git a/ui/src/app/edge/live/common/consumption/flat/flat.ts b/ui/src/app/edge/live/common/consumption/flat/flat.ts
index 58c13f96316..259ca5bb040 100644
--- a/ui/src/app/edge/live/common/consumption/flat/flat.ts
+++ b/ui/src/app/edge/live/common/consumption/flat/flat.ts
@@ -7,6 +7,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
   selector: "consumption",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/common/consumption/modal/modal.ts b/ui/src/app/edge/live/common/consumption/modal/modal.ts
index a228215317f..5dfda3b57ce 100644
--- a/ui/src/app/edge/live/common/consumption/modal/modal.ts
+++ b/ui/src/app/edge/live/common/consumption/modal/modal.ts
@@ -10,6 +10,7 @@ import { ChannelAddress, CurrentData, EdgeConfig } from "../../../../../shared/s
 
 @Component({
   templateUrl: "../../../../../shared/components/formly/formly-field-modal/template.html",
+  standalone: false,
 })
 export class ModalComponent extends AbstractFormlyComponent {
 
diff --git a/ui/src/app/edge/live/common/grid/flat/flat.ts b/ui/src/app/edge/live/common/grid/flat/flat.ts
index 64bc50f0ff6..64f2981273c 100644
--- a/ui/src/app/edge/live/common/grid/flat/flat.ts
+++ b/ui/src/app/edge/live/common/grid/flat/flat.ts
@@ -10,6 +10,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
   selector: "grid",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/common/grid/modal/modal.ts b/ui/src/app/edge/live/common/grid/modal/modal.ts
index 4c4d857063f..3fdca6d5a3d 100644
--- a/ui/src/app/edge/live/common/grid/modal/modal.ts
+++ b/ui/src/app/edge/live/common/grid/modal/modal.ts
@@ -11,6 +11,7 @@ import { GridSectionComponent } from "../../../energymonitor/chart/section/grid.
 
 @Component({
   templateUrl: "../../../../../shared/components/formly/formly-field-modal/template.html",
+  standalone: false,
 })
 export class ModalComponent extends AbstractFormlyComponent {
 
diff --git a/ui/src/app/edge/live/common/production/flat/flat.ts b/ui/src/app/edge/live/common/production/flat/flat.ts
index 678ef3f8c87..6e0fe1c96de 100644
--- a/ui/src/app/edge/live/common/production/flat/flat.ts
+++ b/ui/src/app/edge/live/common/production/flat/flat.ts
@@ -6,6 +6,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
     selector: "Common_Production",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/common/production/modal/modal.ts b/ui/src/app/edge/live/common/production/modal/modal.ts
index 013ab5b5307..49192686bb4 100644
--- a/ui/src/app/edge/live/common/production/modal/modal.ts
+++ b/ui/src/app/edge/live/common/production/modal/modal.ts
@@ -4,6 +4,7 @@ import { ChannelAddress, EdgeConfig, Utils } from "src/app/shared/shared";
 
 @Component({
     templateUrl: "./modal.html",
+    standalone: false,
 })
 export class ModalComponent extends AbstractModal {
 
diff --git a/ui/src/app/edge/live/common/selfconsumption/flat/flat.ts b/ui/src/app/edge/live/common/selfconsumption/flat/flat.ts
index f1bf518f2b2..188d9e11aaa 100644
--- a/ui/src/app/edge/live/common/selfconsumption/flat/flat.ts
+++ b/ui/src/app/edge/live/common/selfconsumption/flat/flat.ts
@@ -8,6 +8,7 @@ import { ModalComponent } from "../modal/modal";
 @Component({
     selector: "Common_Selfconsumption",
     templateUrl: "./flat.html",
+    standalone: false,
 })
 export class FlatComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/common/selfconsumption/modal/modal.ts b/ui/src/app/edge/live/common/selfconsumption/modal/modal.ts
index 81894e904dd..acf5ac8ca75 100644
--- a/ui/src/app/edge/live/common/selfconsumption/modal/modal.ts
+++ b/ui/src/app/edge/live/common/selfconsumption/modal/modal.ts
@@ -6,6 +6,7 @@ import { Role } from "src/app/shared/type/role";
 
 @Component({
     templateUrl: "../../../../../shared/components/formly/formly-field-modal/template.html",
+    standalone: false,
 })
 export class ModalComponent extends AbstractFormlyComponent {
 
diff --git a/ui/src/app/edge/live/common/storage/modal/modal.component.ts b/ui/src/app/edge/live/common/storage/modal/modal.component.ts
index 6ce266a1401..f8fac38aade 100644
--- a/ui/src/app/edge/live/common/storage/modal/modal.component.ts
+++ b/ui/src/app/edge/live/common/storage/modal/modal.component.ts
@@ -10,6 +10,7 @@ import { Role } from "src/app/shared/type/role";
 @Component({
     selector: "storage-modal",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class StorageModalComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/common/storage/storage.component.ts b/ui/src/app/edge/live/common/storage/storage.component.ts
index 8114c49b3b3..ec5a421b465 100644
--- a/ui/src/app/edge/live/common/storage/storage.component.ts
+++ b/ui/src/app/edge/live/common/storage/storage.component.ts
@@ -2,7 +2,7 @@
 import { formatNumber } from "@angular/common";
 import { Component } from "@angular/core";
 import { AbstractFlatWidget } from "src/app/shared/components/flat/abstract-flat-widget";
-import { CurrentData , ChannelAddress, EdgeConfig, Utils } from "src/app/shared/shared";
+import { ChannelAddress, CurrentData, EdgeConfig, Utils } from "src/app/shared/shared";
 import { DateUtils } from "src/app/shared/utils/date/dateutils";
 
 import { StorageModalComponent } from "./modal/modal.component";
@@ -10,6 +10,7 @@ import { StorageModalComponent } from "./modal/modal.component";
 @Component({
     selector: "storage",
     templateUrl: "./storage.component.html",
+    standalone: false,
 })
 export class StorageComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.ts b/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.ts
index 89febc1abd0..4710015a124 100644
--- a/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.ts
+++ b/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.ts
@@ -9,6 +9,7 @@ import { DelayedSellToGridModalComponent } from "./modal/modal.component";
 @Component({
     selector: DelayedSellToGridComponent.SELECTOR,
     templateUrl: "./delayedselltogrid.component.html",
+    standalone: false,
 })
 export class DelayedSellToGridComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html
index 6cc42a2c887..5d23d380fc2 100644
--- a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html
+++ b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html
@@ -22,9 +22,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="sellToGridPowerLimit"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
@@ -39,9 +38,8 @@
                         <td style="width: 35%" class="align_right">
                             <ion-item lines="inset" class="noPadding">
                                 <ion-input class="regularFont" type="number" formControlName="continuousSellToGridPower"
-                                    style="text-align: end;">
+                                    style="text-align: end;" label="&nbsp;W">
                                 </ion-input>
-                                <ion-label class="regularFont">&nbsp;W</ion-label>
                             </ion-item>
                         </td>
                     </tr>
diff --git a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.ts b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.ts
index b688531b982..f9207df30f4 100644
--- a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.ts
+++ b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.ts
@@ -8,6 +8,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "../../../../shared/shared"
 @Component({
     selector: DelayedSellToGridModalComponent.SELECTOR,
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class DelayedSellToGridModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/chart.component.ts b/ui/src/app/edge/live/energymonitor/chart/chart.component.ts
index f0852e5d2f4..7d03dd28c23 100644
--- a/ui/src/app/edge/live/energymonitor/chart/chart.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/chart.component.ts
@@ -12,6 +12,7 @@ import { StorageSectionComponent } from "./section/storage.component";
 @Component({
   selector: "energymonitor-chart",
   templateUrl: "./chart.component.html",
+  standalone: false,
 })
 export class EnergymonitorChartComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.ts
index 440054a0768..e5f09134931 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.ts
@@ -24,6 +24,7 @@ import { AbstractSection, EnergyFlow, Ratio, SvgEnergyFlow, SvgSquare, SvgSquare
             transition("hide => show", animate("0ms ease-in")),
         ]),
     ],
+    standalone: false,
 })
 export class ConsumptionSectionComponent extends AbstractSection implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts
index baf47a15e73..05d70bb9f76 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.ts
@@ -37,6 +37,7 @@ import { AbstractSection, EnergyFlow, Ratio, SvgEnergyFlow, SvgSquare, SvgSquare
             transition("hide => show", animate("0ms ease-in")),
         ]),
     ],
+    standalone: false,
 })
 export class GridSectionComponent extends AbstractSection implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts
index 30b801b926a..3bdc163621c 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/section/production.component.ts
@@ -24,6 +24,7 @@ import { AbstractSection, EnergyFlow, Ratio, SvgEnergyFlow, SvgSquare, SvgSquare
             transition("hide => show", animate("0ms ease-in")),
         ]),
     ],
+    standalone: false,
 })
 export class ProductionSectionComponent extends AbstractSection implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/energymonitor/chart/section/storage.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/storage.component.ts
index e98c6d563cf..8ea180fc516 100644
--- a/ui/src/app/edge/live/energymonitor/chart/section/storage.component.ts
+++ b/ui/src/app/edge/live/energymonitor/chart/section/storage.component.ts
@@ -37,6 +37,7 @@ import { AbstractSection, EnergyFlow, Ratio, SvgEnergyFlow, SvgSquare, SvgSquare
             transition("hide => show", animate("0ms ease-out")),
         ]),
     ],
+    standalone: false,
 })
 export class StorageSectionComponent extends AbstractSection implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/energymonitor/energymonitor.component.ts b/ui/src/app/edge/live/energymonitor/energymonitor.component.ts
index 7c0a4577362..00d82018d69 100644
--- a/ui/src/app/edge/live/energymonitor/energymonitor.component.ts
+++ b/ui/src/app/edge/live/energymonitor/energymonitor.component.ts
@@ -6,6 +6,7 @@ import { ChannelAddress, Edge, Service, Websocket } from "../../../shared/shared
 @Component({
   selector: EnergymonitorComponent.SELECTOR,
   templateUrl: "./energymonitor.component.html",
+  standalone: false,
 })
 export class EnergymonitorComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/live/info/info.component.ts b/ui/src/app/edge/live/info/info.component.ts
index 92da7235422..c092e02ddc8 100644
--- a/ui/src/app/edge/live/info/info.component.ts
+++ b/ui/src/app/edge/live/info/info.component.ts
@@ -3,5 +3,6 @@ import { Component } from "@angular/core";
 @Component({
     selector: "info",
     templateUrl: "./info.component.html",
+    standalone: false,
 })
 export class InfoComponent { }
diff --git a/ui/src/app/edge/live/live.component.ts b/ui/src/app/edge/live/live.component.ts
index 81862c57d49..5d8ca28f8f5 100644
--- a/ui/src/app/edge/live/live.component.ts
+++ b/ui/src/app/edge/live/live.component.ts
@@ -9,6 +9,7 @@ import { DateTimeUtils } from "src/app/shared/utils/datetime/datetime-utils";
 @Component({
   selector: "live",
   templateUrl: "./live.component.html",
+  standalone: false,
 })
 export class LiveComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/settings/alerting/alerting.component.html b/ui/src/app/edge/settings/alerting/alerting.component.html
index f674bd30749..434cce275e7 100644
--- a/ui/src/app/edge/settings/alerting/alerting.component.html
+++ b/ui/src/app/edge/settings/alerting/alerting.component.html
@@ -20,7 +20,7 @@
           <ion-item lines="full" color="light">
             <ion-icon slot="start" name="settings-outline" color="primary"></ion-icon>
             <ion-label>
-              <span>{{user.name}}</span>
+              <span>{{user.userLogin}}</span>
             </ion-label>
             <oe-help-button key="SETTINGS_ALERTING"></oe-help-button>
           </ion-item>
@@ -57,7 +57,7 @@
                     </ion-col>
                     <ion-col size="6">
                       <ion-select *ngIf="cuser.isOfflineActive" class="custom-options" interface="popover"
-                        formControlName="offlineEdgeDelay">
+                        formControlName="offlineEdgeDelay" [label]="'Edge.Config.ALERTING.OFFLINE' | translate">
                         <ion-select-option *ngFor="let option of defaultValues[AlertingType.offline]"
                           [value]="option.value">
                           {{option.label}}
diff --git a/ui/src/app/edge/settings/alerting/alerting.component.ts b/ui/src/app/edge/settings/alerting/alerting.component.ts
index 865420ec5bc..a4e6f4c2c64 100644
--- a/ui/src/app/edge/settings/alerting/alerting.component.ts
+++ b/ui/src/app/edge/settings/alerting/alerting.component.ts
@@ -22,6 +22,7 @@ type DetailedAlertingSetting = AlertingSetting & { isOfflineActive: boolean, isF
 @Component({
   selector: AlertingComponent.SELECTOR,
   templateUrl: "./alerting.component.html",
+  standalone: false,
 })
 export class AlertingComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/app/formly/formly-text.ts b/ui/src/app/edge/settings/app/formly/formly-text.ts
index d8fe8a1c681..f1f2532e0dc 100644
--- a/ui/src/app/edge/settings/app/formly/formly-text.ts
+++ b/ui/src/app/edge/settings/app/formly/formly-text.ts
@@ -10,6 +10,7 @@ import { FieldType, FieldTypeConfig } from "@ngx-formly/core";
     </ion-item>
     `,
     encapsulation: ViewEncapsulation.None,
+    standalone: false,
 })
 export class FormlyTextComponent extends FieldType<FieldTypeConfig> {
 
diff --git a/ui/src/app/edge/settings/app/formly/input-with-unit.ts b/ui/src/app/edge/settings/app/formly/input-with-unit.ts
index 12852b9c35a..8e50c740538 100644
--- a/ui/src/app/edge/settings/app/formly/input-with-unit.ts
+++ b/ui/src/app/edge/settings/app/formly/input-with-unit.ts
@@ -15,5 +15,6 @@ import { FieldWrapper } from "@ngx-formly/core";
         </ion-row>
     </ion-grid>
 `,
+    standalone: false,
 })
 export class FormlyInputWithUnitComponent extends FieldWrapper { }
diff --git a/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts b/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts
index 0e0ec8e1f60..dee315e6bcf 100644
--- a/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts
+++ b/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts
@@ -6,6 +6,7 @@ import { Option, OptionGroup, OptionGroupConfig, getTitleFromOptionConfig } from
 @Component({
     selector: "formly-option-group-picker",
     templateUrl: "./formly-option-group-picker.component.html",
+    standalone: false,
 })
 export class FormlyOptionGroupPickerComponent extends FieldType<FieldTypeConfig> implements OnInit {
 
diff --git a/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.ts b/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.ts
index 808171892bb..69210c13941 100644
--- a/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.ts
+++ b/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.ts
@@ -6,6 +6,7 @@ import { FieldType, FieldTypeConfig, FormlyFieldConfig, FormlyFieldProps } from
 @Component({
     selector: "reorder-array",
     templateUrl: "./formly-reorder-array.component.html",
+    standalone: false,
 })
 export class FormlyReorderArrayComponent extends FieldType<FieldTypeConfig<FormlyFieldProps & {
     allowDuplicates?: boolean,
diff --git a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.ts b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.ts
index 09429469287..d9d23a9bf5e 100644
--- a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.ts
+++ b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.ts
@@ -7,6 +7,7 @@ import { FormlyFieldConfig } from "@ngx-formly/core";
 @Component({
     selector: "formly-safe-input-modal",
     templateUrl: "./formly-safe-input-modal.component.html",
+    standalone: false,
 })
 export class FormlySafeInputModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts
index cf4d9ebbf40..a026b275e82 100644
--- a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts
+++ b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts
@@ -9,6 +9,7 @@ import { FormlySafeInputModalComponent } from "./formly-safe-input-modal.compone
 @Component({
     selector: "formly-safe-input-wrapper",
     templateUrl: "./formly-safe-input.extended.html",
+    standalone: false,
 })
 export class FormlySafeInputWrapperComponent extends FieldWrapper implements OnInit {
 
diff --git a/ui/src/app/edge/settings/app/index.component.ts b/ui/src/app/edge/settings/app/index.component.ts
index 62ea267a499..dad25214d8b 100644
--- a/ui/src/app/edge/settings/app/index.component.ts
+++ b/ui/src/app/edge/settings/app/index.component.ts
@@ -24,6 +24,7 @@ import { canEnterKey } from "./permissions";
 @Component({
   selector: IndexComponent.SELECTOR,
   templateUrl: "./index.component.html",
+  standalone: false,
 })
 export class IndexComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/settings/app/install.component.ts b/ui/src/app/edge/settings/app/install.component.ts
index d41cb72f035..ae8e69625d4 100644
--- a/ui/src/app/edge/settings/app/install.component.ts
+++ b/ui/src/app/edge/settings/app/install.component.ts
@@ -21,6 +21,7 @@ import { hasPredefinedKey } from "./permissions";
 @Component({
   selector: InstallAppComponent.SELECTOR,
   templateUrl: "./install.component.html",
+  standalone: false,
 })
 export class InstallAppComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/settings/app/keypopup/modal.component.ts b/ui/src/app/edge/settings/app/keypopup/modal.component.ts
index be5889a230d..d9f51e8f9f3 100644
--- a/ui/src/app/edge/settings/app/keypopup/modal.component.ts
+++ b/ui/src/app/edge/settings/app/keypopup/modal.component.ts
@@ -19,6 +19,7 @@ import { Key } from "./key";
 @Component({
     selector: KeyModalComponent.SELECTOR,
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class KeyModalComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/app/single.component.ts b/ui/src/app/edge/settings/app/single.component.ts
index 0051a69d016..6b937248e98 100644
--- a/ui/src/app/edge/settings/app/single.component.ts
+++ b/ui/src/app/edge/settings/app/single.component.ts
@@ -23,6 +23,7 @@ import { canEnterKey, hasKeyModel, hasPredefinedKey } from "./permissions";
 @Component({
   selector: SingleAppComponent.SELECTOR,
   templateUrl: "./single.component.html",
+  standalone: false,
 })
 export class SingleAppComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/settings/app/update.component.ts b/ui/src/app/edge/settings/app/update.component.ts
index 5921ca42718..aab5ea1eecd 100644
--- a/ui/src/app/edge/settings/app/update.component.ts
+++ b/ui/src/app/edge/settings/app/update.component.ts
@@ -25,6 +25,7 @@ interface MyInstance {
 @Component({
   selector: UpdateAppComponent.SELECTOR,
   templateUrl: "./update.component.html",
+  standalone: false,
 })
 export class UpdateAppComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/channels/channels.component.html b/ui/src/app/edge/settings/channels/channels.component.html
index 79dea6bb15f..65acae2546f 100644
--- a/ui/src/app/edge/settings/channels/channels.component.html
+++ b/ui/src/app/edge/settings/channels/channels.component.html
@@ -3,7 +3,7 @@
   <ion-grid *ngIf="config">
 
     <ion-row class="ion-justify-content-center">
-      <ion-col size="12" size-md="4">
+      <ion-col size="12" size-md="6">
         <ion-card>
           <ion-item color="light" lines="full">
             <ion-icon slot="start" name="today-outline" color="primary"></ion-icon>
@@ -13,19 +13,20 @@
 
             <ion-list>
               <ion-item lines="none">
-                <ion-select [interfaceOptions]="{ cssClass: 'custom-theme-text custom-ion-popover' }"
-                  style="white-space: initial;width: 100%;" #selectedComponentId interface="alert"
-                  [placeholder]="'CHANNELS.Component'| translate" (ionChange)="onSelectedComponentChanged($event)">
-                  <ion-select-option style=" white-space: normal !important;"
+                <ion-select justify="space-between" style="white-space: initial;width: 100%;" #selectedComponentId
+                  interface="alert" labelPlacement="start" [label]="'CHANNELS.Component'| translate"
+                  (ionChange)="onSelectedComponentChanged($event)" class="ion-text-align-left">
+                  <ion-select-option style="white-space: normal !important;"
                     *ngFor="let entry of (config.components | keys)" [value]="entry.key">
                     {{ entry.value.id }} ({{ entry.value.alias }})</ion-select-option>
                 </ion-select>
               </ion-item>
               <ion-item lines="none">
                 <ngx-spinner [name]="selectedComponentId.value"
-                  [interfaceOptions]="{ cssClass: 'custom-theme-text custom-ion-popover' }"></ngx-spinner>
+                  class="custom-theme-text custom-ion-popover"></ngx-spinner>
                 <ion-select style="white-space: initial;width: 100%;" #selectedChannelId interface="alert"
-                  [disabled]="!selectedComponentId?.value" [placeholder]="'CHANNELS.CHANNEL'| translate">
+                  [disabled]="!selectedComponentId?.value" [label]="'CHANNELS.CHANNEL'| translate"
+                  justify="space-between">
                   <ng-container *ngIf="selectedComponentId?.value">
                     <ion-select-option
                       *ngFor="let entry of channelsPerComponent.get(selectedComponentId.value).channels | keyvalue"
diff --git a/ui/src/app/edge/settings/channels/channels.component.ts b/ui/src/app/edge/settings/channels/channels.component.ts
index e8f2411c1f0..49447062d92 100644
--- a/ui/src/app/edge/settings/channels/channels.component.ts
+++ b/ui/src/app/edge/settings/channels/channels.component.ts
@@ -14,6 +14,7 @@ import { ChannelAddress, Edge, EdgeConfig, EdgePermission, Service, Websocket }
 @Component({
   selector: ChannelsComponent.SELECTOR,
   templateUrl: "./channels.component.html",
+  standalone: false,
 })
 export class ChannelsComponent {
 
diff --git a/ui/src/app/edge/settings/component/install/index.component.ts b/ui/src/app/edge/settings/component/install/index.component.ts
index a31df0b6bf0..f77ee049ec9 100644
--- a/ui/src/app/edge/settings/component/install/index.component.ts
+++ b/ui/src/app/edge/settings/component/install/index.component.ts
@@ -13,6 +13,7 @@ interface MyCategorizedFactories extends CategorizedFactories {
 @Component({
   selector: IndexComponent.SELECTOR,
   templateUrl: "./index.component.html",
+  standalone: false,
 })
 export class IndexComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/component/install/install.component.ts b/ui/src/app/edge/settings/component/install/install.component.ts
index 965ac7d874e..7c658a688b8 100644
--- a/ui/src/app/edge/settings/component/install/install.component.ts
+++ b/ui/src/app/edge/settings/component/install/install.component.ts
@@ -8,6 +8,7 @@ import { Edge, EdgeConfig, Service, Utils, Websocket } from "../../../../shared/
 @Component({
   selector: ComponentInstallComponent.SELECTOR,
   templateUrl: "./install.component.html",
+  standalone: false,
 })
 export class ComponentInstallComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/component/update/index.component.ts b/ui/src/app/edge/settings/component/update/index.component.ts
index d35810ed057..757ce52469a 100644
--- a/ui/src/app/edge/settings/component/update/index.component.ts
+++ b/ui/src/app/edge/settings/component/update/index.component.ts
@@ -11,6 +11,7 @@ interface MyCategorizedComponents extends CategorizedComponents {
 @Component({
   selector: IndexComponent.SELECTOR,
   templateUrl: "./index.component.html",
+  standalone: false,
 })
 export class IndexComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/component/update/update.component.ts b/ui/src/app/edge/settings/component/update/update.component.ts
index 3c882e05473..71c4b29e0ab 100644
--- a/ui/src/app/edge/settings/component/update/update.component.ts
+++ b/ui/src/app/edge/settings/component/update/update.component.ts
@@ -8,6 +8,7 @@ import { Edge, EdgeConfig, Service, Utils, Websocket } from "../../../../shared/
 @Component({
   selector: ComponentUpdateComponent.SELECTOR,
   templateUrl: "./update.component.html",
+  standalone: false,
 })
 export class ComponentUpdateComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.ts b/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.ts
index 8bab188a03f..b11f7b497fb 100644
--- a/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.ts
+++ b/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.ts
@@ -9,6 +9,7 @@ import { environment } from "src/environments";
 @Component({
   selector: JsonrpcTestComponent.SELECTOR,
   templateUrl: "./jsonrpctest.html",
+  standalone: false,
 })
 export class JsonrpcTestComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/network/network.component.ts b/ui/src/app/edge/settings/network/network.component.ts
index 99b9af92671..fdba7efb1be 100644
--- a/ui/src/app/edge/settings/network/network.component.ts
+++ b/ui/src/app/edge/settings/network/network.component.ts
@@ -13,6 +13,7 @@ import { InterfaceForm, InterfaceModel, IpAddress, NetworkConfig, NetworkInterfa
 @Component({
   selector: NetworkComponent.SELECTOR,
   templateUrl: "./network.component.html",
+  standalone: false,
 })
 export class NetworkComponent implements OnInit {
 
@@ -75,7 +76,7 @@ export class NetworkComponent implements OnInit {
         this.handleNetworkConfigResponse(response);
       }
     } catch (reason: any) {
-      this.service.toast(this.translate.instant("Edge.Network.errorReading") + reason?.error?.message ?? "Unknown error", "danger");
+      this.service.toast(this.translate.instant("Edge.Network.errorReading") + reason?.error?.message, "danger");
     }
   }
 
@@ -187,7 +188,7 @@ export class NetworkComponent implements OnInit {
       }));
       this.service.toast(this.translate.instant("Edge.Network.successUpdate") + `[${interfaceName}].`, "success");
     } catch (reason: any) {
-      this.service.toast(this.translate.instant("Edge.Network.errorUpdating") + `[${interfaceName}].` + reason?.error?.message ?? "Unknown error", "danger");
+      this.service.toast(this.translate.instant("Edge.Network.errorUpdating") + `[${interfaceName}].` + reason?.error?.message, "danger");
     }
   }
 
diff --git a/ui/src/app/edge/settings/powerassistant/powerassistant.ts b/ui/src/app/edge/settings/powerassistant/powerassistant.ts
index 4dcc5708141..b6861e4fe30 100644
--- a/ui/src/app/edge/settings/powerassistant/powerassistant.ts
+++ b/ui/src/app/edge/settings/powerassistant/powerassistant.ts
@@ -34,6 +34,7 @@ type Entry = {
     useClass: LiveDataService,
     provide: DataService,
   }],
+  standalone: false,
 })
 export class PowerAssistantComponent extends AbstractFlatWidget {
 
diff --git a/ui/src/app/edge/settings/profile/aliasupdate.component.html b/ui/src/app/edge/settings/profile/aliasupdate.component.html
index 90e9b2f6369..4ccd98240d3 100644
--- a/ui/src/app/edge/settings/profile/aliasupdate.component.html
+++ b/ui/src/app/edge/settings/profile/aliasupdate.component.html
@@ -13,8 +13,8 @@
                     <ion-card-content *ngIf="formGroup !== null">
                         <form [formGroup]="formGroup">
                             <ion-item lines="full" class="noPadding">
-                                <ion-label position="stacked" translate>General.currentName</ion-label>
-                                <ion-input formControlName="alias">
+                                <ion-input formControlName="alias" [label]="'General.currentName' | translate"
+                                    label-placement="stacked">
                                 </ion-input>
                             </ion-item>
                         </form>
diff --git a/ui/src/app/edge/settings/profile/aliasupdate.component.ts b/ui/src/app/edge/settings/profile/aliasupdate.component.ts
index d0b91e080ca..ccfa09afb50 100644
--- a/ui/src/app/edge/settings/profile/aliasupdate.component.ts
+++ b/ui/src/app/edge/settings/profile/aliasupdate.component.ts
@@ -8,6 +8,7 @@ import { Edge, EdgeConfig, Service, Websocket } from "src/app/shared/shared";
 @Component({
     selector: "aliasupdate",
     templateUrl: "./aliasupdate.component.html",
+    standalone: false,
 })
 export class AliasUpdateComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/profile/profile.component.ts b/ui/src/app/edge/settings/profile/profile.component.ts
index f33d018f26a..cbc086d4715 100644
--- a/ui/src/app/edge/settings/profile/profile.component.ts
+++ b/ui/src/app/edge/settings/profile/profile.component.ts
@@ -14,6 +14,7 @@ import { GetModbusProtocolExportXlsxRequest } from "./modbusapi/getModbusProtoco
 @Component({
   selector: ProfileComponent.SELECTOR,
   templateUrl: "./profile.component.html",
+  standalone: false,
 })
 export class ProfileComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/settings.component.ts b/ui/src/app/edge/settings/settings.component.ts
index 8c667833490..6c9cacbd4b2 100644
--- a/ui/src/app/edge/settings/settings.component.ts
+++ b/ui/src/app/edge/settings/settings.component.ts
@@ -8,6 +8,7 @@ import { JsonrpcTestPermission } from "./jsonrpctest/jsonrpctest.permission";
 @Component({
   selector: "settings",
   templateUrl: "./settings.component.html",
+  standalone: false,
 })
 export class SettingsComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/system/maintenance/maintenance.ts b/ui/src/app/edge/settings/system/maintenance/maintenance.ts
index cda8f1e81d6..c5854fce684 100644
--- a/ui/src/app/edge/settings/system/maintenance/maintenance.ts
+++ b/ui/src/app/edge/settings/system/maintenance/maintenance.ts
@@ -28,6 +28,7 @@ enum SystemRestartState {
         }
     }
     `],
+    standalone: false,
 })
 export class MaintenanceComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/system/oe-system-update.component.ts b/ui/src/app/edge/settings/system/oe-system-update.component.ts
index b721f60aa44..6f20b1dba6f 100644
--- a/ui/src/app/edge/settings/system/oe-system-update.component.ts
+++ b/ui/src/app/edge/settings/system/oe-system-update.component.ts
@@ -10,6 +10,7 @@ import { SystemUpdateState } from "./getSystemUpdateStateResponse";
 @Component({
   selector: OeSystemUpdateComponent.SELECTOR,
   templateUrl: "./oe-system-update.component.html",
+  standalone: false,
 })
 export class OeSystemUpdateComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/edge/settings/system/system.component.ts b/ui/src/app/edge/settings/system/system.component.ts
index 4040aeea1a7..02a6b07617e 100644
--- a/ui/src/app/edge/settings/system/system.component.ts
+++ b/ui/src/app/edge/settings/system/system.component.ts
@@ -6,6 +6,7 @@ import { Edge, Service, UserPermission, Utils } from "../../../shared/shared";
 @Component({
   selector: SystemComponent.SELECTOR,
   templateUrl: "./system.component.html",
+  standalone: false,
 })
 export class SystemComponent {
 
diff --git a/ui/src/app/edge/settings/systemexecute/systemexecute.component.html b/ui/src/app/edge/settings/systemexecute/systemexecute.component.html
index 82cf2b8c0f7..5855a9ed9bd 100644
--- a/ui/src/app/edge/settings/systemexecute/systemexecute.component.html
+++ b/ui/src/app/edge/settings/systemexecute/systemexecute.component.html
@@ -26,26 +26,22 @@
           <ion-card-content>
             <form [formGroup]="form" (ngSubmit)="submit()">
               <ion-item>
-                <ion-label>Username</ion-label>
-                <ion-input formControlName="username" type="text">
+                <ion-input formControlName="username" type="text" label="Username">
                 </ion-input>
               </ion-item>
               <ion-item>
-                <ion-label>Password</ion-label>
-                <ion-input formControlName="password" type="password"></ion-input>
+                <ion-input formControlName="password" type="password" label="Password"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-label>Timeout</ion-label>
-                <ion-input formControlName="timeoutSeconds" type="number"></ion-input>
+                <ion-input formControlName="timeoutSeconds" type="number" label="Timeout"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-label>Run in background</ion-label>
-                <ion-toggle formControlName="runInBackground"></ion-toggle>
+                <ion-toggle formControlName="runInBackground" label="Run in Background" justify="space-between">Run in
+                  background</ion-toggle>
               </ion-item>
               <ion-item>
-                <ion-label position="floating">Command</ion-label>
-                <ion-textarea class="command-textbox" auto-grow="true" formControlName="command"
-                  type="text"></ion-textarea>
+                <ion-textarea class="command-textbox" auto-grow="true" formControlName="command" type="text"
+                  label="Command" label-placement="floating"></ion-textarea>
               </ion-item>
               <ion-button expand="block" type=" submit" color="primary">Send</ion-button>
             </form>
diff --git a/ui/src/app/edge/settings/systemexecute/systemexecute.component.ts b/ui/src/app/edge/settings/systemexecute/systemexecute.component.ts
index 174de06b640..dba922a4201 100644
--- a/ui/src/app/edge/settings/systemexecute/systemexecute.component.ts
+++ b/ui/src/app/edge/settings/systemexecute/systemexecute.component.ts
@@ -19,6 +19,7 @@ const COMMANDS: { [key: string]: CommandFunction; } = {
 @Component({
   selector: SystemExecuteComponent.SELECTOR,
   templateUrl: "./systemexecute.component.html",
+  standalone: false,
 })
 export class SystemExecuteComponent implements OnInit {
 
diff --git a/ui/src/app/edge/settings/systemlog/systemlog.component.ts b/ui/src/app/edge/settings/systemlog/systemlog.component.ts
index 8b2776a41a9..a4e01e1a5bb 100644
--- a/ui/src/app/edge/settings/systemlog/systemlog.component.ts
+++ b/ui/src/app/edge/settings/systemlog/systemlog.component.ts
@@ -34,6 +34,7 @@ export const LOG_LEVEL_FILTER = (translate: TranslateService): Filter => ({
 @Component({
   selector: SystemLogComponent.SELECTOR,
   templateUrl: "./systemlog.component.html",
+  standalone: false,
 })
 export class SystemLogComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/index/filter/filter.component.html b/ui/src/app/index/filter/filter.component.html
index aa8c62bc3e6..ef0347796fa 100644
--- a/ui/src/app/index/filter/filter.component.html
+++ b/ui/src/app/index/filter/filter.component.html
@@ -1,18 +1,16 @@
 <ion-row>
   <ng-container *ngFor="let filter of filters">
     <ion-col size="6">
-      <ion-item lines="none" *ngIf="filter">
-        <ion-label position="floating" color="primary"
-          style="white-space: normal !important">{{filter.placeholder}}</ion-label>
-        <ion-select label-placement="floating" interface="popover" [multiple]="true" label="Fixed label"
-          (ionDismiss)="searchOnChange($event, filter)" fill="solid"
-          [interfaceOptions]="{ cssClass: 'custom-ion-popover' }" type="radio" style="white-space: initial;">
+      <ng-container *ngIf="filter">
+        <ion-select interface="popover" [multiple]="true" [label]="filter.placeholder" label-placement="floating"
+          fill="solid" type="radio" (ionDismiss)="searchOnChange($event, filter)" fill="solid"
+          class="custom-ion-popover" style="white-space: initial; --color: var(--ion-color-primary)">
           <ng-container *ngFor="let option of filter.options">
             <ion-select-option [value]="option.value">{{option.name}}
             </ion-select-option>
           </ng-container>
         </ion-select>
-      </ion-item>
+      </ng-container>
     </ion-col>
   </ng-container>
 </ion-row>
diff --git a/ui/src/app/index/filter/filter.component.ts b/ui/src/app/index/filter/filter.component.ts
index 336008c0ca3..ede482b3bd6 100644
--- a/ui/src/app/index/filter/filter.component.ts
+++ b/ui/src/app/index/filter/filter.component.ts
@@ -9,6 +9,7 @@ import { SUM_STATES } from "../shared/sumState";
 @Component({
   selector: "oe-filter",
   templateUrl: "./filter.component.html",
+  standalone: false,
 })
 export class FilterComponent {
 
diff --git a/ui/src/app/index/login.component.html b/ui/src/app/index/login.component.html
index 4c4cf15f044..87af5bc4c35 100644
--- a/ui/src/app/index/login.component.html
+++ b/ui/src/app/index/login.component.html
@@ -47,14 +47,14 @@
             <ion-card-content *ngIf="environment.backend === 'OpenEMS Backend'">
               <form (ngSubmit)="doLogin({ username: username.value, password: password.value})">
                 <ion-item>
-                  <ion-label position="floating">E-Mail / <span translate>Login.user</span></ion-label>
                   <ion-input #username required type="input"
-                    [placeholder]="'E-Mail / ' + ('Login.passwordLabel' | translate)">
+                    [placeholder]="'E-Mail / ' + ('Login.passwordLabel' | translate)"
+                    [label]="'E-Mail / '  + ('Login.user' | translate)" label-placement="floating">
                   </ion-input>
                 </ion-item>
                 <ion-item>
-                  <ion-label position="floating" translate>Login.passwordLabel</ion-label>
-                  <ion-input #password required type="password" [placeholder]="'Login.passwordLabel' | translate">
+                  <ion-input #password required type="password" [placeholder]="'Login.passwordLabel' | translate"
+                    label-placement="floating" [label]="'Login.passwordLabel' | translate">
                   </ion-input>
                 </ion-item>
 
diff --git a/ui/src/app/index/login.component.ts b/ui/src/app/index/login.component.ts
index fee74455a1b..8c738c710ba 100644
--- a/ui/src/app/index/login.component.ts
+++ b/ui/src/app/index/login.component.ts
@@ -16,6 +16,7 @@ import { UserComponent } from "../user/user.component";
 @Component({
   selector: "login",
   templateUrl: "./login.component.html",
+  standalone: false,
 })
 export class LoginComponent implements ViewWillEnter, AfterContentChecked, OnDestroy, OnInit {
   public currentThemeMode: string;
diff --git a/ui/src/app/index/overview/overview.component.html b/ui/src/app/index/overview/overview.component.html
index 7c57bd8a86c..62afa44537f 100644
--- a/ui/src/app/index/overview/overview.component.html
+++ b/ui/src/app/index/overview/overview.component.html
@@ -90,7 +90,8 @@ <h2 class="ion-text-wrap">{{ edge.comment }}</h2>
                                         </ng-container>
                                         <ion-infinite-scroll (ionInfinite)="doInfinite($event)"
                                             [disabled]="limitReached">
-                                            <ion-infinite-scroll-content [name]="'crescent'" ngClass="custom-spinner">
+                                            <ion-infinite-scroll-content [loadingSpinner]="'crescent'"
+                                                ngClass="custom-spinner">
                                             </ion-infinite-scroll-content>
                                         </ion-infinite-scroll>
 
diff --git a/ui/src/app/index/overview/overview.component.ts b/ui/src/app/index/overview/overview.component.ts
index 8f885578816..cbfd985dea2 100644
--- a/ui/src/app/index/overview/overview.component.ts
+++ b/ui/src/app/index/overview/overview.component.ts
@@ -15,6 +15,7 @@ import { ChosenFilter } from "../filter/filter.component";
 @Component({
     selector: "overview",
     templateUrl: "./overview.component.html",
+    standalone: false,
 })
 export class OverViewComponent implements ViewWillEnter, OnDestroy {
     public environment = environment;
diff --git a/ui/src/app/index/shared/loading-screen.ts b/ui/src/app/index/shared/loading-screen.ts
index 05322949c51..4d62398f147 100644
--- a/ui/src/app/index/shared/loading-screen.ts
+++ b/ui/src/app/index/shared/loading-screen.ts
@@ -9,6 +9,7 @@ import { Service, Websocket } from "../../shared/shared";
 @Component({
   selector: "index",
   templateUrl: "./loading-screen.html",
+  standalone: false,
 })
 export class LoadingScreenComponent {
 
diff --git a/ui/src/app/index/shared/sumState.ts b/ui/src/app/index/shared/sumState.ts
index 38a892087d6..56df768fbee 100644
--- a/ui/src/app/index/shared/sumState.ts
+++ b/ui/src/app/index/shared/sumState.ts
@@ -41,6 +41,7 @@ export enum SumState {
     font-size: 20pt !important;
 }
   `],
+  standalone: false,
 })
 export class SumStateComponent implements OnInit {
 
diff --git a/ui/src/app/registration/modal/modal.component.ts b/ui/src/app/registration/modal/modal.component.ts
index 430f0d24d1f..181c28afe46 100644
--- a/ui/src/app/registration/modal/modal.component.ts
+++ b/ui/src/app/registration/modal/modal.component.ts
@@ -11,6 +11,7 @@ import { environment } from "src/environments";
 @Component({
   selector: "registration-modal",
   templateUrl: "./modal.component.html",
+  standalone: false,
 })
 export class RegistrationModalComponent implements OnInit {
 
diff --git a/ui/src/app/registration/registration.component.ts b/ui/src/app/registration/registration.component.ts
index 6ac8752cff7..927a4159fb1 100644
--- a/ui/src/app/registration/registration.component.ts
+++ b/ui/src/app/registration/registration.component.ts
@@ -5,6 +5,7 @@ import { RegistrationModalComponent } from "./modal/modal.component";
 @Component({
   selector: "registration",
   templateUrl: "./registration.component.html",
+  standalone: false,
 })
 export class RegistrationComponent {
 
diff --git a/ui/src/app/shared/components/chart/chart.module.ts b/ui/src/app/shared/components/chart/chart.module.ts
index f86efd0b7df..b1993f939a4 100644
--- a/ui/src/app/shared/components/chart/chart.module.ts
+++ b/ui/src/app/shared/components/chart/chart.module.ts
@@ -4,7 +4,7 @@ import { BrowserModule } from "@angular/platform-browser";
 import { RouterModule } from "@angular/router";
 import { IonicModule } from "@ionic/angular";
 import { TranslateModule } from "@ngx-translate/core";
-import { NgChartsModule } from "ng2-charts";
+import { BaseChartDirective } from "ng2-charts";
 import { NgxSpinnerModule } from "ngx-spinner";
 
 import { PipeModule } from "../../pipe/pipe";
@@ -18,7 +18,7 @@ import { ChartComponent } from "./chart";
     IonicModule,
     PipeModule,
     TranslateModule,
-    NgChartsModule,
+    BaseChartDirective,
     CommonModule,
     NgxSpinnerModule.forRoot({
       type: "ball-clip-rotate-multiple",
diff --git a/ui/src/app/shared/components/chart/chart.ts b/ui/src/app/shared/components/chart/chart.ts
index d2633c16f14..c55de430a8f 100644
--- a/ui/src/app/shared/components/chart/chart.ts
+++ b/ui/src/app/shared/components/chart/chart.ts
@@ -11,6 +11,7 @@ import { Edge, Service } from "../../shared";
 @Component({
   selector: "oe-chart",
   templateUrl: "./chart.html",
+  standalone: false,
 })
 export class ChartComponent implements OnInit, OnChanges {
 
diff --git a/ui/src/app/shared/components/edge/meter/currentVoltage/chart/asymmetricMeter.ts b/ui/src/app/shared/components/edge/meter/currentVoltage/chart/asymmetricMeter.ts
index f187ea50ccc..3856ddb0682 100644
--- a/ui/src/app/shared/components/edge/meter/currentVoltage/chart/asymmetricMeter.ts
+++ b/ui/src/app/shared/components/edge/meter/currentVoltage/chart/asymmetricMeter.ts
@@ -7,6 +7,7 @@ import { ChannelAddress } from "src/app/shared/shared";
 @Component({
   selector: "currentVoltageAsymmetricChart",
   templateUrl: "../../../../../components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class CurrentVoltageAsymmetricChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/shared/components/edge/meter/currentVoltage/chart/symmetricMeter.ts b/ui/src/app/shared/components/edge/meter/currentVoltage/chart/symmetricMeter.ts
index d3ad8c86502..8a3c9c14776 100644
--- a/ui/src/app/shared/components/edge/meter/currentVoltage/chart/symmetricMeter.ts
+++ b/ui/src/app/shared/components/edge/meter/currentVoltage/chart/symmetricMeter.ts
@@ -6,6 +6,7 @@ import { ChannelAddress } from "src/app/shared/shared";
 @Component({
   selector: "currentVoltageChart",
   templateUrl: "../../../../../components/chart/abstracthistorychart.html",
+  standalone: false,
 })
 export class CurrentVoltageSymmetricChartComponent extends AbstractHistoryChart {
 
diff --git a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.ts b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.ts
index 698d2bc6966..2578fd34c3c 100644
--- a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.ts
+++ b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.ts
@@ -3,6 +3,7 @@ import { AbstractHistoryChartOverview } from "src/app/shared/components/chart/ab
 
 @Component({
   templateUrl: "./currentVoltage.overview.html",
+  standalone: false,
 })
 export class CurrentAndVoltageOverviewComponent extends AbstractHistoryChartOverview {
 
diff --git a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts
index 8455ccf34b3..ce96740e46f 100644
--- a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts
+++ b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts
@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 import { IonicModule } from "@ionic/angular";
 import { TranslateModule } from "@ngx-translate/core";
-import { NgChartsModule } from "ng2-charts";
+import { BaseChartDirective } from "ng2-charts";
 import { NgxSpinnerModule } from "ngx-spinner";
 import { FooterNavigationModule } from "src/app/shared/components/footer/subnavigation/footerNavigation.module";
 import { ChartModule } from "../../../chart/chart.module";
@@ -18,8 +18,8 @@ import { CurrentAndVoltageOverviewComponent } from "./currentVoltage.overview";
     IonicModule,
     FooterNavigationModule,
     TranslateModule,
-    NgChartsModule,
-    NgChartsModule,
+    BaseChartDirective,
+    BaseChartDirective,
     HistoryDataErrorModule,
     NgxSpinnerModule.forRoot({
       type: "ball-clip-rotate-multiple",
diff --git a/ui/src/app/shared/components/edge/meter/electricity/modal.component.ts b/ui/src/app/shared/components/edge/meter/electricity/modal.component.ts
index 6e6d6e981a2..621eea9f092 100644
--- a/ui/src/app/shared/components/edge/meter/electricity/modal.component.ts
+++ b/ui/src/app/shared/components/edge/meter/electricity/modal.component.ts
@@ -7,6 +7,7 @@ import { Role } from "src/app/shared/type/role";
 @Component({
     selector: "oe-electricity-meter",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class ElectricityMeterComponent extends AbstractModalLine implements OnInit {
 
diff --git a/ui/src/app/shared/components/edge/meter/esscharger/modal.component.ts b/ui/src/app/shared/components/edge/meter/esscharger/modal.component.ts
index f469c1420f2..bf94c3fdd86 100644
--- a/ui/src/app/shared/components/edge/meter/esscharger/modal.component.ts
+++ b/ui/src/app/shared/components/edge/meter/esscharger/modal.component.ts
@@ -7,6 +7,7 @@ import { EdgeConfig } from "../../edgeconfig";
 @Component({
     selector: "oe-ess-charger",
     templateUrl: "./modal.component.html",
+    standalone: false,
 })
 export class EssChargerComponent {
     @Input({ required: true }) public component!: EdgeConfig.Component;
diff --git a/ui/src/app/shared/components/edge/meter/meter.module.ts b/ui/src/app/shared/components/edge/meter/meter.module.ts
index c3ffddae822..9269892f3b1 100644
--- a/ui/src/app/shared/components/edge/meter/meter.module.ts
+++ b/ui/src/app/shared/components/edge/meter/meter.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 import { IonicModule } from "@ionic/angular";
 import { TranslateModule } from "@ngx-translate/core";
-import { NgChartsModule } from "ng2-charts";
+import { BaseChartDirective } from "ng2-charts";
 import { NgxSpinnerModule } from "ngx-spinner";
 import { PipeModule } from "src/app/shared/pipe/pipe";
 
@@ -18,7 +18,7 @@ import { EssChargerComponent } from "./esscharger/modal.component";
         IonicModule,
         PipeModule,
         TranslateModule,
-        NgChartsModule,
+        BaseChartDirective,
         CommonModule,
         NgxSpinnerModule.forRoot({
             type: "ball-clip-rotate-multiple",
diff --git a/ui/src/app/shared/components/edge/offline/offline.component.ts b/ui/src/app/shared/components/edge/offline/offline.component.ts
index 331e65463ca..9c399a3bd1b 100644
--- a/ui/src/app/shared/components/edge/offline/offline.component.ts
+++ b/ui/src/app/shared/components/edge/offline/offline.component.ts
@@ -14,6 +14,7 @@ import { environment } from "src/environments";
                 font-weight: bolder;
             }
         `],
+    standalone: false,
 })
 export class OfflineComponent implements OnInit {
 
diff --git a/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.ts b/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.ts
index 514fbd0c68b..1c07146282f 100644
--- a/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.ts
+++ b/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.ts
@@ -6,6 +6,7 @@ import { Component, Input } from "@angular/core";
 @Component({
     selector: "oe-flat-widget-horizontal-line",
     templateUrl: "./flat-widget-horizontal-line.html",
+    standalone: false,
 })
 export class FlatWidgetHorizontalLineComponent {
     /** Components-Array to iterate over */
diff --git a/ui/src/app/shared/components/flat/flat-widget-line-divider/flat-widget-line-divider.ts b/ui/src/app/shared/components/flat/flat-widget-line-divider/flat-widget-line-divider.ts
index 059b5e487fe..a56d602898d 100644
--- a/ui/src/app/shared/components/flat/flat-widget-line-divider/flat-widget-line-divider.ts
+++ b/ui/src/app/shared/components/flat/flat-widget-line-divider/flat-widget-line-divider.ts
@@ -8,6 +8,7 @@ import { Icon } from "src/app/shared/type/widget";
 @Component({
     selector: "oe-flat-widget-line-divider",
     templateUrl: "./flat-widget-line-divider.html",
+    standalone: false,
 })
 export class FlatWidgetLineDividerComponent {
 
diff --git a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.ts b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.ts
index 5b5885ced53..a441ccac75b 100644
--- a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.ts
+++ b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.ts
@@ -5,5 +5,6 @@ import { AbstractFlatWidgetLine } from "../../abstract-flat-widget-line";
   /** If multiple items in line use this */
   selector: "oe-flat-widget-line-item",
   templateUrl: "./flat-widget-line-item.html",
+  standalone: false,
 })
 export class FlatWidgetLineItemComponent extends AbstractFlatWidgetLine { }
diff --git a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.ts b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.ts
index e9d3d45fdc3..1f06103ebaf 100644
--- a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.ts
+++ b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.ts
@@ -5,6 +5,7 @@ import { AbstractFlatWidgetLine } from "../abstract-flat-widget-line";
 @Component({
     selector: "oe-flat-widget-line",
     templateUrl: "./flat-widget-line.html",
+    standalone: false,
 })
 export class FlatWidgetLineComponent extends AbstractFlatWidgetLine {
 
diff --git a/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.ts b/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.ts
index 439c8cbd220..63f1247b1f7 100644
--- a/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.ts
+++ b/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.ts
@@ -4,6 +4,7 @@ import { AbstractFlatWidgetLine } from "../abstract-flat-widget-line";
 @Component({
     selector: "oe-flat-widget-percentagebar",
     templateUrl: "./flat-widget-percentagebar.html",
+    standalone: false,
 })
 export class FlatWidgetPercentagebarComponent extends AbstractFlatWidgetLine {
 
diff --git a/ui/src/app/shared/components/flat/flat.ts b/ui/src/app/shared/components/flat/flat.ts
index 69bf1077329..372d6abc8d1 100644
--- a/ui/src/app/shared/components/flat/flat.ts
+++ b/ui/src/app/shared/components/flat/flat.ts
@@ -5,6 +5,7 @@ import { Icon, ImageIcon } from "src/app/shared/type/widget";
 @Component({
   selector: "oe-flat-widget",
   templateUrl: "./flat.html",
+  standalone: false,
 })
 export class FlatWidgetComponent {
 
diff --git a/ui/src/app/shared/components/footer/footer.html b/ui/src/app/shared/components/footer/footer.html
index f52298bcdf0..70b4c51370f 100644
--- a/ui/src/app/shared/components/footer/footer.html
+++ b/ui/src/app/shared/components/footer/footer.html
@@ -1,5 +1,5 @@
 <ion-footer *ngIf="!service.isSmartphoneResolution" style="--ion-background-color: var(--ion-color-toolbar-primary);">
-  <container *ngIf="user && edge && displayValues" lines="none">
+  <ng-container *ngIf="user && edge && displayValues" lines="none">
     <ion-grid style="background-color: var(--ion-color-toolbar-primary); color: var(--ion-color-primary-contrast)">
       <ion-row>
         <ion-col size="12">
@@ -19,5 +19,5 @@
         </ion-col>
       </ion-row>
     </ion-grid>
-  </container>
+  </ng-container>
 </ion-footer>
diff --git a/ui/src/app/shared/components/footer/footer.ts b/ui/src/app/shared/components/footer/footer.ts
index 2183f132dea..bca45ba524e 100644
--- a/ui/src/app/shared/components/footer/footer.ts
+++ b/ui/src/app/shared/components/footer/footer.ts
@@ -32,6 +32,7 @@ import { Role } from "../../type/role";
     }
   `],
   templateUrl: "footer.html",
+  standalone: false,
 })
 export class FooterComponent implements OnInit {
 
diff --git a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.ts b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.ts
index 400fa6224f5..2976490b98c 100644
--- a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.ts
+++ b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.ts
@@ -12,6 +12,7 @@ export type NavigationOption = {
 @Component({
   selector: "oe-footer-subnavigation",
   templateUrl: "footerNavigation.html",
+  standalone: false,
 })
 export class FooterNavigationComponent implements AfterViewInit {
 
diff --git a/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts b/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts
index 1846f9d4c4d..741d4fb7a7f 100644
--- a/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts
+++ b/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts
@@ -6,6 +6,7 @@ import { FieldWrapper } from "@ngx-formly/core";
     selector: "form-field-checkbox-hyperlink",
     templateUrl: "./form-field-checkbox-hyperlink.wrapper.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class FormlyCheckBoxHyperlinkWrapperComponent extends FieldWrapper implements OnInit {
 
diff --git a/ui/src/app/shared/components/formly/form-field-default-cases.wrapper.ts b/ui/src/app/shared/components/formly/form-field-default-cases.wrapper.ts
index bd28f9a6023..c7d2e03b200 100644
--- a/ui/src/app/shared/components/formly/form-field-default-cases.wrapper.ts
+++ b/ui/src/app/shared/components/formly/form-field-default-cases.wrapper.ts
@@ -6,6 +6,7 @@ import { FieldWrapper } from "@ngx-formly/core";
 @Component({
     selector: "formly-wrapper-default-of-cases",
     template: "<ng-container #fieldComponent ></ng-container>",
+    standalone: false,
 })
 export class FormlyWrapperDefaultValueWithCasesComponent extends FieldWrapper implements OnInit {
 
diff --git a/ui/src/app/shared/components/formly/form-field-multi-step/form-field-multi-step.ts b/ui/src/app/shared/components/formly/form-field-multi-step/form-field-multi-step.ts
index b9705f87493..4c155a5af8d 100644
--- a/ui/src/app/shared/components/formly/form-field-multi-step/form-field-multi-step.ts
+++ b/ui/src/app/shared/components/formly/form-field-multi-step/form-field-multi-step.ts
@@ -4,6 +4,7 @@ import { FieldType } from "@ngx-formly/core";
 @Component({
     selector: "form-field-multi-step",
     templateUrl: "./form-field-multi-step.html",
+    standalone: false,
 })
 export class FormlyFieldMultiStepComponent extends FieldType implements OnInit {
 
diff --git a/ui/src/app/shared/components/formly/form-field.wrapper.ts b/ui/src/app/shared/components/formly/form-field.wrapper.ts
index 15d3c9a1b0d..b4bb24fc97d 100644
--- a/ui/src/app/shared/components/formly/form-field.wrapper.ts
+++ b/ui/src/app/shared/components/formly/form-field.wrapper.ts
@@ -5,5 +5,6 @@ import { FieldWrapper } from "@ngx-formly/core";
     selector: "formly-wrapper-ion-form-field",
     templateUrl: "./form-field.wrapper.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class FormlyWrapperFormFieldComponent extends FieldWrapper { }
diff --git a/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.ts b/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.ts
index b182f88a0c7..d1487567a71 100644
--- a/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.ts
+++ b/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.ts
@@ -5,6 +5,7 @@ import { FieldWrapper } from "@ngx-formly/core";
     selector: "formly-field-checkbox-with-image",
     templateUrl: "./formly-field-checkbox-with-image.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class FormlyFieldCheckboxWithImageComponent extends FieldWrapper implements OnInit {
 
diff --git a/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.ts b/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.ts
index 2d934c9c8fa..4f19e2a5b45 100644
--- a/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.ts
+++ b/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.ts
@@ -4,5 +4,6 @@ import { FieldWrapper } from "@ngx-formly/core";
 @Component({
     selector: "formly-field-modal",
     templateUrl: "./formlyfieldmodal.html",
+    standalone: false,
 })
 export class FormlyFieldModalComponent extends FieldWrapper { }
diff --git a/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts b/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts
index a104e13a949..f2d12b8526c 100644
--- a/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts
+++ b/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts
@@ -5,6 +5,7 @@ import { FieldWrapper } from "@ngx-formly/core";
     selector: "formly-field-radio-with-image",
     templateUrl: "./formly-field-radio-with-image.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class FormlyFieldRadioWithImageComponent extends FieldWrapper implements OnInit {
 
diff --git a/ui/src/app/shared/components/formly/formly-select-field-modal.component.ts b/ui/src/app/shared/components/formly/formly-select-field-modal.component.ts
index 35bef389fd0..d818f2a97f4 100644
--- a/ui/src/app/shared/components/formly/formly-select-field-modal.component.ts
+++ b/ui/src/app/shared/components/formly/formly-select-field-modal.component.ts
@@ -4,6 +4,7 @@ import { ModalController } from "@ionic/angular";
 @Component({
     selector: "formly-select-modal",
     templateUrl: "./formly-select-field-modal.component.html",
+    standalone: false,
 })
 export class FormlySelectFieldModalComponent implements OnInit {
 
diff --git a/ui/src/app/shared/components/formly/formly-select-field.extended.ts b/ui/src/app/shared/components/formly/formly-select-field.extended.ts
index ffcdb6ada79..80e3697c5ea 100644
--- a/ui/src/app/shared/components/formly/formly-select-field.extended.ts
+++ b/ui/src/app/shared/components/formly/formly-select-field.extended.ts
@@ -6,6 +6,7 @@ import { FormlySelectFieldModalComponent } from "./formly-select-field-modal.com
 @Component({
     selector: "formly-select-extended-wrapper",
     templateUrl: "./formly-select-field.extended.html",
+    standalone: false,
 })
 export class FormlySelectFieldExtendedWrapperComponent extends FieldWrapper {
 
diff --git a/ui/src/app/shared/components/formly/formly-skeleton-wrapper.ts b/ui/src/app/shared/components/formly/formly-skeleton-wrapper.ts
index 5677e652ae9..d8b574c447d 100644
--- a/ui/src/app/shared/components/formly/formly-skeleton-wrapper.ts
+++ b/ui/src/app/shared/components/formly/formly-skeleton-wrapper.ts
@@ -21,6 +21,7 @@ import { FormlyFieldConfig } from "@ngx-formly/core";
   <formly-form *ngIf="show" [form]="form" [fields]="fields" [model]="model"></formly-form>
 </div>
   `,
+  standalone: false,
 })
 export class FormlyFieldWithLoadingAnimationComponent {
   @Input() public show: boolean = false;
diff --git a/ui/src/app/shared/components/formly/input-serial-number-wrapper.ts b/ui/src/app/shared/components/formly/input-serial-number-wrapper.ts
index 0df1760de05..f56015c1311 100644
--- a/ui/src/app/shared/components/formly/input-serial-number-wrapper.ts
+++ b/ui/src/app/shared/components/formly/input-serial-number-wrapper.ts
@@ -4,5 +4,6 @@ import { FieldWrapper } from "@ngx-formly/core";
 @Component({
     selector: "formly-input-serial-number",
     templateUrl: "./input-serial-number-wrapper.html",
+    standalone: false,
 })
 export class FormlyInputSerialNumberWrapperComponent extends FieldWrapper { }
diff --git a/ui/src/app/shared/components/formly/input.ts b/ui/src/app/shared/components/formly/input.ts
index 3e547670e94..8635fb6bc79 100644
--- a/ui/src/app/shared/components/formly/input.ts
+++ b/ui/src/app/shared/components/formly/input.ts
@@ -4,5 +4,6 @@ import { FieldType } from "@ngx-formly/core";
 @Component({
     selector: "formly-input-section",
     templateUrl: "./input.html",
+    standalone: false,
 })
 export class InputTypeComponent extends FieldType { }
diff --git a/ui/src/app/shared/components/formly/panel-wrapper.component.ts b/ui/src/app/shared/components/formly/panel-wrapper.component.ts
index 5af73ea9d87..f5b3cf1c5d6 100644
--- a/ui/src/app/shared/components/formly/panel-wrapper.component.ts
+++ b/ui/src/app/shared/components/formly/panel-wrapper.component.ts
@@ -15,6 +15,7 @@ import { FieldWrapper } from "@ngx-formly/core";
         </ion-grid>
     </ion-item>
     `,
+    standalone: false,
 })
 export class PanelWrapperComponent extends FieldWrapper {
 }
diff --git a/ui/src/app/shared/components/formly/repeat.ts b/ui/src/app/shared/components/formly/repeat.ts
index 5ec40c593a7..9d4db58885d 100644
--- a/ui/src/app/shared/components/formly/repeat.ts
+++ b/ui/src/app/shared/components/formly/repeat.ts
@@ -4,6 +4,7 @@ import { FieldArrayType } from "@ngx-formly/core";
 @Component({
     selector: "formly-repeat-section",
     templateUrl: "./repeat.html",
+    standalone: false,
 })
 export class RepeatTypeComponent extends FieldArrayType {
     // TODO: add explicit constructor
diff --git a/ui/src/app/shared/components/header/app-header.ts b/ui/src/app/shared/components/header/app-header.ts
index 1a3a2596fbc..3143213c849 100644
--- a/ui/src/app/shared/components/header/app-header.ts
+++ b/ui/src/app/shared/components/header/app-header.ts
@@ -13,6 +13,7 @@ import { StatusSingleComponent } from "../status/single/status.component";
 @Component({
     selector: "app-header",
     templateUrl: "./header.component.html",
+    standalone: false,
 })
 export class AppHeaderComponent implements OnInit, OnDestroy, AfterViewChecked {
 
diff --git a/ui/src/app/shared/components/header/header.component.ts b/ui/src/app/shared/components/header/header.component.ts
index 1a4fe4dbf74..b6f68d9cb84 100644
--- a/ui/src/app/shared/components/header/header.component.ts
+++ b/ui/src/app/shared/components/header/header.component.ts
@@ -13,6 +13,7 @@ import { StatusSingleComponent } from "../status/single/status.component";
 @Component({
     selector: "header",
     templateUrl: "./header.component.html",
+    standalone: false,
 })
 export class HeaderComponent implements OnInit, OnDestroy, AfterViewChecked {
 
diff --git a/ui/src/app/shared/components/history-data-error/history-data-error.component.ts b/ui/src/app/shared/components/history-data-error/history-data-error.component.ts
index de600575ce7..4361c648f55 100644
--- a/ui/src/app/shared/components/history-data-error/history-data-error.component.ts
+++ b/ui/src/app/shared/components/history-data-error/history-data-error.component.ts
@@ -14,6 +14,7 @@ import { JsonrpcResponseError } from "src/app/shared/jsonrpc/base";
         </ng-container>
     </ion-label>
 </ion-item>`,
+    standalone: false,
 })
 export class HistoryDataErrorComponent {
 
diff --git a/ui/src/app/shared/components/modal/help-button/help-button.ts b/ui/src/app/shared/components/modal/help-button/help-button.ts
index 86faa04d87f..82b825596ab 100644
--- a/ui/src/app/shared/components/modal/help-button/help-button.ts
+++ b/ui/src/app/shared/components/modal/help-button/help-button.ts
@@ -6,6 +6,7 @@ import { environment } from "src/environments";
 @Component({
     selector: "oe-help-button",
     templateUrl: "./help-button.html",
+    standalone: false,
 })
 export class HelpButtonComponent {
 
diff --git a/ui/src/app/shared/components/modal/modal-button/modal-button.ts b/ui/src/app/shared/components/modal/modal-button/modal-button.ts
index 240610984d1..c20fd426d89 100644
--- a/ui/src/app/shared/components/modal/modal-button/modal-button.ts
+++ b/ui/src/app/shared/components/modal/modal-button/modal-button.ts
@@ -5,6 +5,7 @@ import { AbstractModalLine } from "../abstract-modal-line";
 @Component({
     selector: "oe-modal-buttons",
     templateUrl: "./modal-button.html",
+    standalone: false,
 })
 export class ModalButtonsComponent extends AbstractModalLine {
 
diff --git a/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.ts b/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.ts
index d19b17030fe..4ab53d9a513 100644
--- a/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.ts
+++ b/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.ts
@@ -4,6 +4,7 @@ import { Icon } from "src/app/shared/type/widget";
 @Component({
     selector: "oe-modal-info-line",
     templateUrl: "./modal-info-line.html",
+    standalone: false,
 })
 export class ModalInfoLineComponent {
 
diff --git a/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.ts b/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.ts
index c9e36569b7b..12332b3664b 100644
--- a/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.ts
+++ b/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.ts
@@ -5,5 +5,6 @@ import { AbstractModalLine } from "../../abstract-modal-line";
   /** If multiple items in line use this */
   selector: "oe-modal-line-item",
   templateUrl: "./modal-line-item.html",
+  standalone: false,
 })
 export class ModalLineItemComponent extends AbstractModalLine { }
diff --git a/ui/src/app/shared/components/modal/modal-line/modal-line.ts b/ui/src/app/shared/components/modal/modal-line/modal-line.ts
index 76e9e187946..8fa75724a2f 100644
--- a/ui/src/app/shared/components/modal/modal-line/modal-line.ts
+++ b/ui/src/app/shared/components/modal/modal-line/modal-line.ts
@@ -5,6 +5,7 @@ import { ButtonLabel } from "../modal-button/modal-button";
 @Component({
     selector: "oe-modal-line",
     templateUrl: "./modal-line.html",
+    standalone: false,
 })
 export class ModalLineComponent extends AbstractModalLine {
 
diff --git a/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts b/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts
index 8dfdd170ea4..2a0cf4c5059 100644
--- a/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts
+++ b/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts
@@ -9,6 +9,7 @@ import { TextIndentation } from "../modal-line/modal-line";
   /** If multiple items in line use this */
   selector: "oe-modal-meter-phases",
   templateUrl: "./modal-phases.html",
+  standalone: false,
 })
 export class ModalPhasesComponent extends AbstractModalLine {
 
diff --git a/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.ts b/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.ts
index 992dd9261de..4e7c78e7444 100644
--- a/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.ts
+++ b/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.ts
@@ -7,6 +7,7 @@ import { AbstractModalLine } from "../abstract-modal-line";
 @Component({
   selector: "oe-modal-value-line",
   templateUrl: "./modal-value-line.html",
+  standalone: false,
 })
 export class ModalValueLineComponent extends AbstractModalLine {
 
diff --git a/ui/src/app/shared/components/modal/modal.ts b/ui/src/app/shared/components/modal/modal.ts
index 601283c75df..4d0d48e8ad7 100644
--- a/ui/src/app/shared/components/modal/modal.ts
+++ b/ui/src/app/shared/components/modal/modal.ts
@@ -22,6 +22,7 @@ export enum Status {
             font-size: 0.9em;
         }
     `],
+    standalone: false,
 })
 export class ModalComponent {
 
diff --git a/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.ts b/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.ts
index 98664ae0144..3da19f6274a 100644
--- a/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.ts
+++ b/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.ts
@@ -6,6 +6,7 @@ import { Component, Input } from "@angular/core";
 @Component({
     selector: "oe-modal-horizontal-line",
     templateUrl: "./modal-horizontal-line.html",
+    standalone: false,
 })
 export class ModalHorizontalLineComponent {
 
diff --git a/ui/src/app/shared/components/percentagebar/percentagebar.component.ts b/ui/src/app/shared/components/percentagebar/percentagebar.component.ts
index 0f636a02eba..7e47cc3d739 100644
--- a/ui/src/app/shared/components/percentagebar/percentagebar.component.ts
+++ b/ui/src/app/shared/components/percentagebar/percentagebar.component.ts
@@ -3,6 +3,7 @@ import { Component, Input } from "@angular/core";
 @Component({
     selector: "percentagebar",
     templateUrl: "./percentagebar.component.html",
+    standalone: false,
 })
 export class PercentageBarComponent {
 
diff --git a/ui/src/app/shared/components/pickdate/pickdate.component.ts b/ui/src/app/shared/components/pickdate/pickdate.component.ts
index 9d2e83fd813..90cfa356241 100644
--- a/ui/src/app/shared/components/pickdate/pickdate.component.ts
+++ b/ui/src/app/shared/components/pickdate/pickdate.component.ts
@@ -2,8 +2,7 @@
 import { Component, Input, OnDestroy, OnInit } from "@angular/core";
 import { PopoverController } from "@ionic/angular";
 import { TranslateService } from "@ngx-translate/core";
-import { addMonths, addYears, differenceInDays, differenceInMilliseconds, endOfDay, endOfMonth, endOfYear, isAfter, isBefore, startOfDay, startOfMonth, startOfWeek, startOfYear, subMonths, subYears } from "date-fns";
-import { addDays, addWeeks, endOfWeek, isFuture, subDays, subWeeks } from "date-fns/esm";
+import { addDays, addMonths, addWeeks, addYears, differenceInDays, differenceInMilliseconds, endOfDay, endOfMonth, endOfWeek, endOfYear, isAfter, isBefore, isFuture, startOfDay, startOfMonth, startOfWeek, startOfYear, subDays, subMonths, subWeeks, subYears } from "date-fns";
 
 import { DefaultTypes } from "../../service/defaulttypes";
 import { Edge, Service } from "../../shared";
@@ -13,6 +12,7 @@ import { PickDatePopoverComponent } from "./popover/popover.component";
 @Component({
     selector: "pickdate",
     templateUrl: "./pickdate.component.html",
+    standalone: false,
 })
 export class PickDateComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/shared/components/pickdate/popover/popover.component.ts b/ui/src/app/shared/components/pickdate/popover/popover.component.ts
index 41abd64ccad..3bf36ecc0da 100644
--- a/ui/src/app/shared/components/pickdate/popover/popover.component.ts
+++ b/ui/src/app/shared/components/pickdate/popover/popover.component.ts
@@ -3,8 +3,7 @@ import { Component, Input, OnInit } from "@angular/core";
 import { PopoverController } from "@ionic/angular";
 import { TranslateService } from "@ngx-translate/core";
 import { CalAnimation, IAngularMyDpOptions, IMyDate, IMyDateRangeModel } from "@nodro7/angular-mydatepicker";
-import { endOfMonth, startOfMonth } from "date-fns";
-import { addDays, endOfWeek, endOfYear, getDate, getMonth, getYear, startOfWeek, startOfYear } from "date-fns/esm";
+import { addDays, endOfMonth, endOfWeek, endOfYear, getDate, getMonth, getYear, startOfMonth, startOfWeek, startOfYear } from "date-fns";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { EdgePermission, Service, Utils } from "src/app/shared/shared";
 
@@ -13,6 +12,7 @@ import { Edge } from "../../edge/edge";
 @Component({
     selector: "pickdatepopover",
     templateUrl: "./popover.component.html",
+    standalone: false,
 })
 export class PickDatePopoverComponent implements OnInit {
 
@@ -29,6 +29,9 @@ export class PickDatePopoverComponent implements OnInit {
         stylesData: {
             selector: "dp1",
             styles: `
+            .dp1 {
+                overflow-x: hidden;
+            }
             .dp1 .myDpIconLeftArrow, 
             .dp1 .myDpIconRightArrow,
             .dp1 .myDpHeaderBtn {
diff --git a/ui/src/app/shared/components/shared/notification/notification.ts b/ui/src/app/shared/components/shared/notification/notification.ts
index 682dd9d33b4..8706336d31a 100644
--- a/ui/src/app/shared/components/shared/notification/notification.ts
+++ b/ui/src/app/shared/components/shared/notification/notification.ts
@@ -4,6 +4,7 @@ import { ToastController } from "@ionic/angular";
 @Component({
   selector: "oe-notification",
   template: "",
+  standalone: false,
 })
 export class NotificationComponent implements OnInit, OnChanges {
 
diff --git a/ui/src/app/shared/components/status/single/status.component.ts b/ui/src/app/shared/components/status/single/status.component.ts
index 9d269b1ce59..0654caab35d 100644
--- a/ui/src/app/shared/components/status/single/status.component.ts
+++ b/ui/src/app/shared/components/status/single/status.component.ts
@@ -14,6 +14,7 @@ import { CategorizedComponents, EdgeConfig } from "../../edge/edgeconfig";
 @Component({
     selector: StatusSingleComponent.SELECTOR,
     templateUrl: "./status.component.html",
+    standalone: false,
 })
 export class StatusSingleComponent implements OnInit, OnDestroy {
     private static readonly SELECTOR = "statussingle";
diff --git a/ui/src/app/shared/directive/autofill.ts b/ui/src/app/shared/directive/autofill.ts
index ef1dfc539f4..fa3c384bd28 100644
--- a/ui/src/app/shared/directive/autofill.ts
+++ b/ui/src/app/shared/directive/autofill.ts
@@ -5,6 +5,7 @@ import { Logger } from "../shared";
 
 @Directive({
   selector: "[appAutofill]",
+  standalone: false,
 })
 export class AutofillDirective implements OnInit {
 
diff --git a/ui/src/app/shared/directive/ngvar.ts b/ui/src/app/shared/directive/ngvar.ts
index 01923e9870a..c9b66a3b300 100644
--- a/ui/src/app/shared/directive/ngvar.ts
+++ b/ui/src/app/shared/directive/ngvar.ts
@@ -2,6 +2,7 @@ import { Directive, Input, TemplateRef, ViewContainerRef } from "@angular/core";
 
 @Directive({
     selector: "[ngVar]",
+    standalone: false,
 })
 export class VarDirective {
     private context: {
diff --git a/ui/src/app/shared/legacy/chartoptions/chartoptions.component.ts b/ui/src/app/shared/legacy/chartoptions/chartoptions.component.ts
index bb5399a749b..7d01b25555b 100644
--- a/ui/src/app/shared/legacy/chartoptions/chartoptions.component.ts
+++ b/ui/src/app/shared/legacy/chartoptions/chartoptions.component.ts
@@ -9,6 +9,7 @@ import { ChartOptionsPopoverComponent } from "./popover/popover.component";
 @Component({
     selector: "chartOptions",
     templateUrl: "./chartoptions.component.html",
+    standalone: false,
 })
 export class ChartOptionsComponent {
 
diff --git a/ui/src/app/shared/legacy/chartoptions/popover/popover.component.ts b/ui/src/app/shared/legacy/chartoptions/popover/popover.component.ts
index 5cddb86fbc6..a8bb201f292 100644
--- a/ui/src/app/shared/legacy/chartoptions/popover/popover.component.ts
+++ b/ui/src/app/shared/legacy/chartoptions/popover/popover.component.ts
@@ -6,6 +6,7 @@ import { Service } from "src/app/shared/shared";
 @Component({
     selector: "chartoptionspopover",
     templateUrl: "./popover.component.html",
+    standalone: false,
 })
 export class ChartOptionsPopoverComponent {
 
diff --git a/ui/src/app/shared/ngrx-store/states.ts b/ui/src/app/shared/ngrx-store/states.ts
index c957daee5e3..fd5110356a9 100644
--- a/ui/src/app/shared/ngrx-store/states.ts
+++ b/ui/src/app/shared/ngrx-store/states.ts
@@ -48,7 +48,7 @@ export class AppStateTracker {
         effect(() => {
             const state = this.websocket.state();
             this.startStateHandler(state);
-        }, { allowSignalWrites: true });
+        });
     }
 
     /**
diff --git a/ui/src/app/shared/pipe/classname/classname.pipe.ts b/ui/src/app/shared/pipe/classname/classname.pipe.ts
index dbc78248e44..cbc453b92f5 100644
--- a/ui/src/app/shared/pipe/classname/classname.pipe.ts
+++ b/ui/src/app/shared/pipe/classname/classname.pipe.ts
@@ -3,6 +3,7 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 @Pipe({
   name: "classname",
+  standalone: false,
 })
 export class ClassnamePipe implements PipeTransform {
   transform(value, args: string[]): any {
diff --git a/ui/src/app/shared/pipe/converter/converter.ts b/ui/src/app/shared/pipe/converter/converter.ts
index 34cc2fc6649..a03b8d9c4f6 100644
--- a/ui/src/app/shared/pipe/converter/converter.ts
+++ b/ui/src/app/shared/pipe/converter/converter.ts
@@ -4,6 +4,7 @@ import { Converter } from "../../components/shared/converter";
 
 @Pipe({
     name: "converter",
+    standalone: false,
 })
 export class ConverterPipe implements PipeTransform {
 
diff --git a/ui/src/app/shared/pipe/formatSecondsToDuration/formatSecondsToDuration.pipe.ts b/ui/src/app/shared/pipe/formatSecondsToDuration/formatSecondsToDuration.pipe.ts
index 85dcbb36b85..33ff8389b7d 100644
--- a/ui/src/app/shared/pipe/formatSecondsToDuration/formatSecondsToDuration.pipe.ts
+++ b/ui/src/app/shared/pipe/formatSecondsToDuration/formatSecondsToDuration.pipe.ts
@@ -5,6 +5,7 @@ import { Converter } from "../../components/shared/converter";
 
 @Pipe({
     name: "formatSecondsToDuration",
+    standalone: false,
 })
 export class FormatSecondsToDurationPipe implements PipeTransform {
 
diff --git a/ui/src/app/shared/pipe/isclass/isclass.pipe.ts b/ui/src/app/shared/pipe/isclass/isclass.pipe.ts
index 878c61e1d53..39fe3448c17 100644
--- a/ui/src/app/shared/pipe/isclass/isclass.pipe.ts
+++ b/ui/src/app/shared/pipe/isclass/isclass.pipe.ts
@@ -6,6 +6,7 @@ import { Pipe, PipeTransform } from "@angular/core";
  */
 @Pipe({
   name: "isclass",
+  standalone: false,
 })
 export class IsclassPipe implements PipeTransform {
   transform(object: any, classname: string): boolean {
diff --git a/ui/src/app/shared/pipe/keys/keys.pipe.ts b/ui/src/app/shared/pipe/keys/keys.pipe.ts
index 41d220c89af..ea47b26d222 100644
--- a/ui/src/app/shared/pipe/keys/keys.pipe.ts
+++ b/ui/src/app/shared/pipe/keys/keys.pipe.ts
@@ -3,6 +3,7 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 @Pipe({
   name: "keys",
+  standalone: false,
 })
 export class KeysPipe implements PipeTransform {
   transform(value, args: string[]): any {
diff --git a/ui/src/app/shared/pipe/sign/sign.pipe.ts b/ui/src/app/shared/pipe/sign/sign.pipe.ts
index 3929ad4997c..69c33c28fd4 100644
--- a/ui/src/app/shared/pipe/sign/sign.pipe.ts
+++ b/ui/src/app/shared/pipe/sign/sign.pipe.ts
@@ -3,6 +3,7 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 @Pipe({
     name: "sign",
+    standalone: false,
 })
 export class SignPipe implements PipeTransform {
     transform(value, args: string[]): any {
diff --git a/ui/src/app/shared/pipe/typeof/typeof.pipe.ts b/ui/src/app/shared/pipe/typeof/typeof.pipe.ts
index 288d771169c..50e8827b3b7 100644
--- a/ui/src/app/shared/pipe/typeof/typeof.pipe.ts
+++ b/ui/src/app/shared/pipe/typeof/typeof.pipe.ts
@@ -2,6 +2,7 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 @Pipe({
   name: "typeof",
+  standalone: false,
 })
 export class TypeofPipe implements PipeTransform {
 
diff --git a/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.ts b/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.ts
index 994ae841eaf..f6f548f8c42 100644
--- a/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.ts
+++ b/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.ts
@@ -5,6 +5,7 @@ import { Language } from "../../type/language";
 
 @Pipe({
     name: "unitvalue",
+    standalone: false,
 })
 export class UnitvaluePipe implements PipeTransform {
 
diff --git a/ui/src/app/shared/pipe/version/version.pipe.ts b/ui/src/app/shared/pipe/version/version.pipe.ts
index 01a7a757398..9e06a04f640 100644
--- a/ui/src/app/shared/pipe/version/version.pipe.ts
+++ b/ui/src/app/shared/pipe/version/version.pipe.ts
@@ -4,6 +4,7 @@ import { Role } from "../../type/role";
 
 @Pipe({
     name: "version",
+    standalone: false,
 })
 export class VersionPipe implements PipeTransform {
 
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index 75cca829719..c4ac3d7797c 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -8,7 +8,7 @@ import { IonicModule } from "@ionic/angular";
 import { FormlyFieldConfig, FormlyModule } from "@ngx-formly/core";
 import { FormlyIonicModule } from "@ngx-formly/ionic";
 import { TranslateModule } from "@ngx-translate/core";
-import { NgChartsModule } from "ng2-charts";
+import { BaseChartDirective } from "ng2-charts";
 import { NgxSpinnerModule } from "ngx-spinner";
 import { appRoutingProviders } from "../app-routing.module";
 import { ComponentsModule } from "./components/components.module";
@@ -93,7 +93,7 @@ export function SubnetmaskValidatorMessage(err, field: FormlyFieldConfig) {
     HistoryDataErrorModule,
     IonicModule,
     MeterModule,
-    NgChartsModule,
+    BaseChartDirective,
     NgxSpinnerModule.forRoot({
       type: "ball-clip-rotate-multiple",
     }),
@@ -137,7 +137,7 @@ export function SubnetmaskValidatorMessage(err, field: FormlyFieldConfig) {
     HistoryDataErrorModule,
     IonicModule,
     MeterModule,
-    NgChartsModule,
+    BaseChartDirective,
     NgxSpinnerModule,
     PercentageBarComponent,
     PipeModule,
diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts
index 4858ceca062..ac767f7efb3 100644
--- a/ui/src/app/shared/type/language.ts
+++ b/ui/src/app/shared/type/language.ts
@@ -119,7 +119,7 @@ export class Language {
      * @returns translations params
      */
     public static async setAdditionalTranslationFile(translationFile: any, translate: TranslateService): Promise<{ lang: string; translations: {}; shouldMerge?: boolean; }> {
-        const lang = (await translate.onLangChange.pipe(filter(lang => !!lang), take(1)).toPromise()).lang;
+        const lang = (await translate.onLangChange.pipe(filter(lang => !!lang), take(1)).toPromise()).lang ?? Language.DEFAULT.key;
         let translationKey: string = lang;
         if (!(lang in translationFile)) {
 
diff --git a/ui/src/app/shared/utils/array/array.utils.ts b/ui/src/app/shared/utils/array/array.utils.ts
index 037c4c4c4f6..1f00f0d723f 100644
--- a/ui/src/app/shared/utils/array/array.utils.ts
+++ b/ui/src/app/shared/utils/array/array.utils.ts
@@ -59,4 +59,15 @@ export namespace ArrayUtils {
   export function containsStrings(strings: (number | string | null)[], arr: (number | string | null)[]): boolean {
     return arr.filter(el => strings.includes(el)).length > 0;
   }
+
+  /**
+  * Checks if array contains at least one of the passed strings
+  *
+  * @param strings the strings
+  * @param arr the array
+  * @returns true if arr contains all of the strings
+  */
+  export function containsAllStrings(strings: (number | string | null)[], arr: (number | string | null)[]): boolean {
+    return arr.every(el => strings.includes(el));
+  }
 }
diff --git a/ui/src/app/shared/utils/object/object.utils.ts b/ui/src/app/shared/utils/object/object.utils.ts
index 043a0fdb465..2b0bd31d86d 100644
--- a/ui/src/app/shared/utils/object/object.utils.ts
+++ b/ui/src/app/shared/utils/object/object.utils.ts
@@ -1,3 +1,5 @@
+import { ArrayUtils } from "../array/array.utils";
+
 export class ObjectUtils {
 
     public static excludeProperties<T extends Record<string, any>, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
@@ -5,4 +7,8 @@ export class ObjectUtils {
         keys.forEach(key => delete result[key]);
         return result;
     }
+
+    public static hasKeys<T extends Record<string, any>>(obj: T, keys: string[]): boolean {
+        return ArrayUtils.containsAllStrings(Object.keys(obj), keys);
+    }
 }
diff --git a/ui/src/app/shared/utils/string/string.utils.ts b/ui/src/app/shared/utils/string/string.utils.ts
new file mode 100644
index 00000000000..e5f804b7fc8
--- /dev/null
+++ b/ui/src/app/shared/utils/string/string.utils.ts
@@ -0,0 +1,13 @@
+export namespace StringUtils {
+
+    /**
+     * Checks if the value does not occur in array
+     *
+     * @param val the value
+     * @param arr the array
+     * @returns true if passed value is not contained by the array
+     */
+    export function isNotIn(val: string, arr: string[]): boolean {
+        return arr.some(el => val != el);
+    }
+}
diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html
index b557cc07184..7a6f64e37c4 100644
--- a/ui/src/app/user/user.component.html
+++ b/ui/src/app/user/user.component.html
@@ -94,13 +94,10 @@
         </ion-card>
 
         <ion-card *ngIf="companyInformationFields.length > 0">
-          <ion-item lines="full" color="light">
+          <ion-item lines="full" color="light"
+            [label]="('Register.Form.contactDetails' | translate) + ' (' + ('Register.Form.company' | translate) + ')'">
             <ion-icon slot="start" size="large" color="primary" name="person-outline"></ion-icon>
             <ion-label class="ion-text-wrap">
-              <span translate>
-                Register.Form.contactDetails
-              </span>
-              (<span translate>Register.Form.company</span>)
             </ion-label>
           </ion-item>
           <ion-card-content>
@@ -149,9 +146,9 @@
           </ion-item>
           <ion-card-content>
             <ion-item lines="none">
-              <ion-label translate>About.language</ion-label>
               <ion-select #langSelect (ionChange)="setLanguage(langSelect.value)" [value]="currentLanguage"
-                interface="popover" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }">
+                interface="popover" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }"
+                [label]="'About.language' |translate">
                 <ion-select-option *ngFor="let language of languages" [value]="language">
                   {{ language.title }}
                 </ion-select-option>
@@ -160,9 +157,8 @@
             <ng-container *ngIf="isAtLeastAdmin">
               <div class="page-content">
                 <ion-item id="theme-switcher" lines="none">
-                  <ion-label>Theme</ion-label>
                   <ion-select #themeSelect (ionChange)="setTheme(themeSelect.value)" [value]="currentTheme"
-                    interface="popover" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }">
+                    interface="popover" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }" label="Theme">
                     <ion-select-option *ngFor="let theme of themes" [value]="theme.value">
                       {{ theme.key }}
                     </ion-select-option>
@@ -170,9 +166,9 @@
                 </ion-item>
               </div>
               <ion-item lines="none">
-                <ion-checkbox slot="end" (ionChange)="toggleDebugMode($event)" [(ngModel)]="environment.debugMode">
+                <ion-checkbox (ionChange)="toggleDebugMode($event)" [(ngModel)]="environment.debugMode"
+                  label="Debug-Mode" justify="space-between">Debug-Mode
                 </ion-checkbox>
-                <ion-label>Debug-Mode</ion-label>
               </ion-item>
               <ion-note class="ion-padding" *ngIf="environment.backend === 'OpenEMS Edge'">
                 <small>
diff --git a/ui/src/app/user/user.component.ts b/ui/src/app/user/user.component.ts
index c8df21bbbeb..23d299fcb18 100644
--- a/ui/src/app/user/user.component.ts
+++ b/ui/src/app/user/user.component.ts
@@ -34,6 +34,7 @@ type UserInformation = {
 
 @Component({
   templateUrl: "./user.component.html",
+  standalone: false,
 })
 export class UserComponent implements OnInit {
 
diff --git a/ui/src/environments/index.scss b/ui/src/environments/index.scss
index dfc6563b0c7..fcbbf2b8922 100644
--- a/ui/src/environments/index.scss
+++ b/ui/src/environments/index.scss
@@ -1,4 +1,4 @@
-@import "variables";
+@use "variables" as *;
 
 :root {
 
diff --git a/ui/src/global-ion-custom.scss b/ui/src/global-ion-custom.scss
index 2360b898e27..c5157763744 100644
--- a/ui/src/global-ion-custom.scss
+++ b/ui/src/global-ion-custom.scss
@@ -1,4 +1,4 @@
-@import "variables";
+@use "variables";
 
 .ion-font-size-medium {
     font-size: medium !important;
diff --git a/ui/src/global.scss b/ui/src/global.scss
index 11c66d094a7..d7904c89178 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -10,26 +10,26 @@
  */
 
 /* Core CSS required for Ionic components to work properly */
-@import "~@ionic/angular/css/core.css";
-@import "~@ionic/angular/css/display.css";
-@import "~@ionic/angular/css/flex-utils.css";
-@import "~@ionic/angular/css/float-elements.css";
+@use "node_modules/@ionic/angular/css/core.css" as *;
+@use "node_modules/@ionic/angular/css/display.css" as *;
+@use "node_modules/@ionic/angular/css/flex-utils.css" as *;
+@use "node_modules/@ionic/angular/css/float-elements.css" as *;
 /* Basic CSS for apps built with Ionic */
-@import "~@ionic/angular/css/normalize.css";
-@import "~@ionic/angular/css/structure.css";
-@import "~@ionic/angular/css/typography.css";
+@use "node_modules/@ionic/angular/css/normalize.css" as *;
+@use "node_modules/@ionic/angular/css/structure.css" as *;
+@use "node_modules/@ionic/angular/css/typography.css" as *;
 
 /* Optional CSS utils that can be commented out */
-@import "~@ionic/angular/css/padding.css";
-@import "~@ionic/angular/css/structure.css";
-@import "~@ionic/angular/css/text-alignment.css";
-@import "~@ionic/angular/css/text-transformation.css";
-@import "~@ionic/angular/css/typography.css";
+@use "node_modules/@ionic/angular/css/padding.css" as *;
+@use "node_modules/@ionic/angular/css/structure.css" as *;
+@use "node_modules/@ionic/angular/css/text-alignment.css" as *;
+@use "node_modules/@ionic/angular/css/text-transformation.css" as *;
+@use "node_modules/@ionic/angular/css/typography.css" as *;
 /* ngx-spinner */
-@import "node_modules/ngx-spinner/animations/ball-clip-rotate-multiple.css";
-@import "./environments/index.scss";
-@import "variables";
-@import "./global-ion-custom.scss";
+@use "node_modules/ngx-spinner/animations/ball-clip-rotate-multiple.css" as *;
+@use "./environments/index.scss" as *;
+@use "variables" as *;
+@use "./global-ion-custom.scss" as *;
 
 ion-alert {
     color: green;
@@ -47,14 +47,6 @@ ion-card-content {
     color: var(--ion-card-content-color);
 }
 
-.custom-ion-popover {
-
-    white-space: inherit;
-
-    // Overwrites default width of popover
-    --min-width: min-content;
-}
-
 .footer-color {
     background-color: var(--ion-color-toolbar-secondary) !important;
 }
@@ -151,6 +143,14 @@ formly-field-ion-radio {
 }
 
 .custom-ion-popover {
+
+    --border-width: 0;
+
+    // Floating label
+    &::part(label) {
+        color: var(--ion-color-primary) !important;
+    }
+
     // Overwrites default width of popover
     white-space: inherit;
     --min-width: min-content;
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index 64acad31696..65543d6d36a 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -31,6 +31,6 @@
     "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": false,
     "strictInputAccessModifiers": true,
-    "strictTemplates": false
+    "strictTemplates": false,
   }
 }

From 2a1b88ae7109230cfc054321412a15a795c2259a Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Wed, 18 Dec 2024 11:11:24 +0100
Subject: [PATCH 12/49] FEMS Backports 2024-12-18 (#2932)

- Edge
  - EVCS Api State: remove CHARGING_FINISHED, i.e. "Car is full"
    - Removed "CHARGING_FINISHED" from Status in evcs.api
    - Fix for every part where CHARGING_FINISHED was referenced
  - Fix CI Build: remove OCPP dependency javax.xml.soap
  - Edge: Mennekes Occupied Check
    - Added Check if ActivePower is present when mapping the OcppStatus 1 of the Mennekes Register 104.
  - Controller.Ess.EmergencyCapacityReserve: recharge from grid
    - Config setting + channel in Meta Component
    - new state for in satemachine of emergencyreservesoc
    - change logic of statehandlers to include new state

- UI
  - Add Custom Min Value for Y-Axis in Charts to enhance schedule display
  -  dark mode improvements
    - replace legacy percentagebar
    - delete unused old systemupdate component
    - change header title color
  - Emergency Reserve with Charge-from-Grid

---------

Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
Co-authored-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
---
 io.openems.edge.application/EdgeApp.bndrun    |   1 -
 .../src/io/openems/edge/common/meta/Meta.java |  63 ++++-
 .../openems/edge/common/test/DummyMeta.java   |  10 +
 .../doc/statemachine.md                       |  28 +-
 ...ControllerEssEmergencyCapacityReserve.java |  34 ++-
 ...rollerEssEmergencyCapacityReserveImpl.java |  10 +-
 .../statemachine/AtReserveSocHandler.java     |   7 +-
 .../statemachine/BelowReserveSocHandler.java  |  11 +-
 .../statemachine/Context.java                 |  14 +-
 .../statemachine/ForceChargeGridHandler.java  |  42 +++
 ...Handler.java => ForceChargePvHandler.java} |  12 +-
 .../statemachine/StateMachine.java            |  58 +++--
 .../statemachine/UndefinedHandler.java        |  37 +++
 ...erEssEmergencyCapacityReserveImplTest.java | 148 +++++++++--
 .../statemachine/ForceChargeHandlerTest.java  |   2 +-
 .../controller/evcs/ControllerEvcsImpl.java   |   3 +-
 .../src/io/openems/edge/core/meta/Config.java |   3 +
 .../io/openems/edge/core/meta/MetaImpl.java   |   1 +
 .../io/openems/edge/core/meta/MyConfig.java   |  11 +
 .../EvcsAlpitronicHyperchargerImpl.java       |   5 +-
 .../src/io/openems/edge/evcs/api/Status.java  |   3 +-
 .../openems/edge/evcs/api/WriteHandler.java   |  27 +-
 .../cluster/EvcsClusterPeakShavingImpl.java   |  27 +-
 .../edge/evcs/dezony/DezonyReadWorker.java    |  17 +-
 .../chargerhome/EvcsGoeChargerHomeImpl.java   |   2 +-
 .../evcs/hardybarth/HardyBarthReadUtils.java  |  17 +-
 .../edge/evcs/keba/kecontact/ReadHandler.java |  19 --
 .../edge/evcs/mennekes/EvcsMennekesImpl.java  |   6 +-
 .../AbstractManagedOcppEvcsComponent.java     |  23 +-
 .../ocpp/server/CoreEventHandlerImpl.java     |  41 +--
 .../webasto/next/EvcsWebastoNextImpl.java     |  29 +--
 .../webasto/unite/WebastoReadHandler.java     |   3 +-
 io.openems.wrapper/eu.chargetime.ocpp.bnd     |   1 -
 ui/src/app/app.component.html                 |   2 +-
 .../Ess/TimeOfUseTariff/chart/chart.ts        |   7 +-
 ...ayedselltogridchartoverview.component.html |   6 +-
 .../heatpumpchartoverview.component.html      |   6 +-
 ...ricpeakshavingchartoverview.component.html |   6 +-
 ...ricpeakshavingchartoverview.component.html |   6 +-
 ...lotpeakshavingchartoverview.component.html |   6 +-
 .../storagechartoverview.component.html       |   7 +-
 .../TimeOfUseTariff/modal/statePriceChart.ts  |   2 +-
 .../common/storage/modal/modal.component.html |  16 ++
 .../common/storage/modal/modal.component.ts   | 245 ++++++++++--------
 .../live/common/storage/storage.component.ts  |   4 -
 .../app/edge/settings/settings.component.html |   5 +-
 ui/src/app/edge/settings/settings.module.ts   |   2 +
 .../system/executesystemupdate.component.html | 121 ---------
 .../system/executesystemupdate.component.ts   |  64 -----
 .../system/oe-system-update.component.html    |   3 +-
 .../system/oe-system-update.component.ts      |   6 +
 .../components/chart/chart.constants.ts       |   6 +
 ui/src/app/shared/components/chart/chart.html |   2 +-
 .../app/shared/components/footer/footer.html  |   2 +-
 .../subnavigation/footerNavigation.html       |   2 +-
 .../components/header/header.component.html   |   6 +-
 ui/src/app/shared/components/modal/modal.html |   2 +-
 .../pickdate/popover/popover.component.ts     |  24 +-
 .../chartoptions/chartoptions.component.html  |   2 +-
 ui/src/assets/i18n/de.json                    |   9 +-
 ui/src/assets/i18n/en.json                    |   9 +-
 ui/src/environments/index.scss                |   2 +
 ui/src/global.scss                            |   3 +-
 63 files changed, 722 insertions(+), 576 deletions(-)
 create mode 100644 io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java
 rename io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/{ForceChargeHandler.java => ForceChargePvHandler.java} (75%)
 create mode 100644 io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/UndefinedHandler.java
 delete mode 100644 ui/src/app/edge/settings/system/executesystemupdate.component.html
 delete mode 100644 ui/src/app/edge/settings/system/executesystemupdate.component.ts

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 577f4a3dddd..89293689e9f 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -404,7 +404,6 @@
 	io.openems.wrapper.sdnotify;version=snapshot,\
 	io.reactivex.rxjava3.rxjava;version='[3.1.10,3.1.11)',\
 	javax.jmdns;version='[3.4.1,3.4.2)',\
-	javax.xml.soap-api;version='[1.4.0,1.4.1)',\
 	org.apache.commons.commons-codec;version='[1.17.1,1.17.2)',\
 	org.apache.commons.commons-compress;version='[1.27.1,1.27.2)',\
 	org.apache.commons.commons-csv;version='[1.11.0,1.11.1)',\
diff --git a/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java b/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java
index aa31e104d1f..e481f7f4371 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java
@@ -1,11 +1,16 @@
 package io.openems.edge.common.meta;
 
+import static io.openems.common.channel.PersistencePriority.HIGH;
+import static io.openems.common.channel.PersistencePriority.VERY_LOW;
+import static io.openems.common.channel.Unit.SECONDS;
+import static io.openems.common.types.OpenemsType.BOOLEAN;
+import static io.openems.common.types.OpenemsType.LONG;
+import static io.openems.common.types.OpenemsType.STRING;
+
 import io.openems.common.OpenemsConstants;
 import io.openems.common.channel.AccessMode;
-import io.openems.common.channel.PersistencePriority;
-import io.openems.common.channel.Unit;
 import io.openems.common.oem.OpenemsEdgeOem;
-import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.BooleanReadChannel;
 import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.channel.EnumReadChannel;
 import io.openems.edge.common.channel.value.Value;
@@ -29,8 +34,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * <li>Type: String
 		 * </ul>
 		 */
-		VERSION(Doc.of(OpenemsType.STRING) //
-				.persistencePriority(PersistencePriority.HIGH)),
+		VERSION(Doc.of(STRING) //
+				.persistencePriority(HIGH)),
 		/**
 		 * System Time: seconds since 1st January 1970 00:00:00 UTC.
 		 *
@@ -39,10 +44,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * <li>Type: Long
 		 * </ul>
 		 */
-		SYSTEM_TIME_UTC(Doc.of(OpenemsType.LONG) //
-				.unit(Unit.SECONDS) //
+		SYSTEM_TIME_UTC(Doc.of(LONG) //
+				.unit(SECONDS) //
 				.text("System Time: seconds since 1st January 1970 00:00:00 UTC") //
-				.persistencePriority(PersistencePriority.VERY_LOW)),
+				.persistencePriority(VERY_LOW)),
 		/**
 		 * Edge currency.
 		 * 
@@ -52,7 +57,18 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * </ul>
 		 */
 		CURRENCY(Doc.of(Currency.values()) //
-				.persistencePriority(PersistencePriority.HIGH));
+				.persistencePriority(HIGH)),
+
+		/**
+		 * Is it allowed to charge the ESS from Grid?.
+		 * 
+		 * <ul>
+		 * <li>Interface: Meta
+		 * <li>Type: Boolean
+		 * </ul>
+		 */
+		IS_ESS_CHARGE_FROM_GRID_ALLOWED(Doc.of(BOOLEAN) //
+				.persistencePriority(HIGH));
 
 		private final Doc doc;
 
@@ -116,4 +132,33 @@ public default Currency getCurrency() {
 	public default void _setCurrency(Currency value) {
 		this.getCurrencyChannel().setNextValue(value);
 	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#IS_ESS_CHARGE_FROM_GRID_ALLOWED}.
+	 *
+	 * @return the Channel
+	 */
+	public default BooleanReadChannel getIsEssChargeFromGridAllowedChannel() {
+		return this.channel(ChannelId.IS_ESS_CHARGE_FROM_GRID_ALLOWED);
+	}
+
+	/**
+	 * Gets whether charging the ESS from grid is allowed. See
+	 * {@link ChannelId#IS_ESS_CHARGE_FROM_GRID_ALLOWED}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default boolean getIsEssChargeFromGridAllowed() {
+		return this.getIsEssChargeFromGridAllowedChannel().value().orElse(false);
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on
+	 * {@link ChannelId#IS_ESS_CHARGE_FROM_GRID_ALLOWED} Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setIsEssChargeFromGridAllowed(boolean value) {
+		this.getIsEssChargeFromGridAllowedChannel().setNextValue(value);
+	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/DummyMeta.java b/io.openems.edge.common/src/io/openems/edge/common/test/DummyMeta.java
index b77fcb3356f..726bbe59bff 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/DummyMeta.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/DummyMeta.java
@@ -40,4 +40,14 @@ public DummyMeta withCurrency(Currency value) {
 		return this.self();
 	}
 
+	/**
+	 * Set {@link Meta.ChannelId#IS_ESS_CHARGE_FROM_GRID_ALLOWED}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public DummyMeta withIsEssChargeFromGridAllowed(boolean value) {
+		TestUtils.withValue(this, Meta.ChannelId.IS_ESS_CHARGE_FROM_GRID_ALLOWED, value);
+		return this.self();
+	}
 }
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/doc/statemachine.md b/io.openems.edge.controller.ess.emergencycapacityreserve/doc/statemachine.md
index a0264a69c01..67bc1553aec 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/doc/statemachine.md
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/doc/statemachine.md
@@ -2,21 +2,23 @@
 
 ```mermaid
 graph TD
-NO_LIMIT["NO_LIMIT<br>SoC > 21 %<br>No Limit<br>[infinity, infinity]<br>1 %p/sec"] -->|discharge, SoC <= 21 %| ABOVE_RESERVE_SOC["ABOVE_RESERVE_SOC<br>[infinity, max(50 % mAP, DC-PV)]<br>1 %p/sec"]
-
-ABOVE_RESERVE_SOC -->|discharge, SoC <= 20 %| AT_RESERVE_SOC["AT_RESERVE_SOC<br>[infinity, max(0, DC-PV)]<br>1 %p/sec"]
-
-AT_RESERVE_SOC -->|discharge, SoC < 20| UNDER_RESERVE_SOC["UNDER_RESERVE_SOC<br>[infinity, 0]<br>5 %p/sec"]
-
-UNDER_RESERVE_SOC -->|discharge, SoC <= 16| FORCE_CHARGE["FORCE_CHARGE<br>Force-Charge with AC-PV<br>[infinity, AC-PV * -1]<br>1 %p/sec"]
-
-FORCE_CHARGE -->|charge, SoC >= 20| AT_RESERVE_SOC
-
-AT_RESERVE_SOC -->|charge, SoC > 20| ABOVE_RESERVE_SOC
-
+NO_LIMIT -->|discharge, SoC <= 21 %| ABOVE_RESERVE_SOC
+ABOVE_RESERVE_SOC -->|discharge, SoC <= 20 %| AT_RESERVE_SOC
 ABOVE_RESERVE_SOC -->|charge, SoC > 21| NO_LIMIT
-
+AT_RESERVE_SOC -->|discharge, SoC < 20| BELOW_RESERVE_SOC["BELOW_RESERVE_SOC<br>[infinity, 0]<br>5 %p/sec"]
+AT_RESERVE_SOC -->|charge, <br>if last state FORCE_CHARGE_GRID: <br> SoC > 21,<br>else: SoC > 20| ABOVE_RESERVE_SOC
+BELOW_RESERVE_SOC -->|discharge, SoC <= 19| FORCE_CHARGE_PV
+BELOW_RESERVE_SOC -->|discharge, SoC < 18| FORCE_CHARGE_GRID
+FORCE_CHARGE_PV -->|charge, SoC >= 20| AT_RESERVE_SOC
+FORCE_CHARGE_PV --> |discharge, SoC < 18| FORCE_CHARGE_GRID
+FORCE_CHARGE_GRID -->|charge, SoC >= 21| AT_RESERVE_SOC
+UNDEFINED["UNDEFINED<br>Initial State<br>[Start of Process]"]  -->|SoC < 18 %| FORCE_CHARGE_GRID["FORCE_CHARGE_GRID<br>Force-Charge with Grid Power<br>[infinity, max[10 % mAP if SoC >= 17%, else 50 % mAP]]<br>1 %p/sec"]
+UNDEFINED -->|SoC == 19 %| FORCE_CHARGE_PV["FORCE_CHARGE_PV<br>Force-Charge with AC-PV<br>[infinity, AC-PV * -1]<br>1 %p/sec"]
+UNDEFINED -->|SoC == 20 %| AT_RESERVE_SOC["AT_RESERVE_SOC<br>[infinity, max(0, DC-PV)]<br>1 %p/sec"]
+UNDEFINED -->|SoC == 21 %| ABOVE_RESERVE_SOC["ABOVE_RESERVE_SOC<br>[infinity, max(50 % mAP, DC-PV)]<br>1 %p/sec"]
+UNDEFINED -->|SoC > 21 %| NO_LIMIT["NO_LIMIT<br>SoC > 21 %<br>No Limit<br>[infinity, infinity]<br>1 %p/sec"]
 DESCRIPTION["Example ReserveSoc = 20%<br>ReserveSoc in [5;100]<br>%p = Percentage Point<br>mAP = MaxApparentPower<br>Ramp increase/decrease by 1 %p/sec of MaxApparentPower"]
+
 ```
 
 View using Mermaid, e.g. https://mermaid-js.github.io/mermaid-live-editor
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserve.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserve.java
index 2fc861054af..43eaecfffa3 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserve.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserve.java
@@ -1,9 +1,12 @@
 package io.openems.edge.controller.ess.emergencycapacityreserve;
 
+import static io.openems.common.channel.PersistencePriority.HIGH;
+import static io.openems.common.channel.Unit.PERCENT;
+import static io.openems.common.channel.Unit.WATT;
+import static io.openems.common.types.OpenemsType.FLOAT;
+import static io.openems.common.types.OpenemsType.INTEGER;
+
 import io.openems.common.channel.Level;
-import io.openems.common.channel.PersistencePriority;
-import io.openems.common.channel.Unit;
-import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.channel.FloatReadChannel;
@@ -23,28 +26,31 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * Current state of the StateMachine.
 		 */
 		STATE_MACHINE(Doc.of(State.values()) //
-				.text("Current State of State-Machine")), //
+				.text("Current State of State-Machine") //
+				.persistencePriority(HIGH)), //
 
 		/**
 		 * Holds {@link ManagedSymmetricEss.ChannelId#SET_ACTIVE_POWER_LESS_OR_EQUALS}
 		 * for debug purpose.
 		 */
-		DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
-				.unit(Unit.WATT) //
+		DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS(Doc.of(INTEGER) //
+				.unit(WATT) //
 				.text("The debug SetActivePowerLessOrEquals")), //
 
 		/**
 		 * Holds target power to reach.
 		 */
-		DEBUG_TARGET_POWER(Doc.of(OpenemsType.FLOAT) //
-				.unit(Unit.WATT) //
-				.text("The debug target power to reach")), //
+		DEBUG_TARGET_POWER(Doc.of(FLOAT) //
+				.unit(WATT) //
+				.text("The debug target power to reach") //
+				.persistencePriority(HIGH) //
+		), //
 
 		/**
 		 * Holds power to increase/decrease ramp for every cycle.
 		 */
-		DEBUG_RAMP_POWER(Doc.of(OpenemsType.FLOAT) //
-				.unit(Unit.WATT) //
+		DEBUG_RAMP_POWER(Doc.of(FLOAT) //
+				.unit(WATT) //
 				.text("The debug ramp power to decrease power")), //
 
 		/**
@@ -56,10 +62,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds the actual reserve soc value. Holds null if reserve soc is disabled.
 		 */
-		ACTUAL_RESERVE_SOC(Doc.of(OpenemsType.INTEGER) //
-				.unit(Unit.PERCENT) //
+		ACTUAL_RESERVE_SOC(Doc.of(INTEGER) //
+				.unit(PERCENT) //
 				.text("The reserve soc value") //
-				.persistencePriority(PersistencePriority.HIGH)); //
+				.persistencePriority(HIGH)); //
 
 		private final Doc doc;
 
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java
index b14539333c3..f830c10b957 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java
@@ -24,6 +24,7 @@
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.filter.RampFilter;
+import io.openems.edge.common.meta.Meta;
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.Context;
@@ -49,7 +50,7 @@ public class ControllerEssEmergencyCapacityReserveImpl extends AbstractOpenemsCo
 
 	private final Logger log = LoggerFactory.getLogger(ControllerEssEmergencyCapacityReserveImpl.class);
 	private final EnergyScheduleHandler energyScheduleHandler;
-	private final StateMachine stateMachine = new StateMachine(State.NO_LIMIT);
+	private final StateMachine stateMachine = new StateMachine(State.UNDEFINED);
 	private final RampFilter rampFilter = new RampFilter();
 
 	@Reference
@@ -61,6 +62,9 @@ public class ControllerEssEmergencyCapacityReserveImpl extends AbstractOpenemsCo
 	@Reference
 	private Sum sum;
 
+	@Reference
+	private Meta meta;
+
 	@Reference
 	private ManagedSymmetricEss ess;
 
@@ -173,8 +177,8 @@ private Context handleStateMachine() {
 		if (socToUse == null || !maxApparentPower.isDefined()) {
 			this.stateMachine.forceNextState(State.NO_LIMIT);
 		}
-
-		var context = new Context(this, this.sum, maxApparentPower.get(), socToUse, this.config.reserveSoc());
+		var context = new Context(this, this.sum, maxApparentPower.get(), socToUse, this.config.reserveSoc(),
+				this.meta.getIsEssChargeFromGridAllowed());
 		try {
 			this.stateMachine.run(context);
 
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java
index cdf5d039757..ec4e2b3b7e8 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java
@@ -23,8 +23,13 @@ protected State runAndGetNextState(Context context) throws OpenemsNamedException
 			return State.BELOW_RESERVE_SOC;
 		}
 
+		int reserveSocBuffer = switch (context.getLastActiveState()) {
+		case FORCE_CHARGE_GRID -> 1;
+		default -> 0;
+		};
+
 		// SoC is under configured reserveSoC
-		if (soc > reserveSoc) {
+		if (soc > reserveSoc + reserveSocBuffer) {
 			return State.ABOVE_RESERVE_SOC;
 		}
 
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java
index f68c5ca26fa..ff1ffdd1ac5 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java
@@ -15,9 +15,14 @@ protected State runAndGetNextState(Context context) throws OpenemsNamedException
 		var reserveSoc = context.reserveSoc;
 		int soc = context.soc;
 
-		// SoC is 4% under configured reserveSoC
-		if (soc <= reserveSoc - 4 || soc <= 0) {
-			return State.FORCE_CHARGE;
+		// SoC is atleast 2% under configured reserveSoC and gridcharging is enabled
+		if ((soc <= reserveSoc - 2) && context.isEssChargeFromGridAllowed) {
+			return State.FORCE_CHARGE_GRID;
+		}
+
+		// Enter FORCE_CHARGE_PV sooner when grid charge is allowed
+		if (soc <= reserveSoc - 1 || soc <= 0) {
+			return State.FORCE_CHARGE_PV;
 		}
 
 		// SoC is greater then configured reserveSoC
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
index 633cffcbe0d..68f2031ba43 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
@@ -3,10 +3,12 @@
 import io.openems.edge.common.statemachine.AbstractContext;
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.ess.emergencycapacityreserve.ControllerEssEmergencyCapacityReserve;
+import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
 
 public class Context extends AbstractContext<ControllerEssEmergencyCapacityReserve> {
 
 	protected final Sum sum;
+	protected final boolean isEssChargeFromGridAllowed;
 
 	/**
 	 * MaxApparentPower is guaranteed to be not-null in any State other than
@@ -21,14 +23,16 @@ public class Context extends AbstractContext<ControllerEssEmergencyCapacityReser
 
 	private Float targetPower;
 	private float rampPower;
+	private State lastActiveState;
 
 	public Context(ControllerEssEmergencyCapacityReserve emergencyCapacityReserve, Sum sum, Integer maxApparentPower,
-			Integer soc, int reserveSoc) {
+			Integer soc, int reserveSoc, boolean isEssChargeFromGridAllowed) {
 		super(emergencyCapacityReserve);
 		this.sum = sum;
 		this.maxApparentPower = maxApparentPower;
 		this.soc = soc;
 		this.reserveSoc = reserveSoc;
+		this.isEssChargeFromGridAllowed = isEssChargeFromGridAllowed;
 	}
 
 	public Float getTargetPower() {
@@ -47,6 +51,10 @@ public float getRampPower() {
 		return this.rampPower;
 	}
 
+	public State getLastActiveState() {
+		return this.lastActiveState == null ? State.UNDEFINED : this.lastActiveState;
+	}
+
 	protected void setRampPower(Double rampPower) {
 		this.rampPower = rampPower == null ? null : rampPower.floatValue();
 	}
@@ -59,4 +67,8 @@ protected void setRampPower(int rampPower) {
 		this.rampPower = rampPower;
 	}
 
+	public void setLastActiveState(State state) {
+		this.lastActiveState = state;
+	}
+
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java
new file mode 100644
index 00000000000..a5d0478a391
--- /dev/null
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java
@@ -0,0 +1,42 @@
+package io.openems.edge.controller.ess.emergencycapacityreserve.statemachine;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.edge.common.statemachine.StateHandler;
+import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
+
+public class ForceChargeGridHandler extends StateHandler<State, Context> {
+
+	@Override
+	protected State runAndGetNextState(Context context) throws OpenemsNamedException {
+		var reserveSoc = context.reserveSoc;
+		int soc = context.soc;
+
+		// leave grid charge logic when grid charge gets disabled
+		if (!context.isEssChargeFromGridAllowed) {
+			if (soc <= reserveSoc - 1) {
+				return State.BELOW_RESERVE_SOC;
+			}
+			return State.AT_RESERVE_SOC;
+		}
+
+		float targetPower;
+
+		if (soc <= reserveSoc - 4 || soc <= 0) {
+			targetPower = context.maxApparentPower * -0.5f;
+		} else {
+			targetPower = context.maxApparentPower * -0.1f;
+		}
+
+		// calculate target and ramp power
+		context.setTargetPower(targetPower);
+		context.setRampPower(context.maxApparentPower * 0.01);
+
+		// SoC is greater or equals then configured reserveSoC or 100
+		if (soc >= reserveSoc + 1 || soc == 100) {
+			return State.AT_RESERVE_SOC;
+		}
+
+		return State.FORCE_CHARGE_GRID;
+	}
+
+}
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargePvHandler.java
similarity index 75%
rename from io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java
rename to io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargePvHandler.java
index bd085edea49..8daafbe6aeb 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargePvHandler.java
@@ -7,7 +7,7 @@
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
 
-public class ForceChargeHandler extends StateHandler<State, Context> {
+public class ForceChargePvHandler extends StateHandler<State, Context> {
 
 	@Override
 	protected State runAndGetNextState(Context context) throws OpenemsNamedException {
@@ -20,12 +20,16 @@ protected State runAndGetNextState(Context context) throws OpenemsNamedException
 		var reserveSoc = context.reserveSoc;
 		int soc = context.soc;
 
-		// SoC is greater or equals then configured reserveSoC
-		if (soc >= reserveSoc) {
+		// SoC is greater or equals then configured reserveSoC or 100
+		if (soc >= reserveSoc + 1 || soc == 100) {
 			return State.AT_RESERVE_SOC;
 		}
 
-		return State.FORCE_CHARGE;
+		if (soc <= reserveSoc - 2 && context.isEssChargeFromGridAllowed) {
+			return State.FORCE_CHARGE_GRID;
+		}
+
+		return State.FORCE_CHARGE_PV;
 	}
 
 	/**
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
index 362234ccf3e..290e1fb1c47 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.CaseFormat;
 
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.types.OptionsEnum;
 import io.openems.edge.common.statemachine.AbstractStateMachine;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -10,6 +11,11 @@ public class StateMachine extends AbstractStateMachine<StateMachine.State, Conte
 
 	public enum State implements io.openems.edge.common.statemachine.State<State>, OptionsEnum {
 
+		/**
+		 * Start state for new StateMachine, never entered again.
+		 */
+		UNDEFINED(-1), //
+
 		/**
 		 * State if SoC is greater then configured reserve SoC.
 		 */
@@ -31,9 +37,15 @@ public enum State implements io.openems.edge.common.statemachine.State<State>, O
 		BELOW_RESERVE_SOC(4), //
 
 		/**
-		 * State if SoC is 4% under configured reserve SoC.
+		 * State if SoC is 1% under configured reserve SoC.
+		 */
+		FORCE_CHARGE_PV(5), //
+
+		/**
+		 * State if SoC is 2 % under configured reserve SoC.
 		 */
-		FORCE_CHARGE(5);
+		FORCE_CHARGE_GRID(6), //
+		;
 
 		private final int value;
 
@@ -53,7 +65,7 @@ public String getName() {
 
 		@Override
 		public OptionsEnum getUndefined() {
-			return NO_LIMIT;
+			return UNDEFINED;
 		}
 
 		@Override
@@ -62,25 +74,39 @@ public State[] getStates() {
 		}
 	}
 
+	private State lastActiveState = State.UNDEFINED;
+
+	@Override
+	public void run(Context context) throws OpenemsNamedException {
+		if (!this.getPreviousState().equals(this.getCurrentState())) {
+			this.lastActiveState = this.getPreviousState();
+		}
+		context.setLastActiveState(this.lastActiveState);
+		super.run(context);
+	}
+
 	public StateMachine(State initialState) {
 		super(initialState);
 	}
 
 	@Override
 	public StateHandler<StateMachine.State, Context> getStateHandler(State state) {
-		switch (state) {
-		case NO_LIMIT:
-			return new NoLimitHandler();
-		case ABOVE_RESERVE_SOC:
-			return new AboveReserveSocHandler();
-		case AT_RESERVE_SOC:
-			return new AtReserveSocHandler();
-		case BELOW_RESERVE_SOC:
-			return new BelowReserveSocHandler();
-		case FORCE_CHARGE:
-			return new ForceChargeHandler();
-		}
-		throw new IllegalArgumentException("Unknown State [" + state + "]");
+		return switch (state) {
+		case NO_LIMIT ->
+			new NoLimitHandler();
+		case ABOVE_RESERVE_SOC -> 
+			new AboveReserveSocHandler();
+		case AT_RESERVE_SOC ->
+			new AtReserveSocHandler();
+		case BELOW_RESERVE_SOC ->
+			new BelowReserveSocHandler();
+		case FORCE_CHARGE_PV ->
+			new ForceChargePvHandler();
+		case FORCE_CHARGE_GRID ->
+			new ForceChargeGridHandler();
+		case UNDEFINED ->
+			new UndefinedHandler();
+		};
 	}
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/UndefinedHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/UndefinedHandler.java
new file mode 100644
index 00000000000..5290da716a5
--- /dev/null
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/UndefinedHandler.java
@@ -0,0 +1,37 @@
+package io.openems.edge.controller.ess.emergencycapacityreserve.statemachine;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.edge.common.statemachine.StateHandler;
+import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
+
+public class UndefinedHandler extends StateHandler<State, Context> {
+
+	@Override
+	protected State runAndGetNextState(Context context) throws OpenemsNamedException {
+		if (context.soc != null && context.maxApparentPower != null) {
+			var reserveSoc = context.reserveSoc;
+			var soc = context.soc;
+
+			if (soc < reserveSoc - 1) {
+				return State.FORCE_CHARGE_GRID;
+			}
+
+			if (soc == reserveSoc - 1) {
+				return State.FORCE_CHARGE_PV;
+			}
+
+			if (soc == reserveSoc) {
+				return State.AT_RESERVE_SOC;
+			}
+
+			if (soc == reserveSoc + 1) {
+				return State.ABOVE_RESERVE_SOC;
+			}
+
+			return State.NO_LIMIT;
+		}
+
+		return State.UNDEFINED;
+	}
+
+}
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
index 4b8e05a2819..2ab88d2be77 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
@@ -18,6 +18,7 @@
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.common.test.DummyMeta;
 import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
@@ -30,6 +31,7 @@ public void testReserveSocRange() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -44,6 +46,7 @@ public void testReserveSocRange() throws Exception {
 		new ControllerTest(new ControllerEssEmergencyCapacityReserveImpl()) //
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("sum", new DummySum()) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
@@ -59,6 +62,7 @@ public void testReserveSocRange() throws Exception {
 		new ControllerTest(new ControllerEssEmergencyCapacityReserveImpl()) //
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("sum", new DummySum()) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
@@ -75,6 +79,7 @@ public void testReserveSocRange() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -90,6 +95,7 @@ public void testReserveSocRange() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -108,6 +114,7 @@ public void testReachTargetPower() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -118,7 +125,7 @@ public void testReachTargetPower() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
 						.input("ess0", MAX_APPARENT_POWER, 10000) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 21) //
 						.output(STATE_MACHINE, State.NO_LIMIT)); //
@@ -151,6 +158,7 @@ public void testAllStates() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -161,7 +169,7 @@ public void testAllStates() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
 						.input("ess0", MAX_APPARENT_POWER, 10000) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 21) //
 						.output(STATE_MACHINE, State.NO_LIMIT)) //
@@ -174,11 +182,11 @@ public void testAllStates() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 16) //
 						.output(STATE_MACHINE, State.BELOW_RESERVE_SOC)) //
-				.next(new TestCase() //
-						.input("ess0", SOC, 20) //
-						.output(STATE_MACHINE, State.FORCE_CHARGE)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 21) //
+						.output(STATE_MACHINE, State.FORCE_CHARGE_PV)) //
+				.next(new TestCase() // overcharges by 1%
+						.input("ess0", SOC, 22) //
 						.output(STATE_MACHINE, State.AT_RESERVE_SOC)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
@@ -195,6 +203,7 @@ public void testIncreaseRampByNoLimitState() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -221,6 +230,7 @@ public void testDecreaseRampByAboveReserveSocState() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -231,7 +241,7 @@ public void testDecreaseRampByAboveReserveSocState() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
 						.input("ess0", MAX_APPARENT_POWER, 10000) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 21) //
 						.output(STATE_MACHINE, State.NO_LIMIT)//
@@ -289,6 +299,7 @@ public void testDecreaseRampByAtReserveSocState() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -299,7 +310,7 @@ public void testDecreaseRampByAtReserveSocState() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
 						.input("ess0", MAX_APPARENT_POWER, 10000) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 20) //
 						.output(STATE_MACHINE, State.NO_LIMIT)//
@@ -333,6 +344,7 @@ public void testDecreaseRampByUnderReserveSocState() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -343,7 +355,7 @@ public void testDecreaseRampByUnderReserveSocState() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
 						.input("ess0", MAX_APPARENT_POWER, 10000) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 19) //
 						.output(STATE_MACHINE, State.NO_LIMIT)//
@@ -366,12 +378,13 @@ public void testDecreaseRampByUnderReserveSocState() throws Exception {
 						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9300)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 19) //
-						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 8800)//
-						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 8800)) //
+						.output(STATE_MACHINE, State.FORCE_CHARGE_PV)//
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9200)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9200)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 19) //
-						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 8300)//
-						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 8300)) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100)) //
 				.deactivate();
 	}
 
@@ -381,6 +394,7 @@ public void testDecreaseRampByForceStartChargeState() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0")) //
 				.activate(MyConfig.create() //
 						.setId("ctrl0") //
@@ -391,7 +405,7 @@ public void testDecreaseRampByForceStartChargeState() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 22) //
 						.input("ess0", MAX_APPARENT_POWER, 10000) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 16) //
 						.output(STATE_MACHINE, State.NO_LIMIT)//
@@ -415,7 +429,7 @@ public void testDecreaseRampByForceStartChargeState() throws Exception {
 				.next(new TestCase() //
 						.input("ess0", SOC, 16) //
 						.input(PRODUCTION_AC_ACTIVE_POWER, 100) //
-						.output(STATE_MACHINE, State.FORCE_CHARGE)//
+						.output(STATE_MACHINE, State.FORCE_CHARGE_PV)//
 						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9200)//
 						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9200)) //
 				.next(new TestCase() //
@@ -424,11 +438,11 @@ public void testDecreaseRampByForceStartChargeState() throws Exception {
 						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 21) //
-						.output(STATE_MACHINE, State.FORCE_CHARGE) //
+						.output(STATE_MACHINE, State.FORCE_CHARGE_PV) //
 						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000) //
 						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000)) //
-				.next(new TestCase() //
-						.input("ess0", SOC, 21) //
+				.next(new TestCase() // has to overcharge by 2%
+						.input("ess0", SOC, 22) //
 						.output(STATE_MACHINE, State.AT_RESERVE_SOC) //
 						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900) //
 						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900)) //
@@ -451,6 +465,7 @@ public void testUndefinedSoc() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0") //
 						.withMaxApparentPower(10000)) //
 				.activate(MyConfig.create() //
@@ -461,7 +476,7 @@ public void testUndefinedSoc() throws Exception {
 						.build()) //
 				.next(new TestCase() //
 						.onAfterProcessImage(sleep) //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.onAfterProcessImage(sleep) //
 						.input("ess0", SOC, 16)) //
@@ -483,6 +498,7 @@ public void testIncreaseRampToMaxApparentPower() throws Exception {
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta")) //
 				.addReference("ess", new DummyManagedSymmetricEss("ess0") //
 						.withMaxApparentPower(10000)) //
 				.activate(MyConfig.create() //
@@ -492,7 +508,7 @@ public void testIncreaseRampToMaxApparentPower() throws Exception {
 						.setReserveSocEnabled(true) //
 						.build()) //
 				.next(new TestCase() //
-						.output(STATE_MACHINE, State.NO_LIMIT)) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
 						.input("ess0", SOC, 21)) //
 				.next(new TestCase() //
@@ -542,4 +558,98 @@ public void testIncreaseRampToMaxApparentPower() throws Exception {
 				.deactivate();
 	}
 
+	@Test
+	public void testGridChargingOn() throws Exception {
+		new ControllerTest(new ControllerEssEmergencyCapacityReserveImpl()) //
+				.addReference("componentManager", new DummyComponentManager()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("sum", new DummySum()) //
+				.addReference("meta", new DummyMeta("_meta") //
+						.withIsEssChargeFromGridAllowed(true)) //
+				.addReference("ess", new DummyManagedSymmetricEss("ess0") //
+						.withMaxApparentPower(10000)) //
+				.activate(MyConfig.create() //
+						.setId("ctrl0") //
+						.setEssId("ess0") //
+						.setReserveSoc(20) //
+						.setReserveSocEnabled(true) //
+						.build()) //
+				// From Above
+				.next(new TestCase() //
+						.input("ess0", SOC, 22) //
+						.input("ess0", MAX_APPARENT_POWER, 10000) //
+						.output(STATE_MACHINE, State.UNDEFINED)) //
+				.next(new TestCase() //
+						.input("ess0", SOC, 19) //
+						.output(STATE_MACHINE, State.NO_LIMIT)//
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, null)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, null)) //
+				.next(new TestCase() //
+						.input("ess0", SOC, 19) //
+						.output(STATE_MACHINE, State.ABOVE_RESERVE_SOC)//
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9900)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9900)) //
+				.next(new TestCase() //
+						.input("ess0", SOC, 19) //
+						.output(STATE_MACHINE, State.AT_RESERVE_SOC)//
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9800)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9800)) //
+				.next(new TestCase() //
+						.input("ess0", SOC, 19) //
+						.output(STATE_MACHINE, State.BELOW_RESERVE_SOC)//
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9300)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9300)) //
+				.next(new TestCase() //
+						.input("ess0", SOC, 18).output(STATE_MACHINE, State.FORCE_CHARGE_PV)
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9200)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9200) //
+				)//
+				.next(new TestCase()//
+						.input("ess0", SOC, 18).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100) //
+				)//
+				.next(new TestCase()//
+						.input("ess0", SOC, 18)//
+						.output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000) //
+				)
+				// From Below
+				.next(new TestCase()//
+						.input("ess0", SOC, 15).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900) //
+				)
+				// let ramp run its course
+				.next(new TestCase()//
+						.input("ess0", SOC, 14), //
+						200)
+				// active power now 50% of max
+				.next(new TestCase()//
+						.input("ess0", SOC, 14).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -5000)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -5000) //
+				)//
+				.next(new TestCase()//
+						.input("ess0", SOC, 17)//
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -4900)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -4900) //
+				)
+				// let ramp run its course
+				.next(new TestCase()//
+						.input("ess0", SOC, 17), //
+						100)
+				// active power now 10% of max
+				.next(new TestCase()//
+						.input("ess0", SOC, 17).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000) //
+				)
+				// Still in Force Charge Grid (PV only form above)
+				.next(new TestCase()//
+						.input("ess0", SOC, 19)//
+						.output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
+				);
+	}
 }
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandlerTest.java b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandlerTest.java
index 7de4ebc5318..872cc283e4d 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandlerTest.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandlerTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.controller.ess.emergencycapacityreserve.statemachine;
 
-import static io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.ForceChargeHandler.getAcPvProduction;
+import static io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.ForceChargePvHandler.getAcPvProduction;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
index c5e3786e21a..60206b7e77f 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
@@ -175,7 +175,7 @@ public void run() throws OpenemsNamedException {
 				this.resetMinMaxChannels();
 				return;
 			}
-			case CHARGING_REJECTED, READY_FOR_CHARGING, CHARGING_FINISHED -> {
+			case CHARGING_REJECTED, READY_FOR_CHARGING -> {
 				this.evcs._setMaximumPower(null);
 			}
 			case CHARGING -> {
@@ -476,7 +476,6 @@ public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<EshConte
 					case CHARGING:
 					case READY_FOR_CHARGING:
 						break;
-					case CHARGING_FINISHED:
 					case CHARGING_REJECTED:
 					case ENERGY_LIMIT_REACHED:
 					case ERROR:
diff --git a/io.openems.edge.core/src/io/openems/edge/core/meta/Config.java b/io.openems.edge.core/src/io/openems/edge/core/meta/Config.java
index 7e42538a6c0..b8745593b85 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/meta/Config.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/meta/Config.java
@@ -15,4 +15,7 @@
 	@AttributeDefinition(name = "Currency", description = "Every monetary value is inherently expressed in this Currency. Values obtained in a different currency (e.g. energy prices from a web service) are internally converted to this Currency using the current exchange rate.")
 	CurrencyConfig currency() default CurrencyConfig.EUR;
 
+	@AttributeDefinition(name = "Is Ess Charge From Grid Allowed", description = "Charging the battery from grid is allowed.")
+	boolean isEssChargeFromGridAllowed() default false;
+
 }
\ No newline at end of file
diff --git a/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java b/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
index 0d581be7eab..0516b76643e 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
@@ -92,5 +92,6 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 
 	private void applyConfig(Config config) {
 		this._setCurrency(Currency.fromCurrencyConfig(config.currency()));
+		this._setIsEssChargeFromGridAllowed(config.isEssChargeFromGridAllowed());
 	}
 }
diff --git a/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java b/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java
index c269dc60237..9ff2a139fdb 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java
@@ -10,6 +10,7 @@ public class MyConfig extends AbstractComponentConfig implements Config {
 	public static class Builder {
 
 		private CurrencyConfig currency;
+		private boolean isEssChargeFromGridAllowed;
 
 		private Builder() {
 		}
@@ -18,6 +19,11 @@ public Builder setCurrency(CurrencyConfig currency) {
 			this.currency = currency;
 			return this;
 		}
+		
+		public Builder setIsEssChargeFromGridAllowed(boolean isEssChargeFromGridAllowed) {
+			this.isEssChargeFromGridAllowed = isEssChargeFromGridAllowed;
+			return this;
+		}
 
 		public MyConfig build() {
 			return new MyConfig(this);
@@ -45,4 +51,9 @@ public CurrencyConfig currency() {
 		return this.builder.currency;
 	}
 
+	@Override
+	public boolean isEssChargeFromGridAllowed() {
+		return this.builder.isEssChargeFromGridAllowed;
+	}
+
 }
diff --git a/io.openems.edge.evcs.alpitronic.hypercharger/src/io/openems/edge/evcs/hypercharger/EvcsAlpitronicHyperchargerImpl.java b/io.openems.edge.evcs.alpitronic.hypercharger/src/io/openems/edge/evcs/hypercharger/EvcsAlpitronicHyperchargerImpl.java
index e589b8de791..5bd53f33e6b 100644
--- a/io.openems.edge.evcs.alpitronic.hypercharger/src/io/openems/edge/evcs/hypercharger/EvcsAlpitronicHyperchargerImpl.java
+++ b/io.openems.edge.evcs.alpitronic.hypercharger/src/io/openems/edge/evcs/hypercharger/EvcsAlpitronicHyperchargerImpl.java
@@ -234,7 +234,6 @@ protected ModbusProtocol defineModbusProtocol() {
 											this._setEnergySession(0);
 											return;
 										case CHARGING:
-										case CHARGING_FINISHED:
 										case CHARGING_REJECTED:
 										case ENERGY_LIMIT_REACHED:
 										case ERROR:
@@ -306,10 +305,8 @@ private void addStatusListener() {
 				-> Status.READY_FOR_CHARGING;
 			case CHARGING, PREPARING_EV_READY //
 				-> Status.CHARGING;
-			case RESERVED, SUSPENDED_EV, SUSPENDED_EV_SE //
+			case RESERVED, SUSPENDED_EV, SUSPENDED_EV_SE, FINISHING //
 				-> Status.CHARGING_REJECTED;
-			case FINISHING //
-				-> Status.CHARGING_FINISHED;
 			case FAULTED, UNAVAILABLE, UNAVAILABLE_CONNECTION_OBJECT //
 				-> Status.ERROR;
 			case UNAVAILABLE_FW_UPDATE, UNDEFINED //
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java
index 25b03312e5e..53dca61d8d4 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java
@@ -16,8 +16,7 @@ public enum Status implements OptionsEnum {
 	CHARGING(3, "Charging"), //
 	ERROR(4, "Error"), //
 	CHARGING_REJECTED(5, "Charging rejected"), //
-	ENERGY_LIMIT_REACHED(6, "The charging limit reached"), //
-	CHARGING_FINISHED(7, "Charging has finished");
+	ENERGY_LIMIT_REACHED(6, "The charging limit reached"); //
 
 	private final int value;
 	private final String name;
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/WriteHandler.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/WriteHandler.java
index a9562639153..5f59c81a709 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/WriteHandler.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/WriteHandler.java
@@ -224,23 +224,16 @@ private void setChargeStatus() {
 		ChargeState chargeStatus = ChargeState.UNDEFINED;
 		Status status = this.parent.getStatusChannel().getNextValue().asEnum();
 
-		switch (status) {
-		case CHARGING:
-			chargeStatus = ChargeState.CHARGING;
-			break;
-		case CHARGING_FINISHED:
-		case CHARGING_REJECTED:
-		case ENERGY_LIMIT_REACHED:
-		case ERROR:
-		case STARTING:
-		case READY_FOR_CHARGING:
-		case NOT_READY_FOR_CHARGING:
-			chargeStatus = ChargeState.NOT_CHARGING;
-			break;
-		case UNDEFINED:
-			chargeStatus = ChargeState.UNDEFINED;
-			break;
-		}
+		chargeStatus = switch (status) {
+		case CHARGING -> ChargeState.CHARGING;
+		case CHARGING_REJECTED, //
+				ENERGY_LIMIT_REACHED, //
+				ERROR, STARTING, //
+				READY_FOR_CHARGING, //
+				NOT_READY_FOR_CHARGING ->
+			ChargeState.NOT_CHARGING;
+		case UNDEFINED -> ChargeState.UNDEFINED;
+		};
 		this.parent.getChargeStateHandler().applyNewChargeState(chargeStatus);
 	}
 
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShavingImpl.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShavingImpl.java
index dede0eb36c2..ef62076353d 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShavingImpl.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShavingImpl.java
@@ -349,23 +349,9 @@ protected void limitEvcss() {
 					var guaranteedPower = this.getGuaranteedPower(managedEvcs);
 					var status = managedEvcs.getStatus();
 					switch (status) {
-					case CHARGING_FINISHED:
-						managedEvcs.setChargePowerLimitWithFilter(requestedPower);
-						/*
-						 * TODO: Change state from CHARGING_FINISHED to CHARGING should increase the
-						 * minimumPower. e.g. ZOE that is nearly on 100 percent, does not charge with a
-						 * set point of 13kW, but 22kW by charging with less power.
-						 */
-						break;
-					case ERROR:
-					case STARTING:
-					case UNDEFINED:
-					case NOT_READY_FOR_CHARGING:
-					case ENERGY_LIMIT_REACHED:
+					case ERROR, STARTING, UNDEFINED, NOT_READY_FOR_CHARGING, ENERGY_LIMIT_REACHED ->
 						managedEvcs.setChargePowerLimit(0);
-						break;
-					case READY_FOR_CHARGING:
-
+					case READY_FOR_CHARGING -> {
 						// Check if there is enough power for an initial charge
 						if (totalPowerLimit - initialChargePower - this.getActivePower().orElse(0) >= guaranteedPower) {
 
@@ -385,11 +371,10 @@ protected void limitEvcss() {
 						// Reduce the total power by the initial power to be able to send an initial
 						// charge request in the next cycles
 						totalPowerLeftMinusGuarantee -= guaranteedPower;
-						break;
-
+					}
 					// EVCS is active.
-					case CHARGING_REJECTED:
-					case CHARGING:
+					case CHARGING_REJECTED, CHARGING -> {
+
 						/*
 						 * Reduces the available power by the guaranteed power of each charging station.
 						 * Sets the minimum power depending on the guaranteed and the maximum Power.
@@ -401,7 +386,7 @@ protected void limitEvcss() {
 						} else {
 							managedEvcs.setChargePowerLimit(0);
 						}
-						break;
+					}
 					}
 				}
 			}
diff --git a/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyReadWorker.java b/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyReadWorker.java
index 176c289f0a5..0ceaeaa8c12 100644
--- a/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyReadWorker.java
+++ b/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyReadWorker.java
@@ -34,11 +34,8 @@ public class DezonyReadWorker extends AbstractCycleWorker {
 			"IDLE", Status.NOT_READY_FOR_CHARGING, //
 			"CAR_CONNECTED", Status.READY_FOR_CHARGING, //
 			"CHARGING", Status.CHARGING, //
-			"CHARGING_FINISHED", Status.CHARGING_FINISHED, //
 			"CHARGING_ERROR", Status.ERROR);
 
-	private int chargingFinishedCounter = 0;
-
 	public DezonyReadWorker(EvcsDezonyImpl parent) {
 		this.parent = parent;
 	}
@@ -95,18 +92,8 @@ private Status getStatus(JsonElement json) {
 			int setChargePowerLimit = this.parent.getSetChargePowerLimit().orElse(0);
 			int minimumHardwarePower = this.parent.getMinimumHardwarePower().orElse(0);
 
-			if (setChargePowerLimit >= minimumHardwarePower) {
-				if (this.chargingFinishedCounter >= 90) {
-					status = Status.CHARGING_FINISHED;
-				} else {
-					this.chargingFinishedCounter++;
-				}
-			} else {
-				this.chargingFinishedCounter = 0;
-
-				if (setChargePowerLimit == 0) {
-					status = Status.CHARGING_REJECTED;
-				}
+			if (setChargePowerLimit < minimumHardwarePower && setChargePowerLimit == 0) {
+				status = Status.CHARGING_REJECTED;
 			}
 		}
 
diff --git a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/EvcsGoeChargerHomeImpl.java b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/EvcsGoeChargerHomeImpl.java
index eec3c33a613..26fc2a8b95f 100644
--- a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/EvcsGoeChargerHomeImpl.java
+++ b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/EvcsGoeChargerHomeImpl.java
@@ -187,7 +187,7 @@ private Status convertGoeStatus(int status) {
 		case 1 -> Status.NOT_READY_FOR_CHARGING; // ready for charging, car unplugged
 		case 2 -> Status.CHARGING; // charging
 		case 3 -> Status.READY_FOR_CHARGING; // waiting for car
-		case 4 -> Status.CHARGING_FINISHED; // charging finished, car plugged
+		case 4 -> Status.CHARGING_REJECTED; // charging finished, car plugged
 		default -> Status.UNDEFINED;
 		};
 	}
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java
index d20a8a44d04..3f0c194c5a1 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java
@@ -26,7 +26,6 @@
 public class HardyBarthReadUtils {
 	private final EvcsHardyBarthImpl parent;
 
-	private int chargingFinishedCounter = 0;
 	private int errorCounter = 0;
 
 	public HardyBarthReadUtils(EvcsHardyBarthImpl parent) {
@@ -122,17 +121,8 @@ protected void setEvcsChannelIds(JsonElement json, PhaseRotation phaseRotation)
 				var tmpStatus = Status.READY_FOR_CHARGING;
 
 				// Detect if the car is full
-				if (this.parent.getSetChargePowerLimit().orElse(0) >= this.parent.getMinimumHardwarePower().orElse(0)
-						&& activePower <= 0) {
-
-					if (this.chargingFinishedCounter >= 90) {
-						tmpStatus = Status.CHARGING_FINISHED;
-					} else {
-						this.chargingFinishedCounter++;
-					}
-				} else {
-					this.chargingFinishedCounter = 0;
-
+				if (!(this.parent.getSetChargePowerLimit().orElse(0) >= this.parent.getMinimumHardwarePower().orElse(0)
+						&& activePower <= 0)) {
 					// Charging rejected because we are forcing to pause charging
 					if (this.parent.getSetChargePowerLimit().orElse(0) == 0) {
 						tmpStatus = Status.CHARGING_REJECTED;
@@ -156,9 +146,6 @@ protected void setEvcsChannelIds(JsonElement json, PhaseRotation phaseRotation)
 			}
 			};
 
-			if (!stringValue.equals("B")) {
-				this.chargingFinishedCounter = 0;
-			}
 			if (!stringValue.equals("E") || !stringValue.equals("F")) {
 				this.errorCounter = 0;
 			}
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
index 0bcb9a43364..69208c18c90 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
@@ -116,25 +116,6 @@ public void accept(String message) {
 					status = Status.CHARGING_REJECTED;
 				}
 
-				// Charging is Finished if 'Plug' is connected, State was charging or already
-				// finished and the EVCS is still ready for charging.
-				switch (keba.getStatus()) {
-				case CHARGING_REJECTED:
-				case ENERGY_LIMIT_REACHED:
-				case ERROR:
-				case NOT_READY_FOR_CHARGING:
-				case STARTING:
-				case UNDEFINED:
-					break;
-				case READY_FOR_CHARGING:
-				case CHARGING:
-				case CHARGING_FINISHED:
-					if (status.equals(Status.READY_FOR_CHARGING) && keba.getSetChargePowerLimit().orElse(0) > 0) {
-						status = Status.CHARGING_FINISHED;
-					}
-					break;
-				}
-
 				/*
 				 * Check if the maximum energy limit is reached, informs the user and sets the
 				 * status
diff --git a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java
index 1d4f1d1adb6..d89f15aa54c 100644
--- a/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java
+++ b/io.openems.edge.evcs.mennekes/src/io/openems/edge/evcs/mennekes/EvcsMennekesImpl.java
@@ -252,12 +252,12 @@ private void addStatusListener() {
 			 * Maps the raw state into a {@link Status}.
 			 */
 			currentStatus = switch (rawState) {
-			case CHARGING -> Status.CHARGING;
+			case CHARGING, FINISHING -> Status.CHARGING;
 			case FAULTED -> Status.ERROR;
-			case FINISHING -> Status.CHARGING_FINISHED;
 			case PREPARING -> Status.READY_FOR_CHARGING;
 			case RESERVED -> Status.NOT_READY_FOR_CHARGING;
-			case AVAILABLE, SUSPENDEDEV, SUSPENDEDEVSE, OCCUPIED -> Status.CHARGING_REJECTED;
+			case AVAILABLE, SUSPENDEDEV, SUSPENDEDEVSE -> Status.CHARGING_REJECTED;
+			case OCCUPIED -> this.getActivePower().orElse(0) > 0 ? Status.CHARGING : Status.CHARGING_REJECTED;
 			case UNAVAILABLE -> Status.ERROR;
 			case UNDEFINED -> currentStatus;
 			};
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractManagedOcppEvcsComponent.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractManagedOcppEvcsComponent.java
index 5096e9b3588..604b03ad94e 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractManagedOcppEvcsComponent.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractManagedOcppEvcsComponent.java
@@ -1,5 +1,6 @@
 package io.openems.edge.evcs.ocpp.common;
 
+import static io.openems.common.utils.FunctionUtils.doNothing;
 import static io.openems.edge.common.type.TypeUtils.getAsType;
 
 import java.util.Arrays;
@@ -279,20 +280,10 @@ private void resetMeasuredChannelValues() {
 	private void checkCurrentState() {
 		var state = this.getStatus();
 		switch (state) {
-		case CHARGING:
-		case READY_FOR_CHARGING:
-			break;
-		case CHARGING_FINISHED:
-			this.resetMeasuredChannelValues();
-			break;
-		case CHARGING_REJECTED:
-		case ENERGY_LIMIT_REACHED:
-		case ERROR:
-		case NOT_READY_FOR_CHARGING:
-		case STARTING:
-		case UNDEFINED:
-			this._setActivePower(0);
-			break;
+		case CHARGING, READY_FOR_CHARGING //
+			-> doNothing();
+		case CHARGING_REJECTED, ENERGY_LIMIT_REACHED, ERROR, NOT_READY_FOR_CHARGING, STARTING, UNDEFINED //
+			-> this._setActivePower(0);
 		}
 	}
 
@@ -325,8 +316,8 @@ protected void logWarn(Logger log, String message) {
 	@Override
 	public String debugLog() {
 		return "P:" + this.getActivePower().orElse(null) //
-			+ "|Limit:" + this.getSetChargePowerLimit().orElse(null) //
-			+ "|" + this.getStatus().getName();
+				+ "|Limit:" + this.getSetChargePowerLimit().orElse(null) //
+				+ "|" + this.getStatus().getName();
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java
index 5189a6ffe41..a5703c38370 100644
--- a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java
+++ b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java
@@ -265,11 +265,11 @@ public StatusNotificationConfirmation handleStatusNotificationRequest(UUID sessi
 		Status evcsStatus = null;
 		var ocppStatus = request.getStatus();
 		switch (ocppStatus) {
-		case Available:
+		case Available -> {
 			evcs._setChargingstationCommunicationFailed(false);
 			evcsStatus = Status.NOT_READY_FOR_CHARGING;
-			break;
-		case Charging:
+		}
+		case Charging -> {
 			evcsStatus = Status.CHARGING;
 
 			// Reset the end charge session stamp
@@ -279,12 +279,12 @@ public StatusNotificationConfirmation handleStatusNotificationRequest(UUID sessi
 			evcs.getSessionStart().setChargeSessionStampIfNotPresent(//
 					Instant.now(this.parent.componentManager.getClock()), //
 					evcs.getActiveProductionEnergy().orElse(0L));
-			break;
-		case Faulted:
+		}
+		case Faulted -> {
 			evcsStatus = Status.ERROR;
-			break;
-		case Finishing:
-			evcsStatus = Status.CHARGING_FINISHED;
+		}
+		case Finishing -> {
+			evcsStatus = Status.CHARGING_REJECTED;
 
 			// Reset the start charge session stamp
 			evcs.getSessionStart().resetChargeSessionStampIfPresent();
@@ -292,24 +292,25 @@ public StatusNotificationConfirmation handleStatusNotificationRequest(UUID sessi
 			evcs.getSessionEnd().setChargeSessionStampIfNotPresent(//
 					Instant.now(this.parent.componentManager.getClock()), //
 					evcs.getActiveProductionEnergy().orElse(0L));
-			break;
-		case Preparing:
+
+		}
+		case Preparing -> {
 			evcsStatus = Status.READY_FOR_CHARGING;
-			break;
-		case Reserved:
+		}
+		case Reserved -> {
 			this.logDebug("Reservation currently not supported");
-			break;
-		case SuspendedEV:
+		}
+		case SuspendedEV -> {
 			evcsStatus = Status.CHARGING_REJECTED;
-			break;
-		case SuspendedEVSE:
+		}
+		case SuspendedEVSE -> {
 			evcsStatus = Status.CHARGING_REJECTED;
-			break;
-		case Unavailable:
+		}
+		case Unavailable -> {
 			this.logDebug("Charging Station is Unavailable.");
 			evcs._setChargingstationCommunicationFailed(true);
 			evcsStatus = Status.ERROR;
-			break;
+		}
 		}
 
 		if (ocppStatus != ChargePointStatus.Unavailable) {
@@ -349,7 +350,7 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
 		} else {
 			evcs = this.getEvcsBySessionIndexAndConnector(sessionIndex, request.getTransactionId());
 		}
-		evcs._setStatus(Status.CHARGING_FINISHED);
+		evcs._setStatus(Status.CHARGING_REJECTED);
 
 		var response = new StopTransactionConfirmation();
 		response.setIdTagInfo(tag);
diff --git a/io.openems.edge.evcs.webasto.next/src/io/openems/edge/evcs/webasto/next/EvcsWebastoNextImpl.java b/io.openems.edge.evcs.webasto.next/src/io/openems/edge/evcs/webasto/next/EvcsWebastoNextImpl.java
index 4ba75efe77b..a315771672f 100644
--- a/io.openems.edge.evcs.webasto.next/src/io/openems/edge/evcs/webasto/next/EvcsWebastoNextImpl.java
+++ b/io.openems.edge.evcs.webasto.next/src/io/openems/edge/evcs/webasto/next/EvcsWebastoNextImpl.java
@@ -218,27 +218,14 @@ private void addStatusListener() {
 			/**
 			 * Maps the raw state into a {@link Status}.
 			 */
-			switch (state) {
-			case CHARGING:
-				this._setStatus(Status.CHARGING);
-				break;
-			case NO_PERMISSION:
-			case CHARGING_STATION_RESERVED:
-				this._setStatus(Status.CHARGING_REJECTED);
-				break;
-			case ERROR:
-				this._setStatus(Status.ERROR);
-				break;
-			case NO_VEHICLE_ATTACHED:
-				this._setStatus(Status.NOT_READY_FOR_CHARGING);
-				break;
-			case CHARGING_PAUSED:
-				this._setStatus(Status.CHARGING_FINISHED);
-				break;
-			case UNDEFINED:
-			default:
-				this._setStatus(Status.UNDEFINED);
-			}
+			this._setStatus(switch (state) {
+			case CHARGING -> Status.CHARGING;
+			case NO_PERMISSION, CHARGING_STATION_RESERVED -> Status.CHARGING_REJECTED;
+			case ERROR -> Status.ERROR;
+			case NO_VEHICLE_ATTACHED -> Status.NOT_READY_FOR_CHARGING;
+			case CHARGING_PAUSED -> Status.CHARGING_REJECTED;
+			case UNDEFINED -> Status.UNDEFINED;
+			});
 		});
 	}
 
diff --git a/io.openems.edge.evcs.webasto.unite/src/io/openems/edge/evcs/webasto/unite/WebastoReadHandler.java b/io.openems.edge.evcs.webasto.unite/src/io/openems/edge/evcs/webasto/unite/WebastoReadHandler.java
index 68a8e7fdbbb..62bb363b4c3 100644
--- a/io.openems.edge.evcs.webasto.unite/src/io/openems/edge/evcs/webasto/unite/WebastoReadHandler.java
+++ b/io.openems.edge.evcs.webasto.unite/src/io/openems/edge/evcs/webasto/unite/WebastoReadHandler.java
@@ -23,8 +23,7 @@ private void setStatus() {
 		case 0 -> Status.NOT_READY_FOR_CHARGING;
 		case 1 -> Status.READY_FOR_CHARGING;
 		case 2 -> Status.CHARGING;
-		case 3, 4 -> Status.CHARGING_REJECTED;
-		case 5 -> Status.CHARGING_FINISHED;
+		case 3, 4, 5 -> Status.CHARGING_REJECTED;
 		// TODO Check if this state is also reached while paused
 		case 7, 8 -> Status.ERROR;
 		default -> null;
diff --git a/io.openems.wrapper/eu.chargetime.ocpp.bnd b/io.openems.wrapper/eu.chargetime.ocpp.bnd
index e5ba284eed6..b7c38bb3bcb 100644
--- a/io.openems.wrapper/eu.chargetime.ocpp.bnd
+++ b/io.openems.wrapper/eu.chargetime.ocpp.bnd
@@ -15,7 +15,6 @@ Include-Resource: \
 
 Import-Package: \
     com.sun.activation.registries,\
-    javax.xml.soap,\
     com.google.gson,\
     javax.xml.transform,\
     org.java_websocket,\
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 5585c80f6ec..45ada4e553f 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -2,7 +2,7 @@
   <app-header></app-header>
   <ion-menu type="overlay" side="start" contentId="content">
     <ion-header>
-      <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+      <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
         <ion-buttons slot="start">
           <ion-menu-button [ngStyle]="{'color': 'var(--ion-menu-color)'}" autoHide="false"></ion-menu-button>
         </ion-buttons>
diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
index 5432672dd8c..6b845eb9cf6 100644
--- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
+++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/chart/chart.ts
@@ -249,6 +249,11 @@ export class ChartComponent extends AbstractHistoryChart {
             })
             .reduce((acc, curr) => acc.concat(curr), []);
 
-        return finalArray.length > 0 ? Math.floor(Math.min(...finalArray)) : 0;
+        if (finalArray.length === 0) {
+            return 0;
+        }
+
+        const min = Math.floor(Math.min(...finalArray));
+        return Math.floor(min - (min * 0.05));
     }
 }
diff --git a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html
index 80c6b4b4269..11f9a6243d4 100644
--- a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html
+++ b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngIf="edge && component">
     <ion-header>
-        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
-            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+        <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-title-color);">{{ component.alias }}</ion-title>
             <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
-                    <ion-icon name="close-outline"></ion-icon>
+                    <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
diff --git a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html
index 685f9422e44..3cc2640675e 100644
--- a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html
+++ b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngIf="edge">
     <ion-header>
-        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
-            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+        <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-title-color);">{{ component.alias }}</ion-title>
             <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history">
-                    <ion-icon name="close-outline"></ion-icon>
+                    <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html
index abe6d61db2f..03689ee9986 100644
--- a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html
+++ b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngIf="component && edge">
     <ion-header>
-        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
-            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+        <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-title-color);">{{ component.alias }}</ion-title>
             <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
-                    <ion-icon name="close-outline"></ion-icon>
+                    <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
diff --git a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html
index 7e8dff250e3..3a74296ee27 100644
--- a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html
+++ b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngIf="edge && component">
     <ion-header>
-        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
-            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+        <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-title-color);">{{ component.alias }}</ion-title>
             <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
-                    <ion-icon name="close-outline"></ion-icon>
+                    <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
diff --git a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html
index 4fde5ac2cbd..ea37d1c4692 100644
--- a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html
+++ b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngIf="edge && component">
     <ion-header>
-        <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
-            <ion-title style="color: var(--ion-color-white);">{{ component.alias }}</ion-title>
+        <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
+            <ion-title style="color: var(--ion-title-color);">{{ component.alias }}</ion-title>
             <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history/">
-                    <ion-icon name="close-outline"></ion-icon>
+                    <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
diff --git a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
index e6fc9d7ee79..e145a52ca1e 100644
--- a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
+++ b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
@@ -1,8 +1,7 @@
 <ng-container *ngIf="edge">
     <ion-header>
-        <ion-toolbar class="ion-justify-content-center"
-            style="--ion-background-color: var(--ion-color-toolbar-primary);">
-            <ion-title class="ion-text-start ion-padding-left" style="color: var(--ion-color-white);"
+        <ion-toolbar class="ion-justify-content-center" style="--background: var(--ion-color-toolbar-primary);">
+            <ion-title class="ion-text-start ion-padding-left" style="color: var(--ion-title-color);"
                 translate>General.storageSystem
             </ion-title>
             <ion-buttons style="color: var(--ion-color-white);" slot="start">
@@ -11,7 +10,7 @@
             </ion-buttons>
             <ion-buttons style="color: var(--ion-color-white);" slot="end">
                 <ion-button routerLink="/device/{{edge.id}}/history">
-                    <ion-icon name="close-outline"></ion-icon>
+                    <ion-icon name="close-outline" style="color: var(--ion-title-color);"></ion-icon>
                 </ion-button>
             </ion-buttons>
         </ion-toolbar>
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
index 01a05d4f923..1b10751ca53 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
@@ -181,7 +181,7 @@ export class ScheduleStateAndPriceChartComponent extends AbstractHistoryChart im
 
         this.options.scales[ChartAxis.LEFT] = {
             ...this.options.scales[ChartAxis.LEFT],
-            ...ChartConstants.DEFAULT_Y_SCALE_OPTIONS(leftYAxis, this.translate, "line", this.datasets.filter(el => el["yAxisID"] === ChartAxis.LEFT), true),
+            ...ChartConstants.DEFAULT_Y_SCALE_OPTIONS(leftYAxis, this.translate, "bar", this.datasets.filter(el => el["yAxisID"] === ChartAxis.LEFT), true),
         };
         this.options.scales[ChartAxis.RIGHT].grid.display = false;
         this.options.scales[ChartAxis.RIGHT_2].suggestedMin = 0;
diff --git a/ui/src/app/edge/live/common/storage/modal/modal.component.html b/ui/src/app/edge/live/common/storage/modal/modal.component.html
index cf67aefa98c..391b36d33cc 100644
--- a/ui/src/app/edge/live/common/storage/modal/modal.component.html
+++ b/ui/src/app/edge/live/common/storage/modal/modal.component.html
@@ -153,6 +153,22 @@
                                             {{ 100 | unitvalue:'%' }}
                                         </ion-label>
                                     </ion-range>
+
+                                    <ng-container *ngIf="this.formGroup.controls['_meta'] && hasRequiredEdgeVersion">
+                                        <oe-modal-horizontal-line></oe-modal-horizontal-line>
+
+                                        <oe-modal-line [name]="'Edge.Index.Widgets.STORAGE.GRID_CHARGE' | translate"
+                                            [formGroup]="this.formGroup.controls['_meta']"
+                                            controlName="isEssChargeFromGridAllowed" [control]="{ type: 'TOGGLE' }"
+                                            leftColumnWidth="100">
+                                        </oe-modal-line>
+
+                                        <oe-modal-line *ngIf="hasRequiredEdgeVersion"
+                                            [innerHtml]="'Edge.Index.Widgets.STORAGE.GRID_CHARGE_WARNING' | translate">
+                                        </oe-modal-line>
+
+                                        <oe-modal-horizontal-line></oe-modal-horizontal-line>
+                                    </ng-container>
                                 </ng-container>
                             </ng-container>
                         </ng-container>
diff --git a/ui/src/app/edge/live/common/storage/modal/modal.component.ts b/ui/src/app/edge/live/common/storage/modal/modal.component.ts
index f8fac38aade..fa3b4109b80 100644
--- a/ui/src/app/edge/live/common/storage/modal/modal.component.ts
+++ b/ui/src/app/edge/live/common/storage/modal/modal.component.ts
@@ -17,10 +17,7 @@ export class StorageModalComponent implements OnInit, OnDestroy {
     // TODO after refactoring of Model: subscribe to EssActivePowerL1/L2/L3 here instead of Flat Widget
 
     @Input({ required: true }) protected edge!: Edge;
-    @Input({ required: true }) protected config!: EdgeConfig;
-    @Input() protected essComponents: EdgeConfig.Component[] | null = null;
-    @Input({ required: true }) protected chargerComponents!: EdgeConfig.Component[];
-    @Input() protected singleComponent: EdgeConfig.Component | null = null;
+    @Input() protected component: EdgeConfig.Component | null = null;
 
     // reference to the Utils method to access via html
     public isLastElement = Utils.isLastElement;
@@ -29,6 +26,10 @@ export class StorageModalComponent implements OnInit, OnDestroy {
     protected isAtLeastInstaller: boolean;
     protected isTargetTimeInValid: Map<string, boolean> = new Map();
     protected controllerIsRequiredEdgeVersion: boolean = false;
+    protected hasRequiredEdgeVersion: boolean = false;
+    protected config: EdgeConfig;
+    protected essComponents: EdgeConfig.Component[] | null = null;
+    protected chargerComponents!: EdgeConfig.Component[];
 
     constructor(
         public service: Service,
@@ -39,120 +40,157 @@ export class StorageModalComponent implements OnInit, OnDestroy {
     ) { }
 
     ngOnInit() {
+        this.edge.getFirstValidConfig(this.websocket).then(config => {
+            this.config = config;
+            this.essComponents = this.config
+                .getComponentsImplementingNature("io.openems.edge.ess.api.SymmetricEss")
+                .filter(component => component.isEnabled && !this.config
+                    .getNatureIdsByFactoryId(component.factoryId)
+                    .includes("io.openems.edge.ess.api.MetaEss"));
+
+            this.chargerComponents = this.config
+                .getComponentsImplementingNature("io.openems.edge.ess.dccharger.api.EssDcCharger")
+                .filter(component => component.isEnabled);
+
+            // Future Work: Remove when all ems are at least at this version
+            this.controllerIsRequiredEdgeVersion = this.edge.isVersionAtLeast("2023.2.5");
+
+            this.isAtLeastInstaller = this.edge.roleIsAtLeast(Role.INSTALLER);
+            const emergencyReserveCtrl = this.config.getComponentsByFactory("Controller.Ess.EmergencyCapacityReserve");
+            const prepareBatteryExtensionCtrl = this.config.getComponentsByFactory("Controller.Ess.PrepareBatteryExtension");
+            this.hasRequiredEdgeVersion = this.edge.isVersionAtLeast("2024.12.3");
+            const components = [...prepareBatteryExtensionCtrl, ...emergencyReserveCtrl].filter(component => component.isEnabled).reduce((result, component) => {
+                const essId = component.properties["ess.id"];
+                if (result[essId] == null) {
+                    result[essId] = [];
+                }
+                result[essId].push(component);
+                return result;
+            }, {});
 
-        // Future Work: Remove when all ems are at least at this version
-        this.controllerIsRequiredEdgeVersion = this.edge.isVersionAtLeast("2023.2.5");
+            const channelAddresses: ChannelAddress[] = [];
+            channelAddresses.push(...this.chargerComponents.map(comp => new ChannelAddress(comp.id, "ActualPower")));
 
-        this.isAtLeastInstaller = this.edge.roleIsAtLeast(Role.INSTALLER);
-        const emergencyReserveCtrl = this.config.getComponentsByFactory("Controller.Ess.EmergencyCapacityReserve");
-        const prepareBatteryExtensionCtrl = this.config.getComponentsByFactory("Controller.Ess.PrepareBatteryExtension");
-        const components = [...prepareBatteryExtensionCtrl, ...emergencyReserveCtrl].filter(component => component.isEnabled).reduce((result, component) => {
-            const essId = component.properties["ess.id"];
-            if (result[essId] == null) {
-                result[essId] = [];
+            if (this.hasRequiredEdgeVersion) {
+                channelAddresses.push(new ChannelAddress("_meta", "IsEssChargeFromGridAllowed"));
             }
-            result[essId].push(component);
-            return result;
-        }, {});
-
-        const channelAddresses: ChannelAddress[] = [];
-        for (const essId in prepareBatteryExtensionCtrl) {
-            const controller = prepareBatteryExtensionCtrl[essId];
-            channelAddresses.push(
-                new ChannelAddress(controller.id, "_PropertyIsRunning"),
-                new ChannelAddress(controller.id, "_PropertyTargetTime"),
-                new ChannelAddress(controller.id, "_PropertyTargetTimeSpecified"),
-                new ChannelAddress(controller.id, "_PropertyTargetSoc"),
-                new ChannelAddress(controller.id, "_PropertyTargetTimeBuffer"),
-                new ChannelAddress(controller.id, "ExpectedStartEpochSeconds"),
-            );
-        }
-        this.edge.subscribeChannels(this.websocket, "storage", channelAddresses);
-
-        this.edge.currentData
-            .subscribe(currentData => {
-
-                const controls: FormGroup = new FormGroup({});
-                for (const essId of Object.keys(components)) {
-                    const controllers = components[essId];
-
-                    const controllerFrmGrp: FormGroup = new FormGroup({});
-                    for (const controller of (controllers as EdgeConfig.Component[])) {
-
-                        if (controller.factoryId == "Controller.Ess.EmergencyCapacityReserve") {
-                            const reserveSoc = currentData.channel[controller.id + "/_PropertyReserveSoc"] ?? 20 /* default Reserve-Soc */;
-                            const isReserveSocEnabled = currentData.channel[controller.id + "/_PropertyIsReserveSocEnabled"] == 1;
-
-                            controllerFrmGrp.addControl("emergencyReserveController",
-                                this.formBuilder.group({
-                                    controllerId: new FormControl(controller["id"]),
-                                    isReserveSocEnabled: new FormControl(isReserveSocEnabled),
-                                    reserveSoc: new FormControl(reserveSoc),
-                                }),
-                            );
-                        } else if (controller.factoryId == "Controller.Ess.PrepareBatteryExtension") {
-
-                            const isRunning = currentData.channel[controller.id + "/_PropertyIsRunning"] == 1;
-
-                            // Because of ionic segment buttons only accepting a string value, i needed to convert it
-                            const targetTimeSpecified = (currentData.channel[controller.id + "/_PropertyTargetTimeSpecified"] == 1).toString();
-                            let targetTime = currentData.channel[controller.id + "/_PropertyTargetTime"];
-                            const targetSoc = currentData.channel[controller.id + "/_PropertyTargetSoc"];
-                            const targetTimeBuffer = currentData.channel[controller.id + "/_PropertyTargetTimeBuffer"];
-                            const epochSeconds = currentData.channel[controller.id + "/ExpectedStartEpochSeconds"];
-
-                            const expectedStartOfPreparation = new Date(0);
-                            expectedStartOfPreparation.setUTCSeconds(epochSeconds ?? 0);
-
-                            // If targetTime not set, not equals 0 or targetTime is no valid time,
-                            // then set targetTime to null
-                            if (!targetTime || targetTime == 0 || isNaN(Date.parse(targetTime))) {
-                                targetTime = null;
-                            }
+            for (const essId in prepareBatteryExtensionCtrl) {
+                const controller = prepareBatteryExtensionCtrl[essId];
+                channelAddresses.push(
+                    new ChannelAddress(controller.id, "_PropertyIsRunning"),
+                    new ChannelAddress(controller.id, "_PropertyTargetTime"),
+                    new ChannelAddress(controller.id, "_PropertyTargetTimeSpecified"),
+                    new ChannelAddress(controller.id, "_PropertyTargetSoc"),
+                    new ChannelAddress(controller.id, "_PropertyTargetTimeBuffer"),
+                    new ChannelAddress(controller.id, "ExpectedStartEpochSeconds"),
+                );
+            }
+            this.edge.subscribeChannels(this.websocket, "storage", channelAddresses);
 
-                            // Channel "ExpectedStartEpochSeconds" is not set
-                            if ((epochSeconds == null
-                                || epochSeconds == 0)) {
-                                this.isTargetTimeInValid.set(essId, true);
-                            } else if
-
-                                // If expected expectedStartOfpreparation is after targetTime
-                                //  Guarantee, that the TargetSoc should be reached after the preparation to reach that Soc started
-                                (isBefore(new Date(targetTime), expectedStartOfPreparation)
-                                || isBefore(new Date(targetTime), new Date())) {
-                                this.isTargetTimeInValid.set(essId, true);
-                            } else {
-                                this.isTargetTimeInValid.set(essId, false);
-                            }
+            this.edge.currentData
+                .subscribe(currentData => {
 
-                            controllerFrmGrp.addControl("prepareBatteryExtensionController",
-                                this.formBuilder.group({
-                                    controllerId: new FormControl(controller.id),
-                                    isRunning: new FormControl(isRunning),
-                                    targetTime: new FormControl(targetTime),
-                                    targetTimeSpecified: new FormControl(targetTimeSpecified),
-                                    targetSoc: new FormControl(targetSoc),
-                                    targetTimeBuffer: new FormControl(targetTimeBuffer),
-                                    expectedStartOfPreparation: new FormControl(expectedStartOfPreparation),
-                                }),
-                            );
+                    const controls: FormGroup = new FormGroup({});
+                    if (this.hasRequiredEdgeVersion) {
+                        controls.addControl("_meta", this.formBuilder.group({
+                            isEssChargeFromGridAllowed: new FormControl(currentData.channel["_meta/IsEssChargeFromGridAllowed"]),
+                        }));
+                    }
+                    for (const essId of Object.keys(components)) {
+                        const controllers = components[essId];
+
+                        const controllerFrmGrp: FormGroup = new FormGroup({});
+                        for (const controller of (controllers as EdgeConfig.Component[])) {
+
+                            if (controller.factoryId == "Controller.Ess.EmergencyCapacityReserve") {
+                                const reserveSoc = currentData.channel[controller.id + "/_PropertyReserveSoc"] ?? 20 /* default Reserve-Soc */;
+                                const isReserveSocEnabled = currentData.channel[controller.id + "/_PropertyIsReserveSocEnabled"] == 1;
+
+                                controllerFrmGrp.addControl("emergencyReserveController",
+                                    this.formBuilder.group({
+                                        controllerId: new FormControl(controller["id"]),
+                                        isReserveSocEnabled: new FormControl(isReserveSocEnabled),
+                                        reserveSoc: new FormControl(reserveSoc),
+                                    }),
+                                );
+                            } else if (controller.factoryId == "Controller.Ess.PrepareBatteryExtension") {
+
+                                const isRunning = currentData.channel[controller.id + "/_PropertyIsRunning"] == 1;
+
+                                // Because of ionic segment buttons only accepting a string value, i needed to convert it
+                                const targetTimeSpecified = (currentData.channel[controller.id + "/_PropertyTargetTimeSpecified"] == 1).toString();
+                                let targetTime = currentData.channel[controller.id + "/_PropertyTargetTime"];
+                                const targetSoc = currentData.channel[controller.id + "/_PropertyTargetSoc"];
+                                const targetTimeBuffer = currentData.channel[controller.id + "/_PropertyTargetTimeBuffer"];
+                                const epochSeconds = currentData.channel[controller.id + "/ExpectedStartEpochSeconds"];
+
+                                const expectedStartOfPreparation = new Date(0);
+                                expectedStartOfPreparation.setUTCSeconds(epochSeconds ?? 0);
+
+                                // If targetTime not set, not equals 0 or targetTime is no valid time,
+                                // then set targetTime to null
+                                if (!targetTime || targetTime == 0 || isNaN(Date.parse(targetTime))) {
+                                    targetTime = null;
+                                }
+
+                                // Channel "ExpectedStartEpochSeconds" is not set
+                                if ((epochSeconds == null
+                                    || epochSeconds == 0)) {
+                                    this.isTargetTimeInValid.set(essId, true);
+                                } else if
+
+                                    // If expected expectedStartOfpreparation is after targetTime
+                                    //  Guarantee, that the TargetSoc should be reached after the preparation to reach that Soc started
+                                    (isBefore(new Date(targetTime), expectedStartOfPreparation)
+                                    || isBefore(new Date(targetTime), new Date())) {
+                                    this.isTargetTimeInValid.set(essId, true);
+                                } else {
+                                    this.isTargetTimeInValid.set(essId, false);
+                                }
+
+                                controllerFrmGrp.addControl("prepareBatteryExtensionController",
+                                    this.formBuilder.group({
+                                        controllerId: new FormControl(controller.id),
+                                        isRunning: new FormControl(isRunning),
+                                        targetTime: new FormControl(targetTime),
+                                        targetTimeSpecified: new FormControl(targetTimeSpecified),
+                                        targetSoc: new FormControl(targetSoc),
+                                        targetTimeBuffer: new FormControl(targetTimeBuffer),
+                                        expectedStartOfPreparation: new FormControl(expectedStartOfPreparation),
+                                    }),
+                                );
+                            }
                         }
+                        controls.addControl(essId, controllerFrmGrp);
                     }
-                    controls.addControl(essId, controllerFrmGrp);
-                }
 
-                if (!this.formGroup.dirty) {
-                    this.formGroup = controls;
-                }
-            });
+                    if (!this.formGroup.dirty) {
+                        this.formGroup = controls;
+                    }
+                });
+        },
+        );
+
     }
 
     applyChanges() {
         if (this.edge == null) {
             return;
         }
-
         const updateArray: Map<string, Array<Map<string, any>>> = new Map();
+        if (this.hasRequiredEdgeVersion) {
+            const metaFormGroup = (this.formGroup.get("_meta") as FormGroup)?.controls ?? [];
+            for (const prop of Object.keys(metaFormGroup)) {
+                if (metaFormGroup[prop].dirty) {
+                    if (updateArray.get("_meta")) {
+                        updateArray.get("_meta").push(new Map().set(prop, metaFormGroup[prop].value));
+                    } else {
+                        updateArray.set("_meta", [new Map().set(prop, metaFormGroup[prop].value)]);
+                    }
+                }
+            }
+        }
+
         for (const essId in this.formGroup.controls) {
             const essGroups = this.formGroup.controls[essId];
 
@@ -205,4 +243,5 @@ export class StorageModalComponent implements OnInit, OnDestroy {
     ngOnDestroy() {
         this.edge.unsubscribeChannels(this.websocket, "storage");
     }
+
 }
diff --git a/ui/src/app/edge/live/common/storage/storage.component.ts b/ui/src/app/edge/live/common/storage/storage.component.ts
index ec5a421b465..e26dbdf19ef 100644
--- a/ui/src/app/edge/live/common/storage/storage.component.ts
+++ b/ui/src/app/edge/live/common/storage/storage.component.ts
@@ -75,11 +75,7 @@ export class StorageComponent extends AbstractFlatWidget {
             component: StorageModalComponent,
             componentProps: {
                 edge: this.edge,
-                config: this.config,
                 component: this.component,
-                essComponents: this.essComponents,
-                chargerComponents: this.chargerComponents,
-                singleComponent: this.component,
             },
         });
         return await modal.present();
diff --git a/ui/src/app/edge/settings/settings.component.html b/ui/src/app/edge/settings/settings.component.html
index 5ee28695ffa..92147239be4 100644
--- a/ui/src/app/edge/settings/settings.component.html
+++ b/ui/src/app/edge/settings/settings.component.html
@@ -143,7 +143,7 @@
       <ion-col size="12" size-sm="4">
         <ion-card>
           <ion-item lines="full" color="light">
-            <ion-icon slot="start" size="large" color="medium" name="play-outline"></ion-icon>
+            <ion-icon slot="start" size="large" class="normal-icon" name="play-outline"></ion-icon>
             <ion-label translate>Edge.Config.Index.systemExecute</ion-label>
           </ion-item>
           <ion-card-content>
@@ -182,7 +182,6 @@
           </ion-card-content>
         </ion-card>
       </ion-col>
-
     </ion-row>
   </ion-grid>
-</ion-content>
\ No newline at end of file
+</ion-content>
diff --git a/ui/src/app/edge/settings/settings.module.ts b/ui/src/app/edge/settings/settings.module.ts
index 6711c9cd8db..f47ec2103b6 100644
--- a/ui/src/app/edge/settings/settings.module.ts
+++ b/ui/src/app/edge/settings/settings.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from "@angular/core";
 import { ChangelogComponent } from "src/app/changelog/view/component/changelog.component";
+import { ComponentsModule } from "src/app/shared/components/components.module";
 import { SharedModule } from "./../../shared/shared.module";
 import { AlertingComponent } from "./alerting/alerting.component";
 import { AppModule } from "./app/app.module";
@@ -25,6 +26,7 @@ import { SystemExecuteComponent } from "./systemexecute/systemexecute.component"
     SharedModule,
     ChangelogComponent,
     PowerAssistantModule,
+    ComponentsModule,
   ],
   declarations: [
     AlertingComponent,
diff --git a/ui/src/app/edge/settings/system/executesystemupdate.component.html b/ui/src/app/edge/settings/system/executesystemupdate.component.html
deleted file mode 100644
index 53281fa214c..00000000000
--- a/ui/src/app/edge/settings/system/executesystemupdate.component.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<ion-item lines="none">
-    <!--
-    Is Edge online?
-    -->
-    <ion-grid *ngIf="!edge.isOnline">
-        <ng-container>
-            <!-- If Edge is Restarting after Update -->
-            <ng-container *ngIf="executeUpdate.isEdgeRestarting">
-                <ion-item lines="none">
-                    Das {{environment.edgeShortName}} wird neugestartet... <br />
-                    (Dies kann bis zu 10 min dauern)
-                </ion-item>
-
-                <ion-item lines="none">
-                    <ion-progress-bar type="indeterminate" style="margin-top: 1%"></ion-progress-bar>
-                </ion-item>
-            </ng-container>
-            <ng-container *ngIf="!executeUpdate.isEdgeRestarting">
-                <ion-item lines="none">
-                    Das {{environment.edgeShortName}} ist offline.
-                </ion-item>
-            </ng-container>
-        </ng-container>
-    </ion-grid>
-    <!--
-      System Update State
-    -->
-    <ion-grid *ngIf="edge.isOnline">
-        <ion-row *ngIf="!isWaiting">
-            <ion-col size="12">
-                <ion-item lines="none">
-                    <ion-card-content *ngIf="executeUpdate && executeUpdate.systemUpdateState">
-                        <ng-container *ngIf="executeUpdate.systemUpdateState.updated as state">
-                            <!--
-                      Latest update is already installed
-                  -->
-                            <ion-row>
-                                <ion-col>Installierte Version:</ion-col>
-                                <ion-col>{{ state.version }}</ion-col>
-                            </ion-row>
-                            <ion-row>
-                                <ion-col style="font-weight: bold; color: green;">
-                                    <ion-label class="ion-text-wrap">
-                                        Das System ist auf dem
-                                        aktuellsten
-                                        Softwarestand
-                                    </ion-label>
-                                </ion-col>
-                            </ion-row>
-                        </ng-container>
-                        <ng-container *ngIf="executeUpdate.systemUpdateState.available as state">
-                            <!--
-                      Update is available
-                  -->
-                            <ion-row>
-                                <ion-col>Installierte Version:</ion-col>
-                                <ion-col>{{ state.currentVersion }}</ion-col>
-                            </ion-row>
-                            <ion-row>
-                                <ion-col>Neueste Version:</ion-col>
-                                <ion-col>{{ state.latestVersion }}</ion-col>
-                            </ion-row>
-                            <ion-row>
-                                <ion-col>
-                                    <ion-button (click)="executeSystemUpdate()">Neueste Version
-                                        installieren
-                                    </ion-button>
-                                </ion-col>
-                            </ion-row>
-                        </ng-container>
-                    </ion-card-content>
-                </ion-item>
-            </ion-col>
-        </ion-row>
-        <ion-row *ngIf="isWaiting">
-            <ion-col size="8">
-                <ion-item lines="none">
-                    <ion-card-content *ngIf="executeUpdate && executeUpdate.systemUpdateState">
-                        <ion-grid>
-                            <ng-container *ngIf="executeUpdate.systemUpdateState.unknown as state">
-                                <!--
-                              Update State is unknown
-                          -->
-                                <ion-row *ngIf="!executeUpdate.canNotBeUpdated">
-                                    <ion-col>Suche nach Updates...</ion-col>
-                                </ion-row>
-                                <ion-row *ngIf="executeUpdate.canNotBeUpdated">
-                                    <ion-col>System kann nicht geupdated werden!</ion-col>
-                                </ion-row>
-                            </ng-container>
-                            <ng-container *ngIf="executeUpdate.systemUpdateState.running as state">
-                                <!--
-                              Update is running
-                          -->
-                                <ion-row>
-                                    <ion-col>
-                                        <span *ngIf="state.percentCompleted < 100; else finished">Update wird
-                                            ausgeführt...<br />
-                                            (Dies kann bis zu 10 min dauern)</span>
-                                        <ng-template #finished>
-                                            <span><b>Update abgeschlossen</b></span>
-                                        </ng-template>
-                                    </ion-col>
-                                </ion-row>
-                                <ion-row>
-                                    <ion-col>
-                                        <percentagebar [value]="state.percentCompleted">
-                                        </percentagebar>
-                                    </ion-col>
-                                </ion-row>
-                            </ng-container>
-                        </ion-grid>
-                    </ion-card-content>
-                </ion-item>
-            </ion-col>
-            <ion-col size="4">
-                <ngx-spinner [name]="spinnerId"></ngx-spinner>
-            </ion-col>
-        </ion-row>
-    </ion-grid>
-</ion-item>
diff --git a/ui/src/app/edge/settings/system/executesystemupdate.component.ts b/ui/src/app/edge/settings/system/executesystemupdate.component.ts
deleted file mode 100644
index badb135f909..00000000000
--- a/ui/src/app/edge/settings/system/executesystemupdate.component.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// @ts-strict-ignore
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
-import { Edge, Service, Websocket } from "src/app/shared/shared";
-import { environment } from "src/environments";
-import { ExecuteSystemUpdate } from "./executeSystemUpdate";
-import { SystemUpdateState } from "./getSystemUpdateStateResponse";
-
-@Component({
-  selector: ExecuteSystemUpdateComponent.SELECTOR,
-  templateUrl: "./executesystemupdate.component.html",
-})
-export class ExecuteSystemUpdateComponent implements OnInit, OnDestroy {
-
-  private static readonly SELECTOR = "executesystemupdate";
-  @Input() public executeUpdateInstantly: boolean = false;
-  @Input() public edge: Edge;
-  @Output() public stateChanged: EventEmitter<SystemUpdateState> = new EventEmitter();
-  public readonly spinnerId: string = ExecuteSystemUpdateComponent.SELECTOR;
-
-  public readonly environment = environment;
-  protected executeUpdate: ExecuteSystemUpdate | null = null;
-
-  protected isWaiting: boolean;
-
-  constructor(
-    private websocket: Websocket,
-    private service: Service) { }
-
-  ngOnInit() {
-    this.executeUpdate = new ExecuteSystemUpdate(this.edge, this.websocket);
-
-    this.executeUpdate.systemUpdateStateChange = (systemUpdateState) => {
-      this.stateChanged.emit(systemUpdateState);
-      if (systemUpdateState.updated) {
-        this.service.stopSpinner(this.spinnerId);
-        this.isWaiting = false;
-      }
-    };
-
-    this.service.startSpinnerTransparentBackground(this.spinnerId);
-    this.isWaiting = true;
-    this.executeUpdate.start()
-      .finally(() => {
-        if (!this.executeUpdate.systemUpdateState.running) {
-          this.service.stopSpinner(this.spinnerId);
-          this.isWaiting = false;
-        }
-        if (this.executeUpdate.systemUpdateState.available && this.executeUpdateInstantly) {
-          this.executeSystemUpdate();
-        }
-      });
-  }
-
-  public ngOnDestroy() {
-    this.executeUpdate.stop();
-  }
-
-  public executeSystemUpdate() {
-    this.service.startSpinnerTransparentBackground(this.spinnerId);
-    this.isWaiting = true;
-    this.executeUpdate.executeSystemUpdate();
-  }
-
-}
diff --git a/ui/src/app/edge/settings/system/oe-system-update.component.html b/ui/src/app/edge/settings/system/oe-system-update.component.html
index 64311cb3735..2fb34fa0c22 100644
--- a/ui/src/app/edge/settings/system/oe-system-update.component.html
+++ b/ui/src/app/edge/settings/system/oe-system-update.component.html
@@ -55,7 +55,8 @@
                                     </ion-label>
                                 </ion-item>
                                 <ion-item lines="none">
-                                    <percentagebar [value]="state.percentCompleted"></percentagebar>
+                                    <oe-flat-widget-percentagebar
+                                        [value]="state.percentCompleted"></oe-flat-widget-percentagebar>
                                 </ion-item>
                             </ng-container>
                         </ion-col>
diff --git a/ui/src/app/edge/settings/system/oe-system-update.component.ts b/ui/src/app/edge/settings/system/oe-system-update.component.ts
index 6f20b1dba6f..e8c7383def0 100644
--- a/ui/src/app/edge/settings/system/oe-system-update.component.ts
+++ b/ui/src/app/edge/settings/system/oe-system-update.component.ts
@@ -2,8 +2,10 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
 import { AlertController } from "@ionic/angular";
 import { TranslateService } from "@ngx-translate/core";
+import { DataService } from "src/app/shared/components/shared/dataservice";
 import { Edge, presentAlert, Service, Websocket } from "src/app/shared/shared";
 import { environment } from "src/environments";
+import { LiveDataService } from "../../live/livedataservice";
 import { ExecuteSystemUpdate } from "./executeSystemUpdate";
 import { SystemUpdateState } from "./getSystemUpdateStateResponse";
 
@@ -11,6 +13,10 @@ import { SystemUpdateState } from "./getSystemUpdateStateResponse";
   selector: OeSystemUpdateComponent.SELECTOR,
   templateUrl: "./oe-system-update.component.html",
   standalone: false,
+  providers: [{
+    useClass: LiveDataService,
+    provide: DataService,
+  }],
 })
 export class OeSystemUpdateComponent implements OnInit, OnDestroy {
 
diff --git a/ui/src/app/shared/components/chart/chart.constants.ts b/ui/src/app/shared/components/chart/chart.constants.ts
index 6986e0a6edd..7c3d97ae2a3 100644
--- a/ui/src/app/shared/components/chart/chart.constants.ts
+++ b/ui/src/app/shared/components/chart/chart.constants.ts
@@ -161,6 +161,12 @@ export namespace ChartConstants {
         let currMin: number | null;
         if (yAxis.scale?.dynamicScale) {
           currMin = ArrayUtils.findSmallestNumber(dataset.data as number[]);
+
+          if (chartType === "bar") {
+            // to start the y-axis a few percent below the lowest value
+            // Applies only bar charts with dynamic scale set to true (schedule charts)
+            currMin = Math.floor(currMin - (currMin * 0.05));
+          }
         } else {
 
           // Starts yAxis at least at 0
diff --git a/ui/src/app/shared/components/chart/chart.html b/ui/src/app/shared/components/chart/chart.html
index f28d53386de..2f02fd3dfe6 100644
--- a/ui/src/app/shared/components/chart/chart.html
+++ b/ui/src/app/shared/components/chart/chart.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="edge">
   <ion-header>
-    <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);">
+    <ion-toolbar style="--background: var(--ion-color-toolbar-primary);">
       <ion-title style="color: var(--ion-title-color);">{{title}}</ion-title>
       <ion-buttons style="color: var(--ion-color-pickdate-toolbar);" slot="end">
         <ion-button routerLink="/device/{{edge.id}}/history">
diff --git a/ui/src/app/shared/components/footer/footer.html b/ui/src/app/shared/components/footer/footer.html
index 70b4c51370f..781d0067406 100644
--- a/ui/src/app/shared/components/footer/footer.html
+++ b/ui/src/app/shared/components/footer/footer.html
@@ -1,4 +1,4 @@
-<ion-footer *ngIf="!service.isSmartphoneResolution" style="--ion-background-color: var(--ion-color-toolbar-primary);">
+<ion-footer *ngIf="!service.isSmartphoneResolution" style="--background: var(--ion-color-toolbar-primary);">
   <ng-container *ngIf="user && edge && displayValues" lines="none">
     <ion-grid style="background-color: var(--ion-color-toolbar-primary); color: var(--ion-color-primary-contrast)">
       <ion-row>
diff --git a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html
index a20639306f5..49b9a346fc8 100644
--- a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html
+++ b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html
@@ -1,7 +1,7 @@
 <ion-footer>
   <ion-item #container lines="none"
     style="--min-height: initial !important;font-size: inherit; font-size: 14px !important;"
-    style="--ion-background-color: var(--ion-color-toolbar-primary);" color="secondary">
+    style="--background: var(--ion-color-toolbar-primary);" color="secondary">
     <ion-grid style="padding-top: 0; padding-bottom: 0;">
       <ion-row class="ion-justify-content-center" style="padding-top: 0; padding-bottom: 0;">
         <ion-col *ngIf="backButton" style="text-align: center;" #myIonCol>
diff --git a/ui/src/app/shared/components/header/header.component.html b/ui/src/app/shared/components/header/header.component.html
index 4128381dd8a..46bf8be67b8 100644
--- a/ui/src/app/shared/components/header/header.component.html
+++ b/ui/src/app/shared/components/header/header.component.html
@@ -1,5 +1,5 @@
 <ion-header *ngIf="isHeaderAllowed">
-  <ion-toolbar style="--ion-background-color: var(--ion-color-toolbar-primary);" mode="md">
+  <ion-toolbar style="--background: var(--ion-color-toolbar-primary);" mode="md">
     <ion-buttons *ngIf="backUrl" slot="start">
       <ion-button [routerLink]="backUrl" replaceUrl="true">
         <ion-icon [ngStyle]="{'color': 'var(--ion-menu-color)'}" name="arrow-back-outline"></ion-icon>
@@ -9,8 +9,8 @@
       <ion-menu-button autoHide="false" class="custom-menu-button"></ion-menu-button>
     </ion-buttons>
     <!-- page title is shown if the current page isn't Live nor History -->
-    <ion-title *ngIf="currentPage !== 'IndexLive' && currentPage !== 'IndexHistory'" class="ion-hide-md-up"
-      slot="start">
+    <ion-title style="color: var(--ion-title-color);"
+      *ngIf="currentPage !== 'IndexLive' && currentPage !== 'IndexHistory'" class="ion-hide-md-up" slot="start">
       {{ service.currentPageTitle }}
     </ion-title>
     <!-- page title is hidden when 'smartphone resolution' is reached -->
diff --git a/ui/src/app/shared/components/modal/modal.html b/ui/src/app/shared/components/modal/modal.html
index 277aa915f7d..e6d3a906a61 100644
--- a/ui/src/app/shared/components/modal/modal.html
+++ b/ui/src/app/shared/components/modal/modal.html
@@ -25,7 +25,7 @@
       <oe-help-button *ngIf="helpKey" [key]="helpKey"></oe-help-button>
 
       <ion-button (click)="modalController.dismiss()">
-        <ion-icon name="close-outline" size="medium" style="fill: var(--ion-color-dark)"></ion-icon>
+        <ion-icon name="close-outline" size="medium" style="color: var(--ion-title-color);"></ion-icon>
       </ion-button>
     </ion-buttons>
   </ion-toolbar>
diff --git a/ui/src/app/shared/components/pickdate/popover/popover.component.ts b/ui/src/app/shared/components/pickdate/popover/popover.component.ts
index 3bf36ecc0da..43d3f9e555a 100644
--- a/ui/src/app/shared/components/pickdate/popover/popover.component.ts
+++ b/ui/src/app/shared/components/pickdate/popover/popover.component.ts
@@ -7,6 +7,7 @@ import { addDays, endOfMonth, endOfWeek, endOfYear, getDate, getMonth, getYear,
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { EdgePermission, Service, Utils } from "src/app/shared/shared";
 
+import { Language } from "src/app/shared/type/language";
 import { Edge } from "../../edge/edge";
 
 @Component({
@@ -20,22 +21,28 @@ export class PickDatePopoverComponent implements OnInit {
     @Input() public edge: Edge | null = null;
     @Input() public historyPeriods: DefaultTypes.PeriodStringValues[] = [];
 
-    public locale: string = "de";
+    public locale: string = Language.DEFAULT.key;
     public showCustomDate: boolean = false;
 
     protected periods: string[] = [];
     protected readonly TOMORROW = addDays(new Date(), 1);
     protected myDpOptions: IAngularMyDpOptions = {
+
         stylesData: {
             selector: "dp1",
             styles: `
             .dp1 {
                 overflow-x: hidden;
             }
+            .myDpSelector{
+                background-color: var(--ion-color-background);
+                color: var(--color);
+                background: var(--ion-color-background);
+            }
             .dp1 .myDpIconLeftArrow, 
             .dp1 .myDpIconRightArrow,
             .dp1 .myDpHeaderBtn {
-                color: #004d8c;
+                color: var(--ion-color-primary);
             }
             .dp1 .myDpHeaderBtn:focus,
             .dp1 .myDpMonthLabel:focus,
@@ -68,6 +75,16 @@ export class PickDatePopoverComponent implements OnInit {
             background-color: #dbeaff;
             }
 
+            .ng-mydp * {
+                background-color: var(--ion-color-background);
+                color: var(--color);
+                border: 0;
+            }
+
+            .myDpDisabled {
+                color: var(--color);
+                background: repeating-linear-gradient(-45deg, darkgrey 7px, darkgrey 8px, transparent 7px, transparent 14px) !important;
+            }
              `,
         },
         calendarAnimation: { in: CalAnimation.FlipDiagonal, out: CalAnimation.ScaleCenter },
@@ -84,7 +101,6 @@ export class PickDatePopoverComponent implements OnInit {
     protected readonly DefaultTypes = DefaultTypes;
     private readonly TODAY = new Date();
 
-
     constructor(
         public service: Service,
         public popoverCtrl: PopoverController,
@@ -98,6 +114,8 @@ export class PickDatePopoverComponent implements OnInit {
     }
 
     ngOnInit() {
+
+        this.locale = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).key;
         // Restrict user to pick date before ibn-date
         this.myDpOptions.disableUntil = { day: Utils.subtractSafely(getDate(this.edge?.firstSetupProtocol), 1) ?? 1, month: Utils.addSafely(getMonth(this.edge?.firstSetupProtocol), 1) ?? 1, year: this.edge?.firstSetupProtocol?.getFullYear() ?? 2013 },
             this.locale = this.translate.getBrowserLang();
diff --git a/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html b/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html
index 02980ba1e0d..1f896f0ba84 100644
--- a/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html
+++ b/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html
@@ -1,3 +1,3 @@
 <ion-button (click)="presentPopover($event)">
-    <ion-icon name="options-outline"></ion-icon>
+    <ion-icon name="options-outline" style="color: var(--ion-title-color);"></ion-icon>
 </ion-button>
diff --git a/ui/src/assets/i18n/de.json b/ui/src/assets/i18n/de.json
index 0cc61c2e78f..ef0490e7b76 100644
--- a/ui/src/assets/i18n/de.json
+++ b/ui/src/assets/i18n/de.json
@@ -254,7 +254,14 @@
           },
           "OVERALL_SYSTEM": "Gesamtsystem"
         },
-        "FIX_DIGITAL_OUTPUT": "Digitale Ausgangscontroller"
+        "FIX_DIGITAL_OUTPUT": "Digitale Ausgangscontroller",
+        "SCHEDULE": {
+          "CHART_TITLE_ADMIN": "Aktueller Fahrplan (Nur für Admins)"
+        },
+        "STORAGE": {
+          "GRID_CHARGE": "Erhalt der Notstromreserve aus dem Netz aktivieren",
+          "GRID_CHARGE_WARNING": "Das Speichersystem kann zur Aufrechterhaltung der eingestellten Notstromreserve aktiv aus dem Netz nachladen um bei längerem Ausbleiben von Erzeugung Verluste durch internen Eigenverbrauch auszugleichen.<br/><br/>ACHTUNG: Die aktive Beladung der Batterie aus dem Netz über die technisch notwendige Erhaltungsladung hinaus erfordert eine entsprechende Anmeldung des Speichersystems. Im Zweifel wenden Sie sich hierzu bitte an Ihren Installateur. Mit Betätigung des blauen \"Speichern\"-Buttons bestätigen Sie, dass Sie diese Prüfung durchgeführt haben.<br/><br/>Beachten Sie: Voraussetzung für die Inanspruchnahme einer Förderung nach dem Gesetz für den Ausbau erneuerbarer Energien (EEG) ist, dass im Speicher ausschließlich Strom zwischengespeichert wird, der aus erneuerbaren Energien und/oder Grubengas stammt. Bei Aktivierung dieser Funktion wird der Speicher mit Netzstrom geladen. Dieser Netzstrom wird, je nach Stromlieferungsvertrag, ggf. auch aus fossilen Energieträgern und/oder Atomkraft gewonnen. Daher können wir nicht gewährleisten, dass der Speicher ausschließlich mit Strom aus erneuerbaren Energien und/oder Grubengas geladen wird"
+        }
       },
       "RETROFITTING": {
         "UPDATE_TO_NEW_VERSION": "Um die Kapazitätserweiterung nutzen zu können, ist ein Update auf die neueste Version erforderlich.",
diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
index 541fadee934..ad5ccfb119f 100644
--- a/ui/src/assets/i18n/en.json
+++ b/ui/src/assets/i18n/en.json
@@ -255,7 +255,14 @@
           },
           "OVERALL_SYSTEM": "Overall system"
         },
-        "FIX_DIGITAL_OUTPUT": "Digital Outputcontroller"
+        "FIX_DIGITAL_OUTPUT": "Digital Outputcontroller",
+        "SCHEDULE": {
+          "CHART_TITLE_ADMIN": "Planned Schedule (Only for Admins)"
+        },
+        "STORAGE": {
+          "GRID_CHARGE": "Activate maintenance of the emergency power reserve from the grid",
+          "GRID_CHARGE_WARNING": "The storage system can actively recharge from the grid to maintain the set emergency power reserve in order to compensate for losses due to internal self-consumption in the event of a prolonged absence of generation. <br/><br/>ATTENTION: Actively charging the battery from grid beyond the technically necessary maintenance charging, requires an appropriate registration of the storage system. If in doubt, please verify with your installer. By pressing the blue \"Save\" button you confirm that this verification has been done.<br/><br/>Be aware: precondition for German \"Gesetz für den Ausbau erneuerbarer Energien (EEG)\" grant is, that only energy from renewable sources and/or pit gas is stored in the battery. By activating this function, the battery is charged with energy from grid. This energy is, depending on the individual power-supply contract, probably made from fossil sources and/or nuclear power plants. Because of this we can not guarantee, that the battery is only charged with energy from renewable sources and/or pit gas."
+        }
       },
       "RETROFITTING": {
         "OPTIMAL": "Capacity expansion",
diff --git a/ui/src/environments/index.scss b/ui/src/environments/index.scss
index fcbbf2b8922..77d40a07e3d 100644
--- a/ui/src/environments/index.scss
+++ b/ui/src/environments/index.scss
@@ -158,6 +158,7 @@
     --ion-color-charge-primary: rgba(0, 223, 0, 1); // Base //
     --ion-color-charge-rgba: rgba(0, 223, 0, 0.05); // semi-transparent //
     --ion-color-custom-links: var(--ion-color-primary);
+    --ion-color-toggle-background: var(--ion-color-primary-tint);
 }
 
 
@@ -256,4 +257,5 @@
     /** Card **/
     --ion-card-content: #cccccc;
     --ion-card-content-color: #cccccc;
+    --ion-color-toggle-background: #9c9c9c;
 }
diff --git a/ui/src/global.scss b/ui/src/global.scss
index d7904c89178..91462ba61d9 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -451,7 +451,8 @@ formly-input-section {
     }
 
     ion-toggle {
-        --background-checked: var(--ion-color-primary-tint);
+        --background-checked: var(--ion-color-toggle-background);
+        --background: #9C9C9C;
     }
 
     ion-spinner {

From 1ce0018dc7b24698a8c601cdb2d819ce1f21d523 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Dec 2024 12:27:22 +0100
Subject: [PATCH 13/49] Build(deps): Bump io.jenetics:jenetics from 7.2.0 to
 8.1.0 in /cnf (#2795)

* Build(deps): Bump io.jenetics:jenetics from 7.2.0 to 8.1.0 in /cnf

Bumps [io.jenetics:jenetics](https://github.com/jenetics/jenetics) from 7.2.0 to 8.1.0.
- [Release notes](https://github.com/jenetics/jenetics/releases)
- [Changelog](https://github.com/jenetics/jenetics/blob/master/RELEASE_NOTES.md)
- [Commits](https://github.com/jenetics/jenetics/compare/v7.2.0...v8.1.0)

---
updated-dependencies:
- dependency-name: io.jenetics:jenetics
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update bndrun; fix ts

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                        | 2 +-
 io.openems.wrapper/jenetics.bnd    | 4 ++--
 ui/src/app/shared/type/language.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 32e92f67f83..e7f876f3d56 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -177,7 +177,7 @@
 			<!-- Release notes: https://github.com/jenetics/jenetics/blob/master/RELEASE_NOTES.md -->
 			<groupId>io.jenetics</groupId>
 			<artifactId>jenetics</artifactId>
-			<version>7.2.0</version>
+			<version>8.1.0</version>
 		</dependency>
 		<!-- javax -->
 		<dependency>
diff --git a/io.openems.wrapper/jenetics.bnd b/io.openems.wrapper/jenetics.bnd
index b8c7910d5ef..0aeb498fdaf 100644
--- a/io.openems.wrapper/jenetics.bnd
+++ b/io.openems.wrapper/jenetics.bnd
@@ -2,9 +2,9 @@ Bundle-Name: Jenetics
 Bundle-Description: Java Genetic Algorithm Library
 Bundle-DocURL: https://github.com/dhatim/fastexcel
 Bundle-License: https://opensource.org/licenses/Apache-2.0
-Bundle-Version: 7.2.0
+Bundle-Version: 8.1.0
 
-Include-Resource: @jenetics-7.2.0.jar
+Include-Resource: @jenetics-8.1.0.jar
 
 -dsannotations: *
 
diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts
index ac767f7efb3..693a81d2b6e 100644
--- a/ui/src/app/shared/type/language.ts
+++ b/ui/src/app/shared/type/language.ts
@@ -119,7 +119,7 @@ export class Language {
      * @returns translations params
      */
     public static async setAdditionalTranslationFile(translationFile: any, translate: TranslateService): Promise<{ lang: string; translations: {}; shouldMerge?: boolean; }> {
-        const lang = (await translate.onLangChange.pipe(filter(lang => !!lang), take(1)).toPromise()).lang ?? Language.DEFAULT.key;
+        const lang = (await translate.onLangChange.pipe(filter(lang => !!lang), take(1)).toPromise())?.lang ?? Language.DEFAULT.key;
         let translationKey: string = lang;
         if (!(lang in translationFile)) {
 

From 280763a1e14ad8de5fe2dec9e893f7b30da31563 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 15:15:32 +0100
Subject: [PATCH 14/49] Bump net.java.dev.jna:jna from 5.15.0 to 5.16.0 in /cnf
 (#2939)

* Bump net.java.dev.jna:jna from 5.15.0 to 5.16.0 in /cnf

Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.15.0 to 5.16.0.
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.15.0...5.16.0)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update bndrun

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                                | 2 +-
 io.openems.edge.application/EdgeApp.bndrun | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index e7f876f3d56..6dc69846fa6 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -190,7 +190,7 @@
 			<!-- Used by SDNotify -->
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.15.0</version>
+			<version>5.16.0</version>
 		</dependency>
 		<!-- org -->
 		<dependency>
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 89293689e9f..5ac61e56d48 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -208,7 +208,7 @@
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.squareup.okio;version='[3.9.1,3.9.2)',\
-	com.sun.jna;version='[5.15.0,5.15.1)',\
+	com.sun.jna;version='[5.16.0,5.16.1)',\
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\
 	io.openems.edge.battery.api;version=snapshot,\

From f5f4701f6e11d4042485a967f99bbecfd781e40c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 15:46:58 +0100
Subject: [PATCH 15/49] Bump fr.turri:aXMLRPC from 1.15.0 to 1.16.0 in /cnf
 (#2940)

* Bump fr.turri:aXMLRPC from 1.15.0 to 1.16.0 in /cnf

Bumps [fr.turri:aXMLRPC](https://github.com/gturri/aXMLRPC) from 1.15.0 to 1.16.0.
- [Changelog](https://github.com/gturri/aXMLRPC/blob/master/Changelog)
- [Commits](https://github.com/gturri/aXMLRPC/compare/aXMLRPC-1.15.0...aXMLRPC-1.16.0)

---
updated-dependencies:
- dependency-name: fr.turri:aXMLRPC
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update wrapper

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                    | 2 +-
 io.openems.wrapper/aXMLRPC.bnd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 6dc69846fa6..2ffef2dc444 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -130,7 +130,7 @@
 		<dependency>
 			<groupId>fr.turri</groupId>
 			<artifactId>aXMLRPC</artifactId>
-			<version>1.15.0</version>
+			<version>1.16.0</version>
 		</dependency>
 		<!-- info -->
 		<dependency>
diff --git a/io.openems.wrapper/aXMLRPC.bnd b/io.openems.wrapper/aXMLRPC.bnd
index c7d9750545f..f2f8e5c2536 100644
--- a/io.openems.wrapper/aXMLRPC.bnd
+++ b/io.openems.wrapper/aXMLRPC.bnd
@@ -2,10 +2,10 @@ Bundle-Name: aXMLRPC
 Bundle-Description: aXMLRPC is a Java library with a lightweight XML-RPC client. 
 Bundle-DocURL: https://github.com/gturri/aXMLRPC
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 1.15.0
+Bundle-Version: 1.16.0
 
 Include-Resource: \
-	@aXMLRPC-1.15.0.jar,\
+	@aXMLRPC-1.16.0.jar,\
 
 Export-Package: \
 	de.timroes.axmlrpc,\

From c2edd128bbb531221c0ef5428e32a80899f368c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 21:08:08 +0100
Subject: [PATCH 16/49] Bump org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm
 from 1.9.0 to 1.10.1 in /cnf (#2938)

* Bump org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm in /cnf

Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm](https://github.com/Kotlin/kotlinx.coroutines) from 1.9.0 to 1.10.1.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0...1.10.1)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update bnd

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                                        | 2 +-
 io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 2ffef2dc444..191ff3f5c56 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -342,7 +342,7 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
 			<artifactId>kotlinx-coroutines-core-jvm</artifactId>
-			<version>1.9.0</version>
+			<version>1.10.1</version>
 		</dependency>
 		<dependency>
 			<!-- HTML processing -->
diff --git a/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd b/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd
index 3b276e9c952..58296c64571 100644
--- a/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd
+++ b/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd
@@ -2,10 +2,10 @@ Bundle-Name: kotlinx-coroutines-core-jvm
 Bundle-Description: The Java InfluxDB 2.0 Client Core
 Bundle-DocURL: https://github.com/influxdata/influxdb-client-client
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 1.9.0
+Bundle-Version: 1.10.1
 
 Include-Resource: \
-	@kotlinx-coroutines-core-jvm-1.9.0.jar,\
+	@kotlinx-coroutines-core-jvm-1.10.1.jar,\
 
 Export-Package: \
 	kotlinx.coroutines,\

From 86b820bb67ee3648819cf2ffe608dc4379798e3f Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Sat, 28 Dec 2024 22:09:36 +0100
Subject: [PATCH 17/49] UI: fix Filter Style after Migration to Angular 19
 (#2934)

* Fix Filter Style after Migration to Angular 19

* Revert Changes in filter.component.html

* Include --background: var(--ion-background-color); in global.scss
---
 ui/src/app/index/filter/filter.component.html | 4 ++--
 ui/src/global.scss                            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/index/filter/filter.component.html b/ui/src/app/index/filter/filter.component.html
index ef0347796fa..bc1cb2eb93d 100644
--- a/ui/src/app/index/filter/filter.component.html
+++ b/ui/src/app/index/filter/filter.component.html
@@ -3,8 +3,8 @@
     <ion-col size="6">
       <ng-container *ngIf="filter">
         <ion-select interface="popover" [multiple]="true" [label]="filter.placeholder" label-placement="floating"
-          fill="solid" type="radio" (ionDismiss)="searchOnChange($event, filter)" fill="solid"
-          class="custom-ion-popover" style="white-space: initial; --color: var(--ion-color-primary)">
+          fill="solid" type="radio" (ionDismiss)="searchOnChange($event, filter)" class="custom-ion-popover"
+          style="white-space: initial; --color: var(--ion-color-primary)">
           <ng-container *ngFor="let option of filter.options">
             <ion-select-option [value]="option.value">{{option.name}}
             </ion-select-option>
diff --git a/ui/src/global.scss b/ui/src/global.scss
index 91462ba61d9..9e8063f82d6 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -145,6 +145,7 @@ formly-field-ion-radio {
 .custom-ion-popover {
 
     --border-width: 0;
+    --background: var(--ion-background-color);
 
     // Floating label
     &::part(label) {

From 9a62c7a2f1f3ef1ba54d0d37cd1cb26bc3f536eb Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Sat, 28 Dec 2024 23:16:39 +0100
Subject: [PATCH 18/49] UI: fix style of Level ion-select after Upgrade to
 Angular 19 (#2933)

* Fix Style of Level ion-select after Upgrade to Angular 19
---
 ui/src/app/edge/settings/systemlog/systemlog.component.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/edge/settings/systemlog/systemlog.component.html b/ui/src/app/edge/settings/systemlog/systemlog.component.html
index a56447228e3..37e145db9ae 100644
--- a/ui/src/app/edge/settings/systemlog/systemlog.component.html
+++ b/ui/src/app/edge/settings/systemlog/systemlog.component.html
@@ -28,10 +28,8 @@
                 </ion-col>
                 <ion-col>
                   <ion-item lines="none">
-                    <ion-label translate class="ion-text-wrap" position="floating"
-                      color="primary">{{filters.placeholder}}</ion-label>
-                    <ion-select label-placement="floating" interface="popover" [multiple]="true" label="Fixed label"
-                      fill="solid" [interfaceOptions]="{ cssClass: 'custom-ion-popover' }" type="radio"
+                    <ion-select interface="popover" [multiple]="true" label="Level" fill="outline"
+                      class="custom-ion-popover" style="white-space: initial; --color: var(--ion-color-primary)"
                       (ionDismiss)="searchOnChange($event)" style="white-space: initial;">
                       <ng-container *ngFor="let filter of filters.options">
                         <ion-select-option [value]="filter.value">{{filter.name}}

From f2319348eafa684dda913b39c4393d84f761ad0f Mon Sep 17 00:00:00 2001
From: Helge Klein <3407928+helgeklein@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:01:45 +0100
Subject: [PATCH 19/49] UI Environment: access websocket via WSS instead of WS
 if page is accessed via HTTPS (#2937)

* Websocket: WSS instead of WS if page is accessed via HTTPS

Prevents mixed content errors in the browser by selecting WSS or WS for the websocket depending on the page's scheme (HTTPS or HTTP).

---------

Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/src/environments/index.ts                       | 7 +++++++
 ui/src/themes/openems/environments/backend-dev.ts  | 3 ++-
 ui/src/themes/openems/environments/backend-prod.ts | 3 ++-
 ui/src/themes/openems/environments/edge-dev.ts     | 3 ++-
 ui/src/themes/openems/environments/edge-prod.ts    | 3 ++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ui/src/environments/index.ts b/ui/src/environments/index.ts
index e10181d51ce..a5790f059f5 100644
--- a/ui/src/environments/index.ts
+++ b/ui/src/environments/index.ts
@@ -96,3 +96,10 @@ export interface Environment {
     },
     readonly PRODUCT_TYPES: (translate: TranslateService) => Filter | null
 }
+
+/*
+ * Return the proper websocket scheme (WS or WSS) depending on whether the page is accessed via HTTP or HTTPS.
+ */
+export function getWebsocketScheme(): string {
+    return window.location.protocol === "https:" ? "wss://" : "ws://";
+}
diff --git a/ui/src/themes/openems/environments/backend-dev.ts b/ui/src/themes/openems/environments/backend-dev.ts
index a6726d2b8c5..66af32592b9 100644
--- a/ui/src/themes/openems/environments/backend-dev.ts
+++ b/ui/src/themes/openems/environments/backend-dev.ts
@@ -1,11 +1,12 @@
 import { Environment } from "src/environments";
+import { getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
     ...theme, ...{
 
         backend: "OpenEMS Backend",
-        url: "ws://" + location.hostname + ":8082",
+        url: getWebsocketScheme() + location.hostname + ":8082",
 
         production: false,
         debugMode: true,
diff --git a/ui/src/themes/openems/environments/backend-prod.ts b/ui/src/themes/openems/environments/backend-prod.ts
index ebfe2b1ecf2..7c695bab038 100644
--- a/ui/src/themes/openems/environments/backend-prod.ts
+++ b/ui/src/themes/openems/environments/backend-prod.ts
@@ -1,11 +1,12 @@
 import { Environment } from "src/environments";
+import { getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
     ...theme, ...{
 
         backend: "OpenEMS Backend",
-        url: "ws://" + location.hostname + ":8082",
+        url: getWebsocketScheme() + location.hostname + ":8082",
 
         production: true,
         debugMode: false,
diff --git a/ui/src/themes/openems/environments/edge-dev.ts b/ui/src/themes/openems/environments/edge-dev.ts
index b36d202ef27..8e7292f8b81 100644
--- a/ui/src/themes/openems/environments/edge-dev.ts
+++ b/ui/src/themes/openems/environments/edge-dev.ts
@@ -1,11 +1,12 @@
 import { Environment } from "src/environments";
+import { getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
     ...theme, ...{
 
         backend: "OpenEMS Edge",
-        url: "ws://" + location.hostname + ":8085",
+        url: getWebsocketScheme() + location.hostname + ":8085",
 
         production: false,
         debugMode: true,
diff --git a/ui/src/themes/openems/environments/edge-prod.ts b/ui/src/themes/openems/environments/edge-prod.ts
index 183a4f0fef9..2bda82ceee5 100644
--- a/ui/src/themes/openems/environments/edge-prod.ts
+++ b/ui/src/themes/openems/environments/edge-prod.ts
@@ -1,11 +1,12 @@
 import { Environment } from "src/environments";
+import { getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
     ...theme, ...{
 
         backend: "OpenEMS Edge",
-        url: "ws://" + location.hostname + ":8075",
+        url: getWebsocketScheme() + location.hostname + ":8075",
 
         production: true,
         debugMode: false,

From fa262c39b142eca58c91f8cb92b149820fd6f1db Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 31 Dec 2024 16:15:34 +0100
Subject: [PATCH 20/49] TimeOfUseTariff: improvements for EVCS (#2947)

- Add JsonUtils for LocalDateTime
- Add DEBUG context to `triggerReschedule()` (temporary)
- Add Bulider for EnergyScheduleHandlers
- EvcsController
  - Add temporary configs for SmartMode
  - Apply smart config in `run()`
  - Add simple JSONRPC request/response
- EnergyFlow: handle managedConsumption
- Add first implementation of JSCalendar

Open TODOs
- Fix EnergySession bugs with KEBA
- EshCodec: valid states should be read from ESH (e.g. JSCalendar payload)
- InitialPopulation: read good variations from ESHs (e.g. suggest force charge car during cheapest hour)
- on interrupt: keep best "regularOptimization" up till now as input for next InitialPopulation

* Add Chart to UI Live Modal

* Add JUnit tests
---
 .../io/openems/common/utils/JsonUtils.java    |  51 ++-
 .../openems/common/utils/JsonUtilsTest.java   |  16 +
 ...rollerEssEmergencyCapacityReserveImpl.java |  13 +-
 .../ControllerEssFixActivePowerImpl.java      |  11 +-
 .../ControllerEssGridOptimizedChargeImpl.java |  11 +-
 .../ControllerEssLimitTotalDischargeImpl.java |   9 +-
 .../TimeOfUseTariffControllerImpl.java        |  20 +-
 .../openems/edge/controller/evcs/Config.java  |   7 +
 .../edge/controller/evcs/ControllerEvcs.java  |   4 +-
 .../controller/evcs/ControllerEvcsImpl.java   | 178 ++++----
 .../edge/controller/evcs/JSCalendar.java      | 391 ++++++++++++++++++
 .../edge/controller/evcs/SmartMode.java       |  42 ++
 .../openems/edge/controller/evcs/Utils.java   | 271 ++++++++++++
 .../evcs/jsonrpc/GetScheduleRequest.java      |  49 +++
 .../evcs/jsonrpc/GetScheduleResponse.java     | 136 ++++++
 .../controller/evcs/jsonrpc/package-info.java |   3 +
 .../edge/controller/evcs/package-info.java    |   3 +
 .../evcs/ControllerEvcsImplTest.java          |  43 ++
 .../edge/controller/evcs/JSCalendarTest.java  | 133 ++++++
 .../edge/controller/evcs/MyConfig.java        |  22 +
 ...cheduleHandlerTest.java => UtilsTest.java} |  42 +-
 .../edge/energy/api/EnergySchedulable.java    |   4 +-
 .../energy/api/EnergyScheduleHandler.java     | 266 ++++++++----
 .../energy/api/simulation/EnergyFlow.java     |  22 +-
 .../simulation/GlobalSimulationsContext.java  | 207 +++++-----
 .../api/test/DummyEnergySchedulable.java      |   5 -
 io.openems.edge.energy/bnd.bnd                |   1 +
 .../edge/energy/EnergySchedulerImpl.java      |  27 +-
 .../edge/energy/optimizer/EshCodec.java       |   2 +
 .../energy/optimizer/InitialPopulation.java   |   2 +
 .../edge/energy/optimizer/Optimizer.java      |  59 ++-
 .../energy/optimizer/SimulationResult.java    |   6 +-
 .../edge/energy/optimizer/Simulator.java      |   9 +-
 .../edge/energy/optimizer/SimulatorTest.java  |  29 +-
 .../edge/energy/optimizer/app/AppUtils.java   |  22 +-
 .../optimizer/app/RunOptimizerFromLogApp.java |  29 +-
 ui/src/app/edge/live/Controller/Evcs/Evcs.ts  | 107 +++++
 .../Evcs/jsonrpc/getScheduleRequest.ts        |  24 ++
 .../Evcs/jsonrpc/getScheduleResponse.ts       |  36 ++
 .../live/Controller/Evcs/modal/modal.html     |   9 +
 .../Controller/Evcs/modal/scheduleChart.ts    | 164 ++++++++
 41 files changed, 2121 insertions(+), 364 deletions(-)
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/SmartMode.java
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleRequest.java
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleResponse.java
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/package-info.java
 create mode 100644 io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/package-info.java
 create mode 100644 io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
 rename io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/{EnergyScheduleHandlerTest.java => UtilsTest.java} (59%)
 create mode 100644 ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleRequest.ts
 create mode 100644 ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleResponse.ts
 create mode 100644 ui/src/app/edge/live/Controller/Evcs/modal/scheduleChart.ts

diff --git a/io.openems.common/src/io/openems/common/utils/JsonUtils.java b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
index 591a960f80f..1ead2112db3 100644
--- a/io.openems.common/src/io/openems/common/utils/JsonUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
@@ -3,6 +3,7 @@
 import static io.openems.common.utils.EnumUtils.toEnum;
 
 import java.net.Inet4Address;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -37,7 +38,11 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.types.OpenemsType;
 
-public class JsonUtils {
+public final class JsonUtils {
+
+	private JsonUtils() {
+	}
+
 	/**
 	 * Provide a easy way to generate a JsonArray from a list using the given
 	 * convert function to add each element.
@@ -291,6 +296,24 @@ public JsonObjectBuilder addProperty(String property, ZonedDateTime value) {
 			return this;
 		}
 
+		/**
+		 * Add a {@link LocalDateTime} value to the {@link JsonObject}.
+		 *
+		 * <p>
+		 * The value gets added in the format of
+		 * {@link DateTimeFormatter#ISO_LOCAL_DATE_TIME}.
+		 *
+		 * @param property the key
+		 * @param value    the value
+		 * @return the {@link JsonObjectBuilder}
+		 */
+		public JsonObjectBuilder addProperty(String property, LocalDateTime value) {
+			if (value != null) {
+				this.j.addProperty(property, value.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+			}
+			return this;
+		}
+
 		/**
 		 * Add a {@link Boolean} value to the {@link JsonObject}.
 		 *
@@ -1723,6 +1746,32 @@ public static ZonedDateTime getAsZonedDateWithZeroTime(JsonElement element, Stri
 		}
 	}
 
+	/**
+	 * Takes a JSON in the form '2020-01-01T00:00:00' and converts it to a
+	 * {@link LocalDateTime}.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member of the JsonObject
+	 * @return the {@link ZonedDateTime}
+	 */
+	public static LocalDateTime getAsLocalDateTime(JsonElement jElement, String memberName)
+			throws OpenemsNamedException {
+		return DateUtils.parseLocalDateTimeOrError(toString(toPrimitive(toSubElement(jElement, memberName))));
+	}
+
+	/**
+	 * Takes a JSON in the form '2020-01-01T00:00:00Z' and converts it to a
+	 * {@link ZonedDateTime}.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member of the JsonObject
+	 * @return the {@link ZonedDateTime}
+	 */
+	public static ZonedDateTime getAsZonedDateTime(JsonElement jElement, String memberName)
+			throws OpenemsNamedException {
+		return DateUtils.parseZonedDateTimeOrError(toString(toPrimitive(toSubElement(jElement, memberName))));
+	}
+
 	/**
 	 * Takes a JSON in the form 'YYYY-MM-DD' and converts it to a
 	 * {@link ZonedDateTime}.
diff --git a/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java b/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
index badcaae75dd..de06b6e2bd3 100644
--- a/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
+++ b/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
@@ -44,6 +44,7 @@
 import static io.openems.common.utils.JsonUtils.getAsJsonArray;
 import static io.openems.common.utils.JsonUtils.getAsJsonElement;
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsLocalDateTime;
 import static io.openems.common.utils.JsonUtils.getAsLong;
 import static io.openems.common.utils.JsonUtils.getAsOptionalBoolean;
 import static io.openems.common.utils.JsonUtils.getAsOptionalDouble;
@@ -64,6 +65,7 @@
 import static io.openems.common.utils.JsonUtils.getAsStringOrElse;
 import static io.openems.common.utils.JsonUtils.getAsType;
 import static io.openems.common.utils.JsonUtils.getAsUUID;
+import static io.openems.common.utils.JsonUtils.getAsZonedDateTime;
 import static io.openems.common.utils.JsonUtils.getAsZonedDateWithZeroTime;
 import static io.openems.common.utils.JsonUtils.getOptionalSubElement;
 import static io.openems.common.utils.JsonUtils.getSubElement;
@@ -80,11 +82,13 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -148,6 +152,8 @@ private static final <T extends Throwable> void assertAllThrow(Class<T> expected
 			.addProperty("Enum3", (Unit) null) //
 			.addProperty("Inet4Address", "192.168.1.2") //
 			.addProperty("UUID", "c48e2e28-09be-41d5-8e58-260d162991cc") //
+			.addProperty("ZonedDateTime", ZonedDateTime.of(1900, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"))) //
+			.addProperty("LocalDateTime", LocalDateTime.of(1900, 1, 1, 0, 0, 0, 0)) //
 			.addPropertyIfNotNull("Boolean1", (Boolean) null) //
 			.addPropertyIfNotNull("Boolean2", Boolean.FALSE) //
 			.addPropertyIfNotNull("Double1", (Double) null) //
@@ -680,6 +686,13 @@ public void testGetAsZonedDateTime() throws OpenemsNamedException {
 		assertOpenemsError(JSON_NO_DATE_MEMBER, //
 				() -> getAsZonedDateWithZeroTime(j, "foo", ZoneId.of("UTC")) //
 		);
+
+		assertEquals("1900-01-01T00:00Z", getAsZonedDateTime(JSON_OBJECT, "ZonedDateTime").toString());
+	}
+
+	@Test
+	public void testGetAsLocalDateTime() throws OpenemsNamedException {
+		assertEquals("1900-01-01T00:00", getAsLocalDateTime(JSON_OBJECT, "LocalDateTime").toString());
 	}
 
 	@Test
@@ -744,6 +757,9 @@ public void testIsEmptyJsonArray() throws OpenemsNamedException {
 
 	@Test
 	public void testGenerateJsonArray() {
+		assertNull(generateJsonArray(null));
+		assertEquals(JsonNull.INSTANCE, generateJsonArray(List.of(JsonNull.INSTANCE)).get(0));
+
 		var list = List.of("foo", "bar");
 		var r = generateJsonArray(list, v -> new JsonPrimitive(v));
 		assertEquals("foo", r.get(0).getAsString());
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java
index f830c10b957..3d35a5c5fa2 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImpl.java
@@ -92,7 +92,7 @@ private void activate(ComponentContext context, Config config) {
 	protected void modified(ComponentContext context, String id, String alias, boolean enabled) {
 		super.modified(context, id, alias, enabled);
 		this.updateConfig(this.config);
-		this.energyScheduleHandler.triggerReschedule();
+		this.energyScheduleHandler.triggerReschedule("ControllerEssEmergencyCapacityReserveImpl::modified()");
 	}
 
 	@Override
@@ -219,15 +219,16 @@ private OptionalInt getLastValidSoc(IntegerReadChannel channel) {
 	 * @return a {@link EnergyScheduleHandler}
 	 */
 	public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<Integer> minSoc) {
-		return EnergyScheduleHandler.of(//
-				simContext -> minSoc.get() == null //
+		return EnergyScheduleHandler.WithOnlyOneState.<Integer>create() //
+				.setContextFunction(simContext -> minSoc.get() == null //
 						? null //
-						: socToEnergy(simContext.ess().totalEnergy(), minSoc.get()), //
-				(simContext, period, energyFlow, minEnergy) -> {
+						: socToEnergy(simContext.ess().totalEnergy(), minSoc.get())) //
+				.setSimulator((simContext, period, energyFlow, minEnergy) -> {
 					if (minEnergy != null) {
 						energyFlow.setEssMaxDischarge(max(0, simContext.ess.getInitialEnergy() - minEnergy));
 					}
-				});
+				}) //
+				.build();
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java
index 2fe3a64a3e7..32c9fb30834 100644
--- a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java
+++ b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java
@@ -85,7 +85,7 @@ private void modified(ComponentContext context, Config config) {
 		if (this.applyConfig(context, config)) {
 			return;
 		}
-		this.energyScheduleHandler.triggerReschedule();
+		this.energyScheduleHandler.triggerReschedule("ControllerEssFixActivePowerImpl::modified()");
 	}
 
 	private boolean applyConfig(ComponentContext context, Config config) {
@@ -165,9 +165,9 @@ public Timedata getTimedata() {
 	 * @return a {@link EnergyScheduleHandler}
 	 */
 	public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<EshContext> context) {
-		return EnergyScheduleHandler.of(//
-				simContext -> context.get(), //
-				(simContext, period, energyFlow, ctrlContext) -> {
+		return EnergyScheduleHandler.WithOnlyOneState.<EshContext>create() //
+				.setContextFunction(simContext -> context.get()) //
+				.setSimulator((simContext, period, energyFlow, ctrlContext) -> {
 					switch (ctrlContext.mode) {
 					case MANUAL_ON:
 						switch (ctrlContext.relationship) {
@@ -179,7 +179,8 @@ public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<EshConte
 					case MANUAL_OFF:
 						break;
 					}
-				});
+				}) //
+				.build();
 	}
 
 	public static record EshContext(Mode mode, int energy, Relationship relationship) {
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImpl.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImpl.java
index dc05f7914c4..fb735889d69 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImpl.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImpl.java
@@ -472,8 +472,8 @@ public Timedata getTimedata() {
 	 */
 	public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<Mode> mode,
 			Supplier<LocalTime> manualTargetTime) {
-		return EnergyScheduleHandler.of(//
-				simContext -> {
+		return EnergyScheduleHandler.WithOnlyOneState.<EshContext>create() //
+				.setContextFunction(simContext -> {
 					// TODO try to reuse existing logic for parsing, calculating limits, etc.; for
 					// now this only works for current day and MANUAL mode
 					final var limits = ImmutableSortedMap.<ZonedDateTime, OptionalInt>naturalOrder();
@@ -526,8 +526,8 @@ public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<Mode> mo
 					}
 
 					return new EshContext(limits.build());
-				}, //
-				(simContext, period, energyFlow, ctrlContext) -> {
+				}) //
+				.setSimulator((simContext, period, energyFlow, ctrlContext) -> {
 					var limitEntry = ctrlContext.limits.floorEntry(period.time());
 					if (limitEntry == null) {
 						return;
@@ -536,7 +536,8 @@ public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<Mode> mo
 					if (limit.isPresent()) {
 						energyFlow.setEssMaxCharge(limit.getAsInt());
 					}
-				});
+				}) //
+				.build();
 	}
 
 	private static record EshContext(ImmutableSortedMap<ZonedDateTime, OptionalInt> limits) {
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImpl.java b/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImpl.java
index 73abdc648aa..371543c895a 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImpl.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImpl.java
@@ -232,11 +232,12 @@ private boolean changeState(State nextState) {
 	 * @return a {@link EnergyScheduleHandler}
 	 */
 	public static EnergyScheduleHandler buildEnergyScheduleHandler(IntSupplier minSoc) {
-		return EnergyScheduleHandler.of(//
-				simContext -> socToEnergy(simContext.ess().totalEnergy(), minSoc.getAsInt()), //
-				(simContext, period, energyFlow, minEnergy) -> {
+		return EnergyScheduleHandler.WithOnlyOneState.<Integer>create() //
+				.setContextFunction(simContext -> socToEnergy(simContext.ess().totalEnergy(), minSoc.getAsInt())) //
+				.setSimulator((simContext, period, energyFlow, minEnergy) -> {
 					energyFlow.setEssMaxDischarge(max(0, simContext.ess.getInitialEnergy() - minEnergy));
-				});
+				}) //
+				.build();
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImpl.java b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImpl.java
index d9abc24b003..aaa0fd7f5fb 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImpl.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImpl.java
@@ -150,7 +150,7 @@ private void activate(ComponentContext context, Config config) {
 	private void modified(ComponentContext context, Config config) {
 		super.modified(context, config.id(), config.alias(), config.enabled());
 		this.applyConfig(config);
-		this.energyScheduleHandler.triggerReschedule();
+		this.energyScheduleHandler.triggerReschedule("TimeOfUseTariffControllerImpl::modified()");
 	}
 
 	private synchronized void applyConfig(Config config) {
@@ -270,17 +270,17 @@ public String debugLog() {
 	 */
 	public static EnergyScheduleHandler.WithDifferentStates<StateMachine, EshContext> buildEnergyScheduleHandler(
 			Supplier<ManagedSymmetricEss> ess, Supplier<ControlMode> controlMode, IntSupplier maxChargePowerFromGrid) {
-		return EnergyScheduleHandler.of(//
-				StateMachine.BALANCING, //
-				() -> controlMode.get().states, //
-				simContext -> {
+		return EnergyScheduleHandler.WithDifferentStates.<StateMachine, EshContext>create() //
+				.setDefaultState(StateMachine.BALANCING) //
+				.setAvailableStates(() -> controlMode.get().states) //
+				.setContextFunction(simContext -> {
 					// Maximium-SoC in CHARGE_GRID is 90 %
 					var maxSocEnergyInChargeGrid = round(simContext.ess().totalEnergy() * (ESS_MAX_SOC / 100));
 					var essChargeInChargeGrid = calculateChargeEnergyInChargeGrid(simContext);
 					return new EshContext(ess.get(), controlMode.get(), maxChargePowerFromGrid.getAsInt(),
 							maxSocEnergyInChargeGrid, essChargeInChargeGrid);
-				}, //
-				(simContext, period, energyFlow, ctrlContext, state) -> {
+				}) //
+				.setSimulator((simContext, period, energyFlow, ctrlContext, state) -> {
 					switch (state) {
 					case BALANCING -> applyBalancing(energyFlow); // TODO Move to CtrlBalancing
 					case DELAY_DISCHARGE -> applyDelayDischarge(energyFlow);
@@ -290,8 +290,10 @@ public static EnergyScheduleHandler.WithDifferentStates<StateMachine, EshContext
 						applyChargeGrid(energyFlow, ctrlContext.essChargeInChargeGrid);
 					}
 					}
-				}, //
-				Utils::postprocessSimulatorState);
+					return 0.;
+				}) //
+				.setPostProcessor(Utils::postprocessSimulatorState) //
+				.build();
 	}
 
 	/**
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java
index 9edecbc6394..bcd03b9d7b4 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java
@@ -19,6 +19,13 @@
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
 
+	// TODO this will change in future
+	@AttributeDefinition(name = "Enable EnergyScheduler SMART-Mode", description = "")
+	boolean smartMode() default false;
+
+	@AttributeDefinition(name = "JSON Configuration for SMART mode", description = "")
+	String smartConfig() default "";
+
 	@AttributeDefinition(name = "Debug Mode", description = "Activates the debug mode")
 	boolean debugMode() default false;
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java
index 39ff4a44e88..8c33df85291 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcs.java
@@ -13,7 +13,9 @@ public interface ControllerEvcs extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		AWAITING_HYSTERESIS(Doc.of(BOOLEAN) //
-				.persistencePriority(HIGH)),
+				.persistencePriority(HIGH)), //
+		SMART_MODE(Doc.of(SmartMode.values()) //
+				.persistencePriority(HIGH)), //
 		EVCS_IS_READ_ONLY(Doc.of(Level.INFO) //
 				.translationKey(ControllerEvcs.class, "evcsIsReadOnly")); //
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
index 60206b7e77f..5fea3d38e06 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ControllerEvcsImpl.java
@@ -1,15 +1,17 @@
 package io.openems.edge.controller.evcs;
 
-import static io.openems.edge.energy.api.EnergyUtils.toEnergy;
+import static io.openems.common.utils.FunctionUtils.doNothing;
+import static io.openems.edge.controller.evcs.Utils.FORCE_CHARGE_POWER;
+import static io.openems.edge.controller.evcs.Utils.MIN_CHARGE_POWER;
+import static io.openems.edge.controller.evcs.Utils.buildEshManual;
+import static io.openems.edge.controller.evcs.Utils.buildEshSmart;
 import static java.lang.Math.max;
-import static java.lang.Math.min;
 
 import java.io.IOException;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.function.BiConsumer;
-import java.util.function.Supplier;
 
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -30,12 +32,19 @@
 import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.jsonapi.JsonApiBuilder;
 import io.openems.edge.common.modbusslave.ModbusSlave;
 import io.openems.edge.common.modbusslave.ModbusSlaveTable;
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshManualContext;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
+import io.openems.edge.controller.evcs.jsonrpc.GetScheduleRequest;
+import io.openems.edge.controller.evcs.jsonrpc.GetScheduleResponse;
 import io.openems.edge.energy.api.EnergySchedulable;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
+import io.openems.edge.energy.api.EnergyScheduleHandler.WithDifferentStates.Period;
 import io.openems.edge.evcs.api.ChargeMode;
 import io.openems.edge.evcs.api.ChargeState;
 import io.openems.edge.evcs.api.ManagedEvcs;
@@ -48,7 +57,7 @@
 		configurationPolicy = ConfigurationPolicy.REQUIRE //
 )
 public class ControllerEvcsImpl extends AbstractOpenemsComponent
-		implements Controller, OpenemsComponent, ModbusSlave, EnergySchedulable, ControllerEvcs {
+		implements Controller, ControllerEvcs, EnergySchedulable, OpenemsComponent, ModbusSlave, ComponentJsonApi {
 
 	private static final int CHARGE_POWER_BUFFER = 200;
 	private static final double DEFAULT_UPPER_TARGET_DIFFERENCE_PERCENT = 0.10; // 10%
@@ -56,8 +65,9 @@ public class ControllerEvcsImpl extends AbstractOpenemsComponent
 	private final Logger log = LoggerFactory.getLogger(ControllerEvcsImpl.class);
 	private final ChargingLowerThanTargetHandler chargingLowerThanTargetHandler;
 	private final Clock clock;
-	private final EnergyScheduleHandler energyScheduleHandler;
-	private final BiConsumer<Value<Status>, Value<Status>> onEvcsStatusChange;
+
+	private EnergyScheduleHandler energyScheduleHandler;
+	private BiConsumer<Value<Status>, Value<Status>> onEvcsStatusChange;
 
 	// Time of last charge power change, used for the hysteresis
 	private Instant lastInitialCharge = Instant.MIN;
@@ -91,16 +101,6 @@ protected ControllerEvcsImpl(Clock clock) {
 		);
 		this.clock = clock;
 		this.chargingLowerThanTargetHandler = new ChargingLowerThanTargetHandler(clock);
-		this.energyScheduleHandler = buildEnergyScheduleHandler(() -> new EshContext(//
-				this.config.evcs_id(), this.config.enabledCharging(), this.config.chargeMode(), this.config.priority(),
-				this.config.defaultChargeMinPower(), this.config.forceChargeMinPower(),
-				this.config.energySessionLimit() > 0 //
-						? this.config.energySessionLimit() //
-						: 30_000 // Apply a default limit
-		));
-		this.onEvcsStatusChange = (oldStatus, newStatus) -> {
-			this.energyScheduleHandler.triggerReschedule(); // Trigger Reschedule on Status change
-		};
 	}
 
 	@Activate
@@ -117,6 +117,16 @@ private void activate(ComponentContext context, Config config) throws OpenemsNam
 		}
 
 		this.config = config;
+
+		this.energyScheduleHandler = config.smartMode() //
+				? buildEshSmart(() -> EshSmartContext.fromConfig(this.config)) //
+				: buildEshManual(() -> EshManualContext.fromConfig(this.config));
+		this.onEvcsStatusChange = (oldStatus, newStatus) -> {
+			// Trigger Reschedule on Status change
+			this.energyScheduleHandler
+					.triggerReschedule("ControllerEvcsImpl::onEvcsStatusChange from " + oldStatus + " to " + newStatus);
+		};
+
 		this.evcs._setChargeMode(config.chargeMode());
 
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "evcs", config.evcs_id())) {
@@ -175,21 +185,44 @@ public void run() throws OpenemsNamedException {
 				this.resetMinMaxChannels();
 				return;
 			}
-			case CHARGING_REJECTED, READY_FOR_CHARGING -> {
-				this.evcs._setMaximumPower(null);
-			}
-			case CHARGING -> {
-			}
+			case CHARGING_REJECTED, READY_FOR_CHARGING //
+				-> this.evcs._setMaximumPower(null);
+			case CHARGING //
+				-> doNothing();
 			}
 		}
 
+		// Read parameters from Config or scheduled Period
+		final SmartMode smartMode;
+		final ChargeMode chargeMode;
+		final Priority priority;
+		final int forceChargePower;
+		final int defaultChargeMinPower;
+		var p = getCurrentPeriod(this.energyScheduleHandler);
+		if (p != null) {
+			this.logInfo(this.log, "ESH: " + p);
+			smartMode = p.state();
+			chargeMode = p.state().chargeMode;
+			priority = p.state().priority;
+			forceChargePower = FORCE_CHARGE_POWER;
+			defaultChargeMinPower = MIN_CHARGE_POWER;
+		} else {
+			smartMode = null;
+			chargeMode = this.config.chargeMode();
+			priority = this.config.priority();
+			forceChargePower = this.config.forceChargeMinPower() * this.evcs.getPhasesAsInt();
+			defaultChargeMinPower = this.config.defaultChargeMinPower();
+		}
+		this.channel(ControllerEvcs.ChannelId.SMART_MODE).setNextValue(smartMode);
+
 		/*
 		 * Calculates the next charging power depending on the charge mode and priority
 		 */
-		var nextChargePower = //
-				switch (this.config.chargeMode()) {
+		var nextChargePower = chargeMode == null //
+				? 0 //
+				: switch (chargeMode) {
 				case EXCESS_POWER -> //
-					switch (this.config.priority()) {
+					switch (priority) {
 					case CAR -> calculateChargePowerFromExcessPower(this.sum, this.evcs);
 					case STORAGE -> {
 						// SoC > 97 % or always, when there is no ESS is available
@@ -200,12 +233,13 @@ public void run() throws OpenemsNamedException {
 						}
 					}
 					};
-				case FORCE_CHARGE -> this.config.forceChargeMinPower() * this.evcs.getPhasesAsInt();
+				case FORCE_CHARGE -> forceChargePower;
 				};
 
-		var nextMinPower = //
-				switch (this.config.chargeMode()) {
-				case EXCESS_POWER -> this.config.defaultChargeMinPower();
+		var nextMinPower = chargeMode == null //
+				? 0 //
+				: switch (chargeMode) {
+				case EXCESS_POWER -> defaultChargeMinPower;
 				case FORCE_CHARGE -> 0;
 				};
 		this.evcs._setMinimumPower(nextMinPower);
@@ -250,7 +284,7 @@ public void run() throws OpenemsNamedException {
 			}
 		}
 
-		if (this.config.chargeMode().equals(ChargeMode.EXCESS_POWER)) {
+		if (chargeMode == ChargeMode.EXCESS_POWER) {
 			// Apply hysteresis
 			nextChargePower = this.applyHysteresis(nextChargePower);
 		}
@@ -453,78 +487,32 @@ protected void logDebug(Logger log, String message) {
 		}
 	}
 
-	/**
-	 * Builds the {@link EnergyScheduleHandler}.
-	 * 
-	 * <p>
-	 * This is public so that it can be used by the EnergyScheduler integration
-	 * test.
-	 * 
-	 * @param context a supplier for the configured {@link EshContext}
-	 * @return a {@link EnergyScheduleHandler}
-	 */
-	public static EnergyScheduleHandler buildEnergyScheduleHandler(Supplier<EshContext> context) {
-		return EnergyScheduleHandler.of(//
-				simContext -> context.get(), //
-				(simContext, period, energyFlow, ctrlContext) -> {
-					final var evcsGlobal = simContext.global.evcss().get(ctrlContext.evcsId);
-					final var evcsOne = simContext.evcss.get(ctrlContext.evcsId);
-					if (!ctrlContext.enabledCharging || evcsGlobal == null || evcsOne == null) {
-						return;
-					}
-					switch (evcsGlobal.status()) {
-					case CHARGING:
-					case READY_FOR_CHARGING:
-						break;
-					case CHARGING_REJECTED:
-					case ENERGY_LIMIT_REACHED:
-					case ERROR:
-					case NOT_READY_FOR_CHARGING:
-					case STARTING:
-					case UNDEFINED:
-						return;
-					}
-
-					// Evaluate Charge-Energy per mode
-					final var chargeEnergy = switch (ctrlContext.chargeMode) {
-					case EXCESS_POWER //
-						-> switch (ctrlContext.priority) {
-						case CAR //
-							-> toEnergy(//
-									max(ctrlContext.defaultChargeMinPower,
-											energyFlow.production - energyFlow.unmanagedConsumption));
-						case STORAGE -> 0; // TODO not implemented
-						};
-					case FORCE_CHARGE //
-						-> toEnergy(ctrlContext.forceChargeMinPower);
-					};
-
-					if (chargeEnergy <= 0) {
-						return; // stop early
-					}
-
-					// Apply Session Limit
-					final int limitedChargeEnergy;
-					if (ctrlContext.energySessionLimit > 0) {
-						limitedChargeEnergy = min(chargeEnergy,
-								max(0, ctrlContext.energySessionLimit - evcsOne.getInitialEnergySession()));
-					} else {
-						limitedChargeEnergy = chargeEnergy;
-					}
-
-					if (limitedChargeEnergy > 0) {
-						energyFlow.addConsumption(limitedChargeEnergy);
-						evcsOne.calculateInitialEnergySession(limitedChargeEnergy);
-					}
-				});
+	@Override
+	public void buildJsonApiRoutes(JsonApiBuilder builder) {
+		builder.handleRequest(GetScheduleRequest.METHOD, call -> GetScheduleResponse.from(call.getRequest().getId(), //
+				this.energyScheduleHandler));
 	}
 
-	public static record EshContext(String evcsId, boolean enabledCharging, ChargeMode chargeMode, Priority priority,
-			int defaultChargeMinPower, int forceChargeMinPower, int energySessionLimit) {
+	@Override
+	public String debugLog() {
+		var p = getCurrentPeriod(this.energyScheduleHandler);
+		if (p == null) {
+			return null;
+		}
+		return p.state().name();
 	}
 
 	@Override
 	public EnergyScheduleHandler getEnergyScheduleHandler() {
 		return this.energyScheduleHandler;
 	}
+
+	private static Period<SmartMode, ?> getCurrentPeriod(EnergyScheduleHandler esh) {
+		if (esh == null || esh instanceof EnergyScheduleHandler.WithOnlyOneState<?>) {
+			return null;
+		}
+		@SuppressWarnings("unchecked")
+		var e = (EnergyScheduleHandler.WithDifferentStates<SmartMode, ?>) esh;
+		return e.getCurrentPeriod();
+	}
 }
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
new file mode 100644
index 00000000000..ab9fcbf39b9
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
@@ -0,0 +1,391 @@
+package io.openems.edge.controller.evcs;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
+import static io.openems.common.utils.JsonUtils.getAsEnum;
+import static io.openems.common.utils.JsonUtils.getAsJsonArray;
+import static io.openems.common.utils.JsonUtils.getAsJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsLocalDateTime;
+import static io.openems.common.utils.JsonUtils.getAsString;
+import static io.openems.common.utils.JsonUtils.getAsUUID;
+import static io.openems.common.utils.JsonUtils.getAsZonedDateTime;
+import static io.openems.common.utils.JsonUtils.stream;
+import static io.openems.common.utils.JsonUtils.toJsonArray;
+import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
+import static java.time.DayOfWeek.FRIDAY;
+import static java.time.DayOfWeek.MONDAY;
+import static java.time.DayOfWeek.SATURDAY;
+import static java.time.DayOfWeek.SUNDAY;
+import static java.time.DayOfWeek.THURSDAY;
+import static java.time.DayOfWeek.TUESDAY;
+import static java.time.DayOfWeek.WEDNESDAY;
+import static java.time.format.DateTimeFormatter.ISO_INSTANT;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+import static java.time.temporal.ChronoField.NANO_OF_DAY;
+import static java.time.temporal.TemporalAdjusters.nextOrSame;
+import static java.util.Arrays.stream;
+import static java.util.UUID.randomUUID;
+
+import java.time.DayOfWeek;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.Ordering;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.function.ThrowingFunction;
+import io.openems.common.utils.JsonUtils;
+
+/**
+ * This implementation is based on RFC 8984 "JSCalendar: A JSON Representation
+ * of Calendar Data".
+ * 
+ * <p>
+ * 
+ * @link <a href=
+ *       "https://www.rfc-editor.org/rfc/rfc8984.html">https://www.rfc-editor.org/rfc/rfc8984.html</a>
+ */
+// CHECKSTYLE:OFF
+public class JSCalendar<PAYLOAD> {
+	// CHECKSTYLE:ON
+
+	public static record Task<PAYLOAD>(UUID uid, ZonedDateTime updated, LocalDateTime start,
+			ImmutableList<RecurrenceRule> recurrenceRules, PAYLOAD payload) {
+
+		/**
+		 * Parse a List of {@link Task}s from a {@link JsonArray}.
+		 * 
+		 * @param <PAYLOAD>     the type of the Payload
+		 * @param json          the {@link JsonArray}
+		 * @param payloadParser a parser for a Payload
+		 * @return the List of {@link Task}s
+		 * @throws OpenemsNamedException on error
+		 */
+		public static <PAYLOAD> ImmutableList<Task<PAYLOAD>> fromJson(JsonArray json,
+				ThrowingFunction<JsonObject, PAYLOAD, OpenemsNamedException> payloadParser)
+				throws OpenemsNamedException {
+			return stream(json) //
+					.map(j -> {
+						try {
+							return fromJson(JsonUtils.getAsJsonObject(j), payloadParser);
+						} catch (OpenemsNamedException e) {
+							e.printStackTrace();
+							throw new NoSuchElementException(e.getMessage());
+						}
+					}) //
+					.collect(toImmutableList());
+		}
+
+		/**
+		 * Parse a {@link Task} from a {@link JsonObject}.
+		 * 
+		 * @param <PAYLOAD>     the type of the Payload
+		 * @param json          the {@link JsonObject}
+		 * @param payloadParser a parser for a Payload
+		 * @return the {@link Task}
+		 * @throws OpenemsNamedException on error
+		 */
+		public static <PAYLOAD> Task<PAYLOAD> fromJson(JsonObject json, Function<JsonObject, PAYLOAD> payloadParser)
+				throws OpenemsNamedException {
+			return fromJson(json, new ThrowingFunction<JsonObject, PAYLOAD, OpenemsNamedException>() {
+
+				@Override
+				public PAYLOAD apply(JsonObject json) throws OpenemsNamedException {
+					return payloadParser.apply(json);
+				}
+			});
+		}
+
+		/**
+		 * Parse a {@link Task} from a {@link JsonObject}.
+		 * 
+		 * @param <PAYLOAD>     the type of the Payload
+		 * @param json          the {@link JsonObject}
+		 * @param payloadParser a parser for a Payload
+		 * @return the {@link Task}
+		 * @throws OpenemsNamedException on error
+		 */
+		public static <PAYLOAD> Task<PAYLOAD> fromJson(JsonObject json,
+				ThrowingFunction<JsonObject, PAYLOAD, OpenemsNamedException> payloadParser)
+				throws OpenemsNamedException {
+			var type = getAsString(json, "@type");
+			if (!type.equalsIgnoreCase("Task")) {
+				throw new OpenemsException("This is not a 'Task': " + type);
+			}
+			try {
+				var uid = getAsUUID(json, "uid");
+				var updated = getAsZonedDateTime(json, "updated");
+				var start = getAsLocalDateTime(json, "start");
+				var recurrenceRules = stream(getAsJsonArray(json, "recurrenceRules")) //
+						.map(r -> {
+							try {
+								return RecurrenceRule.fromJson(r);
+							} catch (OpenemsNamedException e) {
+								e.printStackTrace();
+								throw new NoSuchElementException(e.getMessage());
+							}
+						}) //
+						.collect(toImmutableList());
+				var payload = payloadParser.apply(getAsJsonObject(json, "payload"));
+				return new Task<PAYLOAD>(uid, updated, start, recurrenceRules, payload);
+
+			} catch (NoSuchElementException e) {
+				throw new OpenemsException("NoSuchElementException: " + e.getMessage());
+			}
+		}
+
+		public static class Builder<PAYLOAD> {
+			private final UUID uid;
+			private final ZonedDateTime updated;
+
+			private LocalDateTime start = null;
+			private ImmutableList.Builder<RecurrenceRule> recurrenceRules = ImmutableList.builder();
+			private PAYLOAD payload = null;
+
+			protected Builder() {
+				this(randomUUID(), ZonedDateTime.now());
+			}
+
+			protected Builder(UUID uid, ZonedDateTime updated) {
+				this.uid = uid;
+				this.updated = updated;
+			}
+
+			public Builder<PAYLOAD> setStart(LocalDateTime start) {
+				this.start = start;
+				return this;
+			}
+
+			protected Builder<PAYLOAD> setStart(String start) {
+				this.setStart(LocalDateTime.parse(start));
+				return this;
+			}
+
+			/**
+			 * Adds a {@link RecurrenceRule}.
+			 * 
+			 * @param recurrenceRule the {@link RecurrenceRule}
+			 * @return myself
+			 */
+			public Builder<PAYLOAD> addRecurrenceRule(RecurrenceRule recurrenceRule) {
+				this.recurrenceRules.add(recurrenceRule);
+				return this;
+			}
+
+			/**
+			 * Adds a {@link RecurrenceRule}.
+			 * 
+			 * @param consumer a RecurrenceRule Builder
+			 * @return myself
+			 */
+			public Builder<PAYLOAD> addRecurrenceRule(Consumer<RecurrenceRule.Builder> consumer) {
+				var builder = RecurrenceRule.create();
+				consumer.accept(builder);
+				this.recurrenceRules.add(builder.build());
+				return this;
+			}
+
+			public Builder<PAYLOAD> setPayload(PAYLOAD payload) {
+				this.payload = payload;
+				return this;
+			}
+
+			public Task<PAYLOAD> build() {
+				return new Task<PAYLOAD>(this.uid, this.updated, this.start, this.recurrenceRules.build(),
+						this.payload);
+			}
+		}
+
+		/**
+		 * Create a {@link CalendarEvent} {@link Builder}.
+		 * 
+		 * @param <PAYLOAD> the type of the Payload
+		 * @return a {@link Builder}
+		 */
+		public static <PAYLOAD> Builder<PAYLOAD> create() {
+			return new Builder<PAYLOAD>();
+		}
+
+		/**
+		 * Convert to {@link JsonObject}.
+		 * 
+		 * @param payloadConverter a converter for a Payload
+		 * @return a {@link JsonObject}
+		 */
+		public JsonObject toJson(Function<PAYLOAD, JsonObject> payloadConverter) {
+			var j = JsonUtils.buildJsonObject() //
+					.addProperty("@type", "Task") //
+					.addProperty("uid", this.uid.toString()) //
+					.addProperty("updated", this.updated.format(ISO_INSTANT));
+			if (this.start != null) {
+				j.addProperty("start", this.start.format(ISO_LOCAL_DATE_TIME));
+			}
+			if (!this.recurrenceRules.isEmpty()) {
+				j.add("recurrenceRules", this.recurrenceRules.stream() //
+						.map(RecurrenceRule::toJson) //
+						.collect(toJsonArray()));
+			}
+			if (this.payload != null) {
+				j.add("payload", payloadConverter.apply(this.payload));
+			}
+			return j.build();
+		}
+
+		/**
+		 * Gets the next occurence of the {@link Task} at or after a date.
+		 * 
+		 * @param from the from timestamp
+		 * @return a {@link ZonedDateTime}
+		 */
+		public ZonedDateTime getNextOccurence(ZonedDateTime from) {
+			var start = this.start.atZone(from.getZone());
+			return this.recurrenceRules.stream() //
+					.map(rr -> rr.getNextOccurence(from.isBefore(start) ? start : from, start)) //
+					.min((o1, o2) -> o1.toInstant().compareTo(o2.toInstant())) //
+					.orElse(null);
+		}
+	}
+
+	public enum RecurrenceFrequency {
+		// SECONDLY("secondly"),
+		// MINUTELY("minutely"),
+		// HOURLY("hourly"),
+		DAILY("daily"), //
+		WEEKLY("weekly"), //
+		MONTHLY("monthly"), //
+		YEARLY("yearly");
+
+		public final String name;
+
+		private RecurrenceFrequency(String name) {
+			this.name = name;
+		}
+	}
+
+	public record RecurrenceRule(RecurrenceFrequency frequency, ImmutableSortedSet<DayOfWeek> byDay) {
+
+		/**
+		 * Parse a {@link RecurrenceRule} from a {@link JsonObject}.
+		 * 
+		 * @param json the {@link JsonObject}
+		 * @return the {@link RecurrenceRule}
+		 * @throws OpenemsNamedException on error
+		 */
+		public static RecurrenceRule fromJson(JsonElement json) throws OpenemsNamedException, NoSuchElementException {
+			var frequency = getAsEnum(RecurrenceFrequency.class, json, "frequency");
+			var byDay = stream(getAsJsonArray(json, "byDay")) //
+					.map(j -> switch (JsonUtils.getAsOptionalString(j).orElseThrow()) {
+					case "mo" -> MONDAY;
+					case "tu" -> TUESDAY;
+					case "we" -> WEDNESDAY;
+					case "th" -> THURSDAY;
+					case "fr" -> FRIDAY;
+					case "sa" -> SATURDAY;
+					case "su" -> SUNDAY;
+					default -> throw new NoSuchElementException("");
+					}) //
+					.collect(toImmutableSortedSet(Ordering.natural()));
+			return new RecurrenceRule(frequency, byDay);
+		}
+
+		public static class Builder {
+			private RecurrenceFrequency frequency;
+			private ImmutableSortedSet.Builder<DayOfWeek> byDay = ImmutableSortedSet.naturalOrder();
+
+			public Builder() {
+			}
+
+			public Builder setFrequency(RecurrenceFrequency frequency) {
+				this.frequency = frequency;
+				return this;
+			}
+
+			/**
+			 * Adds a `byDay`rule.
+			 * 
+			 * @param byDay the {@link DayOfWeek}s
+			 * @return myself
+			 */
+			public Builder addByDay(DayOfWeek... byDay) {
+				stream(byDay).forEach(this.byDay::add);
+				return this;
+			}
+
+			public RecurrenceRule build() {
+				return new RecurrenceRule(this.frequency, this.byDay.build());
+			}
+		}
+
+		/**
+		 * Create a {@link RecurrenceRule} {@link Builder}.
+		 * 
+		 * @return a {@link Builder}
+		 */
+		public static Builder create() {
+			return new Builder();
+		}
+
+		/**
+		 * Gets the next occurence of the {@link RecurrenceRule} at or after a date.
+		 * 
+		 * @param from  the from date
+		 * @param start the start timestamp of the {@link Task}
+		 * @return a {@link ZonedDateTime}
+		 */
+		public ZonedDateTime getNextOccurence(ZonedDateTime from, ZonedDateTime start) {
+			if (this.frequency == WEEKLY) {
+				if (!this.byDay.isEmpty()) {
+					var startTime = start.toLocalTime();
+					var nextByDay = this.byDay.ceiling(from.toLocalTime().isAfter(startTime) //
+							? from.getDayOfWeek().plus(1) // next day
+							: from.getDayOfWeek()); // same day
+					if (nextByDay == null) {
+						nextByDay = this.byDay.first();
+					}
+					return from //
+							.with(nextOrSame(nextByDay)) //
+							.with(NANO_OF_DAY, startTime.toNanoOfDay());
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * Convert to {@link JsonObject}.
+		 * 
+		 * @return a {@link JsonObject}
+		 */
+		public JsonObject toJson() {
+			var j = JsonUtils.buildJsonObject();
+			if (this.frequency != null) {
+				j.addProperty("frequency", this.frequency.name);
+			}
+			if (!this.byDay.isEmpty()) {
+				j.add("byDay", this.byDay.stream() //
+						.map(d -> switch (d) {
+						case MONDAY -> "mo";
+						case TUESDAY -> "tu";
+						case WEDNESDAY -> "we";
+						case THURSDAY -> "th";
+						case FRIDAY -> "fr";
+						case SATURDAY -> "sa";
+						case SUNDAY -> "su";
+						}) //
+						.map(JsonUtils::toJson) //
+						.collect(toJsonArray()));
+			}
+			return j.build();
+		}
+	}
+
+}
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/SmartMode.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/SmartMode.java
new file mode 100644
index 00000000000..c8f82efa313
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/SmartMode.java
@@ -0,0 +1,42 @@
+package io.openems.edge.controller.evcs;
+
+import io.openems.common.types.OptionsEnum;
+import io.openems.edge.evcs.api.ChargeMode;
+
+public enum SmartMode implements OptionsEnum {
+	ZERO(0, "Zero", null, null), //
+	// TODO SURPLUS_PV without min-charge power and only if there is predicted
+	// surplus power
+	// SURPLUS_PV(1, "Surplus PV with Min charge power", ChargeMode.EXCESS_POWER,
+	// Priority.CAR), //
+	FORCE(3, "Force charge", ChargeMode.FORCE_CHARGE, null) //
+	;
+
+	private final int value;
+	private final String name;
+
+	public final ChargeMode chargeMode;
+	public final Priority priority;
+
+	private SmartMode(int value, String name, ChargeMode chargeMode, Priority priority) {
+		this.value = value;
+		this.name = name;
+		this.chargeMode = chargeMode;
+		this.priority = priority;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return ZERO;
+	}
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
new file mode 100644
index 00000000000..a426a0f3186
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
@@ -0,0 +1,271 @@
+package io.openems.edge.controller.evcs;
+
+import static io.openems.common.utils.FunctionUtils.doNothing;
+import static io.openems.common.utils.JsonUtils.getAsInt;
+import static io.openems.common.utils.JsonUtils.parseToJsonArray;
+import static io.openems.edge.energy.api.EnergyUtils.toEnergy;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
+import java.time.Clock;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.function.Supplier;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.math.Quantiles;
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.edge.controller.evcs.JSCalendar.Task;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshManualContext;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
+import io.openems.edge.energy.api.EnergyScheduleHandler;
+import io.openems.edge.energy.api.EnergyScheduleHandler.WithDifferentStates.InitialPopulation;
+import io.openems.edge.energy.api.simulation.EnergyFlow;
+import io.openems.edge.energy.api.simulation.OneSimulationContext;
+import io.openems.edge.energy.api.simulation.OneSimulationContext.Evcs;
+import io.openems.edge.evcs.api.ChargeMode;
+
+public final class Utils {
+
+	protected static final int FORCE_CHARGE_POWER = 11000; // [W]
+	protected static final int MIN_CHARGE_POWER = 4600; // [W]
+
+	private static int TARGET_HOUR = 7;
+
+	private Utils() {
+	}
+
+	/**
+	 * Builds an {@link EnergyScheduleHandler} for SMART mode.
+	 * 
+	 * @param context a supplier for {@link EshSmartContext}
+	 * @return the {@link EnergyScheduleHandler.WithDifferentStates}
+	 */
+	public static EnergyScheduleHandler.WithDifferentStates<SmartMode, EshSmartContext> buildEshSmart(
+			Supplier<EshSmartContext> context) {
+		return EnergyScheduleHandler.WithDifferentStates.<SmartMode, EshSmartContext>create() //
+				.setDefaultState(SmartMode.ZERO) //
+				// TODO if there is no surplus power, SmartMode.SURPLUS_PV should not be an
+				// option
+				.setAvailableStates(() -> SmartMode.values()) //
+				.setContextFunction(simContext -> context.get()) //
+				.setInitialPopulationsFunction(gsc -> {
+					// Sets initial population to FORCE charge during cheapest periods
+					var targetDateTime = getTargetDateTime(gsc.startTime(), TARGET_HOUR);
+					var threshold = Quantiles.percentiles() //
+							.index(5) //
+							.compute(gsc.periods().stream() //
+									.takeWhile(p -> !p.time().isAfter(targetDateTime)) //
+									.mapToDouble(p -> p.price()) //
+									.toArray());
+					var times = gsc.periods().stream() //
+							.filter(p -> p.price() < threshold) //
+							.map(p -> p.time()) //
+							.toList();
+					return List.of(//
+							InitialPopulation.of(times, SmartMode.FORCE));
+				}) //
+				.setSimulator((simContext, period, energyFlow, ctrlContext, mode) -> {
+					final var evcsOne = simContext.evcss.get(ctrlContext.evcsId);
+					switch (mode) {
+					case FORCE -> applyChargeEnergy(energyFlow, ctrlContext, evcsOne, mode.chargeMode, mode.priority,
+							MIN_CHARGE_POWER, FORCE_CHARGE_POWER);
+					case ZERO -> doNothing();
+					}
+
+					if (period.time().isAfter(getTargetDateTime(simContext.global.startTime(), TARGET_HOUR))
+							&& evcsOne.getInitialEnergySession() < ctrlContext.energySessionLimit) {
+						// TODO apply JSCalendar SmartConfig
+						// Charged less than EnergySessionLimit till next 7am.
+						return 1_000_000; // add high cost
+					}
+					return 0.;
+				}) //
+				.setPostProcessor(Utils::postprocessSimulatorState) //
+				.build();
+	}
+
+	/**
+	 * Builds an {@link EnergyScheduleHandler} for MANUL mode.
+	 * 
+	 * @param context a supplier for {@link EshManualContext}
+	 * @return the {@link EnergyScheduleHandler.WithOnlyOneState}
+	 */
+	public static EnergyScheduleHandler.WithOnlyOneState<EshManualContext> buildEshManual(
+			Supplier<EshManualContext> context) {
+		return EnergyScheduleHandler.WithOnlyOneState.<EshManualContext>create() //
+				.setContextFunction(simContext -> context.get()) //
+				.setSimulator((simContext, period, energyFlow, ctrlContext) -> {
+					final var evcsGlobal = simContext.global.evcss().get(ctrlContext.evcsId);
+					if (!ctrlContext.enabledCharging || evcsGlobal == null) {
+						return;
+					}
+					switch (evcsGlobal.status()) {
+					case CHARGING:
+					case READY_FOR_CHARGING:
+						break;
+					case CHARGING_REJECTED:
+					case ENERGY_LIMIT_REACHED:
+					case ERROR:
+					case NOT_READY_FOR_CHARGING:
+					case STARTING:
+					case UNDEFINED:
+						return;
+					}
+
+					final var evcsOne = simContext.evcss.get(ctrlContext.evcsId);
+					applyChargeEnergy(energyFlow, ctrlContext, evcsOne, ctrlContext.chargeMode, ctrlContext.priority,
+							ctrlContext.defaultChargeMinPower, ctrlContext.forceChargeMinPower);
+				}) //
+				.build();
+	}
+
+	public static sealed interface EshContext {
+
+		/**
+		 * Gets the configured Energy-Session-Limit.
+		 * 
+		 * @return the value
+		 */
+		public int energySessionLimit();
+
+		public static record EshManualContext(boolean enabledCharging, ChargeMode chargeMode, int forceChargeMinPower,
+				int defaultChargeMinPower, Priority priority, String evcsId, int energySessionLimit)
+				implements EshContext {
+
+			/**
+			 * Factory for {@link EshManualContext} from {@link Config}.
+			 * 
+			 * @param config the {@link Config}
+			 * @return the {@link EshManualContext}
+			 */
+			public static EshManualContext fromConfig(Config config) {
+				return new EshManualContext(config.enabledCharging(), config.chargeMode(), config.forceChargeMinPower(),
+						config.defaultChargeMinPower(), config.priority(), config.evcs_id(),
+						config.energySessionLimit());
+			}
+		}
+
+		public static record EshSmartContext(String evcsId, int energySessionLimit /* TODO required */,
+				ImmutableList<JSCalendar.Task<Payload>> tasks) implements EshContext {
+
+			/**
+			 * Factory for {@link EshSmartContext} from {@link Config}.
+			 * 
+			 * @param config the {@link Config}
+			 * @return the {@link EshSmartContext}
+			 */
+			public static EshSmartContext fromConfig(Config config) {
+				return new EshSmartContext(config.evcs_id(), config.energySessionLimit(),
+						Payload.fromJson(config.smartConfig()));
+			}
+
+			public static record Payload(int energySessionLimit) {
+				/**
+				 * Parses the String configuration to {@link Payload} objects.
+				 * 
+				 * @param smartConfig the configuration
+				 * @return the result
+				 */
+				public static ImmutableList<Task<Payload>> fromJson(String smartConfig) {
+					if (smartConfig == null || smartConfig.isBlank()) {
+						return ImmutableList.of();
+					}
+
+					try {
+						return JSCalendar.Task.<Payload>fromJson(parseToJsonArray(smartConfig), Payload::fromJson);
+					} catch (OpenemsNamedException e) {
+						e.printStackTrace();
+						return ImmutableList.of();
+					}
+				}
+
+				/**
+				 * Parses one {@link JsonObject} to a {@link Payload} object.
+				 * 
+				 * @param j the {@link JsonObject}
+				 * @return the {@link Payload} object
+				 * @throws OpenemsNamedException on error
+				 */
+				public static Payload fromJson(JsonObject j) throws OpenemsNamedException {
+					var sessionEnergy = getAsInt(j, "sessionEnergy");
+					return new Payload(sessionEnergy);
+				}
+			}
+		}
+	}
+
+	protected static ZonedDateTime getTargetDateTime(ZonedDateTime startTime, int hour) {
+		var localTime = startTime.withZoneSameInstant(Clock.systemDefaultZone().getZone());
+		var targetDate = localTime.getHour() > hour //
+				? startTime.plusDays(1) //
+				: startTime;
+		return targetDate.truncatedTo(ChronoUnit.DAYS).withHour(hour);
+	}
+
+	private static void applyChargeEnergy(EnergyFlow.Model energyFlow, EshContext ctrlContext, Evcs evcsOne,
+			ChargeMode chargeMode, Priority priority, int chargeMinPower, int forceChargePower) {
+		if (evcsOne == null) {
+			return;
+		}
+
+		// Evaluate Charge-Energy per mode
+		final var chargeEnergy = switch (chargeMode) {
+		case EXCESS_POWER //
+			-> switch (priority) {
+			case CAR //
+				-> toEnergy(//
+						max(chargeMinPower, energyFlow.production - energyFlow.unmanagedConsumption));
+			case STORAGE -> 0; // TODO not implemented
+			};
+		case FORCE_CHARGE //
+			-> toEnergy(forceChargePower);
+		};
+
+		if (chargeEnergy <= 0) {
+			return; // stop early
+		}
+
+		// Apply Session Limit
+		final int limitedChargeEnergy;
+		if (ctrlContext.energySessionLimit() > 0) {
+			limitedChargeEnergy = min(chargeEnergy,
+					max(0, ctrlContext.energySessionLimit() - evcsOne.getInitialEnergySession()));
+		} else {
+			limitedChargeEnergy = chargeEnergy;
+		}
+
+		if (limitedChargeEnergy > 0) {
+			energyFlow.addConsumption(limitedChargeEnergy);
+			evcsOne.calculateInitialEnergySession(limitedChargeEnergy);
+		}
+	}
+
+	/**
+	 * Post-Process a state of a Period during Simulation, i.e. replace with
+	 * 'better' state with the same behaviour.
+	 * 
+	 * <p>
+	 * NOTE: heavy computation is ok here, because this method is called only at the
+	 * end with the best Schedule.
+	 * 
+	 * @param osc     the {@link OneSimulationContext}
+	 * @param ef      the {@link EnergyFlow} for the state
+	 * @param context the {@link EshContext}
+	 * @param mode    the initial {@link SmartMode}
+	 * @return the new state
+	 */
+	protected static SmartMode postprocessSimulatorState(OneSimulationContext osc, EnergyFlow ef, EshContext context,
+			SmartMode mode) {
+		if (mode == SmartMode.ZERO) {
+			return mode;
+		}
+		if (ef.getManagedCons() == 0) { // TODO this works only reliably with one ControllerEvcs
+			return SmartMode.ZERO;
+		}
+		return mode;
+	}
+}
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleRequest.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleRequest.java
new file mode 100644
index 00000000000..6113d81b21e
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleRequest.java
@@ -0,0 +1,49 @@
+package io.openems.edge.controller.evcs.jsonrpc;
+
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.jsonrpc.base.JsonrpcRequest;
+
+/**
+ * Represents a JSON-RPC Request for 'getSchedule'.
+ *
+ * <pre>
+ * {
+ *   "jsonrpc": "2.0",
+ *   "id": "UUID",
+ *   "method": "getSchedule",
+ *   "params": {}
+ * }
+ * </pre>
+ */
+public class GetScheduleRequest extends JsonrpcRequest {
+
+	public static final String METHOD = "getSchedule";
+
+	/**
+	 * Create {@link GetScheduleRequest} from a template {@link JsonrpcRequest}.
+	 *
+	 * @param r the template {@link JsonrpcRequest}
+	 * @return the {@link GetScheduleRequest}
+	 * @throws OpenemsNamedException on parse error
+	 */
+	public static GetScheduleRequest from(JsonrpcRequest r) throws OpenemsException {
+		return new GetScheduleRequest(r);
+	}
+
+	public GetScheduleRequest() {
+		super(METHOD);
+	}
+
+	private GetScheduleRequest(JsonrpcRequest request) {
+		super(request, METHOD);
+	}
+
+	@Override
+	public JsonObject getParams() {
+		return new JsonObject();
+	}
+
+}
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleResponse.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleResponse.java
new file mode 100644
index 00000000000..3aebf1e7e0a
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/GetScheduleResponse.java
@@ -0,0 +1,136 @@
+package io.openems.edge.controller.evcs.jsonrpc;
+
+import static io.openems.common.utils.JsonUtils.buildJsonObject;
+import static io.openems.common.utils.JsonUtils.toJsonArray;
+import static io.openems.common.utils.StringUtils.toShortString;
+
+import java.time.Clock;
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableSortedMap;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+
+import io.openems.common.jsonrpc.base.JsonrpcResponseSuccess;
+import io.openems.edge.controller.evcs.SmartMode;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
+import io.openems.edge.energy.api.EnergyScheduleHandler;
+import io.openems.edge.energy.api.EnergyScheduleHandler.WithDifferentStates.Period;
+
+/**
+ * Represents a JSON-RPC Response for 'getSchedule'.
+ *
+ * <pre>
+ * {
+ *   "jsonrpc": "2.0",
+ *   "id": "UUID",
+ *   "result": {
+ *     'schedule': [{
+ *      'timestamp':...,
+ *      'price':...,
+ *      'state':...
+ *     }]
+ *   }
+ * }
+ * </pre>
+ */
+public class GetScheduleResponse extends JsonrpcResponseSuccess {
+
+	private static final Logger LOG = LoggerFactory.getLogger(GetScheduleResponse.class);
+
+	private final JsonObject result;
+
+	public GetScheduleResponse(UUID id, JsonObject result) {
+		super(id);
+		this.result = result;
+	}
+
+	@Override
+	public JsonObject getResult() {
+		return this.result;
+	}
+
+	/**
+	 * Builds a {@link GetScheduleResponse} with last three hours data and current
+	 * Schedule.
+	 * 
+	 * @param requestId             the JSON-RPC request-id
+	 * @param energyScheduleHandler the {@link EnergyScheduleHandler}
+	 * @return the {@link GetScheduleResponse}
+	 */
+	public static GetScheduleResponse from(UUID requestId, EnergyScheduleHandler energyScheduleHandler) {
+		LOG.info("OPTIMIZER JSONRPC start");
+		if (energyScheduleHandler == null
+				|| energyScheduleHandler instanceof EnergyScheduleHandler.WithOnlyOneState<?>) {
+			return null;
+		}
+		@SuppressWarnings("unchecked")
+		var esh = (EnergyScheduleHandler.WithDifferentStates<SmartMode, EshSmartContext>) energyScheduleHandler;
+		final var schedule = esh.getSchedule();
+		final JsonArray result;
+		if (schedule.isEmpty()) {
+			result = new JsonArray();
+		} else {
+			final var historic = Stream.<JsonObject>of(); // TODO
+			final var future = fromSchedule(schedule);
+			result = Stream.concat(historic, future) //
+					.collect(toJsonArray());
+		}
+		LOG.info("OPTIMIZER JSONRPC finished. " + toShortString(result, 100));
+
+		return new GetScheduleResponse(requestId, //
+				buildJsonObject() //
+						.add("schedule", result) //
+						.build());
+	}
+
+	/**
+	 * Converts the Schedule to a {@link Stream} of {@link JsonObject}s suitable for
+	 * a {@link GetScheduleResponse}.
+	 * 
+	 * @param schedule the {@link EnergyScheduleHandler} schedule
+	 * @return {@link Stream} of {@link JsonObject}s
+	 */
+	protected static Stream<JsonObject> fromSchedule(
+			ImmutableSortedMap<ZonedDateTime, Period<SmartMode, EshSmartContext>> schedule) {
+		return schedule.entrySet().stream() //
+				.map(e -> {
+					var p = e.getValue();
+
+					return buildJsonObject() //
+							.addProperty("timestamp", e.getKey()) //
+							.addProperty("price", p.price()) //
+							.addProperty("state", p.state().getValue()) //
+							.build();
+				});
+	}
+
+	/**
+	 * Creates an empty default Schedule in case no Schedule is available.
+	 * 
+	 * @param clock       the {@link Clock}
+	 * @param defaultMode the default {@link SmartMode}
+	 * @return {@link Stream} of {@link JsonObject}s
+	 */
+	protected static Stream<JsonObject> empty(Clock clock, SmartMode defaultMode) {
+		final var now = ZonedDateTime.now(clock);
+		final var numberOfPeriods = 96;
+
+		return IntStream.range(0, numberOfPeriods) //
+				.mapToObj(i -> {
+					return buildJsonObject() //
+							.addProperty("timestamp", now.plusMinutes(i * 15)) //
+							.add("price", JsonNull.INSTANCE) //
+							.addProperty("state", defaultMode.getValue()) //
+							.build();
+				});
+	}
+
+}
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/package-info.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/package-info.java
new file mode 100644
index 00000000000..5e86ab9a93c
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/jsonrpc/package-info.java
@@ -0,0 +1,3 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.bundle.Export
+package io.openems.edge.controller.evcs.jsonrpc;
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/package-info.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/package-info.java
new file mode 100644
index 00000000000..310c93b9fb0
--- /dev/null
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/package-info.java
@@ -0,0 +1,3 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.bundle.Export
+package io.openems.edge.controller.evcs;
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
index e51964f0f59..2adacb94a33 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
@@ -23,7 +23,10 @@
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
 import io.openems.edge.controller.test.ControllerTest;
+import io.openems.edge.energy.api.EnergyScheduleHandler;
+import io.openems.edge.energy.api.simulation.GlobalSimulationsContext;
 import io.openems.edge.evcs.api.Evcs;
 import io.openems.edge.evcs.api.Status;
 import io.openems.edge.evcs.test.DummyManagedEvcs;
@@ -328,4 +331,44 @@ public void hysteresisTest() throws Exception {
 						.output(AWAITING_HYSTERESIS, false)) //
 				.deactivate();
 	}
+
+	@Test
+	public void smartTest() throws Exception {
+		final var clock = createDummyClock();
+		final var sut = new ControllerEvcsImpl(clock);
+		new ControllerTest(sut) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("sum", new DummySum()) //
+				.addReference("evcs", DummyManagedEvcs.ofDisabled("evcs0")) //
+				.activate(MyConfig.create() //
+						.setId("ctrlEvcs0") //
+						.setEvcsId("evcs0") //
+						.setSmartMode(true) //
+						.setSmartConfig("""
+								[{
+								  "@type": "Task",
+								  "uid": "00000000-0000-0000-0000-000000000000",
+								  "updated": "2020-01-01T00:00:00Z",
+								  "start": "2024-06-17T00:00:00",
+								  "recurrenceRules": [
+								    {
+								      "frequency": "weekly",
+								      "byDay": [
+								        "sa",
+								        "su"
+								      ]
+								    }
+								  ],
+								  "payload": {
+								    "sessionEnergy": 10001
+								  }
+								}]""") //
+						.build()) //
+				.next(new TestCase()) //
+				.deactivate();
+		@SuppressWarnings("unchecked")
+		var esh = (EnergyScheduleHandler.WithDifferentStates<SmartMode, EshSmartContext>) sut
+				.getEnergyScheduleHandler();
+		esh.initialize(new GlobalSimulationsContext(clock, null, null, null, null, null, null, null, null));
+	}
 }
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
new file mode 100644
index 00000000000..defe0bf80cb
--- /dev/null
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
@@ -0,0 +1,133 @@
+package io.openems.edge.controller.evcs;
+
+import static io.openems.common.utils.JsonUtils.buildJsonObject;
+import static io.openems.common.utils.JsonUtils.prettyToString;
+import static io.openems.common.utils.UuidUtils.getNilUuid;
+import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
+import static java.time.DayOfWeek.FRIDAY;
+import static java.time.DayOfWeek.MONDAY;
+import static java.time.DayOfWeek.SATURDAY;
+import static java.time.DayOfWeek.SUNDAY;
+import static java.time.DayOfWeek.THURSDAY;
+import static java.time.DayOfWeek.TUESDAY;
+import static java.time.DayOfWeek.WEDNESDAY;
+import static java.util.function.Function.identity;
+import static org.junit.Assert.assertEquals;
+
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+
+//CHECKSTYLE:OFF
+public class JSCalendarTest {
+	// CHECKSTYLE:ON
+
+	@Test
+	public void testWeekday() throws OpenemsNamedException {
+		var clock = createDummyClock();
+		var sut = new JSCalendar.Task.Builder<JsonObject>(getNilUuid(), ZonedDateTime.now(clock)) //
+				.setStart("2024-06-17T07:00:00") //
+				.addRecurrenceRule(b -> b //
+						.setFrequency(WEEKLY) //
+						.addByDay(MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY)) //
+				.setPayload(buildJsonObject() //
+						.addProperty("sessionEnergy", 10000) //
+						.build()) //
+				.build();
+		assertEquals("""
+				{
+				  "@type": "Task",
+				  "uid": "00000000-0000-0000-0000-000000000000",
+				  "updated": "2020-01-01T00:00:00Z",
+				  "start": "2024-06-17T07:00:00",
+				  "recurrenceRules": [
+				    {
+				      "frequency": "weekly",
+				      "byDay": [
+				        "mo",
+				        "tu",
+				        "we",
+				        "th",
+				        "fr"
+				      ]
+				    }
+				  ],
+				  "payload": {
+				    "sessionEnergy": 10000
+				  }
+				}""", prettyToString(sut.toJson(identity())));
+
+		var next = sut.getNextOccurence(ZonedDateTime.now(clock));
+		assertEquals("2024-06-17T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-18T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-19T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-20T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-21T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1)); // next week
+		assertEquals("2024-06-24T07:00Z", next.toString());
+		next = sut.getNextOccurence(next);
+		assertEquals("2024-06-24T07:00Z", next.toString()); // same
+
+		// Parse JSON
+		var fromJson = JSCalendar.Task.fromJson(sut.toJson(identity()), identity());
+		assertEquals(sut.toJson(identity()), fromJson.toJson(identity()));
+	}
+
+	@Test
+	public void testWeekend() throws OpenemsNamedException {
+		var clock = createDummyClock();
+		var sut = new JSCalendar.Task.Builder<JsonObject>(getNilUuid(), ZonedDateTime.now(clock)) //
+				.setStart("2024-06-17T00:00:00") //
+				.addRecurrenceRule(b -> b //
+						.setFrequency(WEEKLY) //
+						.addByDay(SATURDAY, SUNDAY)) //
+				.setPayload(buildJsonObject() //
+						.addProperty("sessionEnergy", 10001) //
+						.build()) //
+				.build();
+		assertEquals("""
+				{
+				  "@type": "Task",
+				  "uid": "00000000-0000-0000-0000-000000000000",
+				  "updated": "2020-01-01T00:00:00Z",
+				  "start": "2024-06-17T00:00:00",
+				  "recurrenceRules": [
+				    {
+				      "frequency": "weekly",
+				      "byDay": [
+				        "sa",
+				        "su"
+				      ]
+				    }
+				  ],
+				  "payload": {
+				    "sessionEnergy": 10001
+				  }
+				}""", prettyToString(sut.toJson(identity())));
+
+		var next = sut.getNextOccurence(ZonedDateTime.now(clock));
+		assertEquals("2024-06-22T00:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-23T00:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-29T00:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-06-30T00:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2024-07-06T00:00Z", next.toString());
+
+		// Parse JSON
+		var fromJson = JSCalendar.Task.fromJson(sut.toJson(identity()), identity());
+		assertEquals(sut.toJson(identity()), fromJson.toJson(identity()));
+	}
+
+}
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java
index cf509aca506..38d0462834a 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java
@@ -12,6 +12,8 @@ protected static class Builder {
 		private boolean debugMode = false;
 		private String evcsId = "evcs0";
 		private boolean enabledCharging = true;
+		private boolean smartMode = false;
+		private String smartConfig = "";
 		private ChargeMode chargeMode = ChargeMode.FORCE_CHARGE;
 		private int forceChargeMinPower = 7560;
 		private int defaultChargeMinPower = 0;
@@ -38,6 +40,16 @@ public Builder setDebugMode(boolean debugMode) {
 			return this;
 		}
 
+		public Builder setSmartMode(boolean smartMode) {
+			this.smartMode = smartMode;
+			return this;
+		}
+
+		public Builder setSmartConfig(String smartConfig) {
+			this.smartConfig = smartConfig;
+			return this;
+		}
+
 		public Builder setEvcsId(String evcsId) {
 			this.evcsId = evcsId;
 			return this;
@@ -119,6 +131,16 @@ public boolean enabledCharging() {
 		return this.builder.enabledCharging;
 	}
 
+	@Override
+	public boolean smartMode() {
+		return this.builder.smartMode;
+	}
+
+	@Override
+	public String smartConfig() {
+		return this.builder.smartConfig;
+	}
+
 	@Override
 	public ChargeMode chargeMode() {
 		return this.builder.chargeMode;
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EnergyScheduleHandlerTest.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/UtilsTest.java
similarity index 59%
rename from io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EnergyScheduleHandlerTest.java
rename to io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/UtilsTest.java
index 4873d7289a8..3d9cbd8e36e 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EnergyScheduleHandlerTest.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/UtilsTest.java
@@ -1,11 +1,18 @@
 package io.openems.edge.controller.evcs;
 
+import static io.openems.edge.controller.evcs.Utils.buildEshManual;
+import static io.openems.edge.controller.evcs.Utils.buildEshSmart;
 import static org.junit.Assert.assertEquals;
 
+import java.util.function.Supplier;
+
 import org.apache.commons.math3.optim.nonlinear.scalar.GoalType;
 import org.junit.Test;
 
-import io.openems.edge.controller.evcs.ControllerEvcsImpl.EshContext;
+import com.google.common.collect.ImmutableList;
+
+import io.openems.edge.controller.evcs.Utils.EshContext.EshManualContext;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
 import io.openems.edge.energy.api.EnergyScheduleHandler.AbstractEnergyScheduleHandler;
 import io.openems.edge.energy.api.simulation.Coefficient;
@@ -15,11 +22,14 @@
 import io.openems.edge.energy.api.test.DummyGlobalSimulationsContext;
 import io.openems.edge.evcs.api.ChargeMode;
 
-public class EnergyScheduleHandlerTest {
+public class UtilsTest {
 
-	private static EnergyScheduleHandler buildEsh(ChargeMode chargeMode) {
-		return ControllerEvcsImpl.buildEnergyScheduleHandler(//
-				() -> new EshContext("evcs0", true, chargeMode, Priority.CAR, 2300, 6000, 2000));
+	private static Supplier<EshSmartContext> generateEshSmartContext() {
+		return () -> new EshSmartContext("evcs0", 2000, ImmutableList.of());
+	}
+
+	private static Supplier<EshManualContext> generateEshManualContext(ChargeMode chargeMode) {
+		return () -> new EshManualContext(true, chargeMode, 6000, 2300, Priority.CAR, "evcs0", 2000);
 	}
 
 	private static int cons(GlobalSimulationsContext gsc, int period) {
@@ -28,7 +38,7 @@ private static int cons(GlobalSimulationsContext gsc, int period) {
 
 	@Test
 	public void testManualExcessCar() {
-		var esh = buildEsh(ChargeMode.EXCESS_POWER);
+		var esh = buildEshManual(generateEshManualContext(ChargeMode.EXCESS_POWER));
 		var gsc = DummyGlobalSimulationsContext.fromHandlers(esh);
 		((AbstractEnergyScheduleHandler<?>) esh /* this is safe */).initialize(gsc);
 		var osc = OneSimulationContext.from(gsc);
@@ -42,7 +52,7 @@ public void testManualExcessCar() {
 
 	@Test
 	public void testManualForce() {
-		var esh = buildEsh(ChargeMode.FORCE_CHARGE);
+		var esh = buildEshManual(generateEshManualContext(ChargeMode.FORCE_CHARGE));
 		var gsc = DummyGlobalSimulationsContext.fromHandlers(esh);
 		((AbstractEnergyScheduleHandler<?>) esh /* this is safe */).initialize(gsc);
 		var osc = OneSimulationContext.from(gsc);
@@ -54,6 +64,24 @@ public void testManualForce() {
 		assertEquals(cons(gsc, 4), getConsumption(osc, esh, 4));
 	}
 
+	@Test
+	public void testInitialPopulation() {
+		var esh = buildEshSmart(generateEshSmartContext());
+		var gsc = DummyGlobalSimulationsContext.fromHandlers(esh);
+		esh.initialize(gsc);
+		var ips = esh.getInitialPopulations(gsc);
+		assertEquals(1, ips.size());
+		var ip = ips.get(0);
+		assertEquals(2, ip.periods().size());
+		assertEquals("2020-01-01T11:00Z", ip.periods().get(0).toString());
+		assertEquals("2020-01-01T12:00Z", ip.periods().get(1).toString());
+
+		var ps = gsc.periods().stream().filter(p -> ip.periods().contains(p.time())).toList();
+		assertEquals(2, ps.size());
+		assertEquals(282.9, ps.get(0).price(), 0.001);
+		assertEquals(260.7, ps.get(1).price(), 0.001);
+	}
+
 	private static int getConsumption(OneSimulationContext osc, EnergyScheduleHandler esh, int periodIndex) {
 		var period = osc.global.periods().get(periodIndex);
 		var ef = EnergyFlow.Model.from(osc, period);
diff --git a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergySchedulable.java b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergySchedulable.java
index 601a80179c8..32f662788f1 100644
--- a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergySchedulable.java
+++ b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergySchedulable.java
@@ -1,8 +1,8 @@
 package io.openems.edge.energy.api;
 
-import io.openems.edge.controller.api.Controller;
+import io.openems.edge.common.component.OpenemsComponent;
 
-public interface EnergySchedulable extends Controller {
+public interface EnergySchedulable extends OpenemsComponent {
 
 	/**
 	 * Get the {@link EnergyScheduleHandler}.
diff --git a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergyScheduleHandler.java b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergyScheduleHandler.java
index 478c802a9e8..5bd30a68fb6 100644
--- a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergyScheduleHandler.java
+++ b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/EnergyScheduleHandler.java
@@ -6,8 +6,10 @@
 import java.time.Clock;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
+import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
@@ -17,76 +19,18 @@
 import com.google.common.collect.ImmutableSortedMap;
 
 import io.openems.edge.controller.api.Controller;
-import io.openems.edge.energy.api.EnergyScheduleHandler.WithDifferentStates.PostProcessor;
 import io.openems.edge.energy.api.simulation.EnergyFlow;
 import io.openems.edge.energy.api.simulation.GlobalSimulationsContext;
 import io.openems.edge.energy.api.simulation.OneSimulationContext;
 
 public sealed interface EnergyScheduleHandler {
 
-	/**
-	 * Creates an {@link EnergyScheduleHandler} for a {@link Controller} with
-	 * different states that can be evaluated.
-	 * 
-	 * @param <STATE>         the type of the State
-	 * @param <CONTEXT>       the type of the Context
-	 * @param defaultState    the default State if no other is explicitly scheduled
-	 * @param statesSupplier  a {@link Supplier} for available States
-	 * @param contextFunction a {@link Function} to create a Context
-	 * @param simulator       a simulator that modifies a given {@link EnergyFlow}
-	 * @return an {@link EnergyScheduleHandler}
-	 */
-	public static <STATE, CONTEXT> EnergyScheduleHandler.WithDifferentStates<STATE, CONTEXT> of(//
-			STATE defaultState, //
-			Supplier<STATE[]> statesSupplier, //
-			Function<GlobalSimulationsContext, CONTEXT> contextFunction, //
-			WithDifferentStates.Simulator<STATE, CONTEXT> simulator) {
-		return new EnergyScheduleHandler.WithDifferentStates<STATE, CONTEXT>(defaultState, statesSupplier,
-				contextFunction, simulator, EnergyScheduleHandler.WithDifferentStates.PostProcessor.doNothing());
-	}
-
-	/**
-	 * Creates an {@link EnergyScheduleHandler} for a {@link Controller} with
-	 * different states that can be evaluated.
-	 * 
-	 * @param <STATE>         the type of the State
-	 * @param <CONTEXT>       the type of the Context
-	 * @param defaultState    the default State if no other is explicitly scheduled
-	 * @param statesSupplier  a {@link Supplier} for available States
-	 * @param contextFunction a {@link Function} to create a Context
-	 * @param simulator       a simulator that modifies a given {@link EnergyFlow}
-	 * @param postProcessor   a {@link PostProcessor}
-	 * @return an {@link EnergyScheduleHandler}
-	 */
-	public static <STATE, CONTEXT> EnergyScheduleHandler.WithDifferentStates<STATE, CONTEXT> of(//
-			STATE defaultState, //
-			Supplier<STATE[]> statesSupplier, //
-			Function<GlobalSimulationsContext, CONTEXT> contextFunction, //
-			WithDifferentStates.Simulator<STATE, CONTEXT> simulator, //
-			WithDifferentStates.PostProcessor<STATE, CONTEXT> postProcessor) {
-		return new EnergyScheduleHandler.WithDifferentStates<STATE, CONTEXT>(defaultState, statesSupplier,
-				contextFunction, simulator, postProcessor);
-	}
-
-	/**
-	 * Creates an {@link EnergyScheduleHandler} for a {@link Controller} with only a
-	 * single state.
-	 * 
-	 * @param <CONTEXT>       the type of the Context
-	 * @param contextFunction a {@link Function} to create a Context
-	 * @param simulator       a simulator that modifies a given {@link EnergyFlow}
-	 * @return an {@link EnergyScheduleHandler}
-	 */
-	public static <CONTEXT> EnergyScheduleHandler.WithOnlyOneState<CONTEXT> of(//
-			Function<GlobalSimulationsContext, CONTEXT> contextFunction, //
-			WithOnlyOneState.Simulator<CONTEXT> simulator) {
-		return new EnergyScheduleHandler.WithOnlyOneState<CONTEXT>(contextFunction, simulator);
-	}
-
 	/**
 	 * Triggers Rescheduling by the Energy Scheduler.
+	 * 
+	 * @param reason a reason
 	 */
-	public void triggerReschedule();
+	public void triggerReschedule(String reason);
 
 	public abstract static sealed class AbstractEnergyScheduleHandler<CONTEXT> implements EnergyScheduleHandler {
 
@@ -94,7 +38,7 @@ public abstract static sealed class AbstractEnergyScheduleHandler<CONTEXT> imple
 
 		protected Clock clock;
 		protected CONTEXT context;
-		private Runnable onRescheduleCallback;
+		private Consumer<String> onRescheduleCallback;
 
 		public AbstractEnergyScheduleHandler(Function<GlobalSimulationsContext, CONTEXT> contextFunction) {
 			this.contextFunction = contextFunction;
@@ -116,9 +60,9 @@ public void initialize(GlobalSimulationsContext asc) {
 		/**
 		 * This method sets the callback for events that require Rescheduling.
 		 * 
-		 * @param callback the {@link Runnable} callback
+		 * @param callback the {@link Consumer} callback with a reason
 		 */
-		public synchronized void setOnRescheduleCallback(Runnable callback) {
+		public synchronized void setOnRescheduleCallback(Consumer<String> callback) {
 			this.onRescheduleCallback = callback;
 		}
 
@@ -130,10 +74,10 @@ public synchronized void removeOnRescheduleCallback() {
 		}
 
 		@Override
-		public void triggerReschedule() {
+		public void triggerReschedule(String reason) {
 			var onRescheduleCallback = this.onRescheduleCallback;
 			if (onRescheduleCallback != null) {
-				onRescheduleCallback.run();
+				onRescheduleCallback.accept(reason);
 			}
 		}
 
@@ -155,6 +99,110 @@ protected void buildToString(MoreObjects.ToStringHelper toStringHelper) {
 
 	public static final class WithDifferentStates<STATE, CONTEXT> extends AbstractEnergyScheduleHandler<CONTEXT> {
 
+		public static final class Builder<STATE, CONTEXT> {
+
+			private STATE defaultState;
+			private Supplier<STATE[]> availableStatesSupplier;
+			private Function<GlobalSimulationsContext, CONTEXT> contextFunction;
+			private Function<GlobalSimulationsContext, List<InitialPopulation<STATE>>> initialPopulationsFunction = gsc -> List
+					.of();
+			private WithDifferentStates.Simulator<STATE, CONTEXT> simulator;
+			private WithDifferentStates.PostProcessor<STATE, CONTEXT> postProcessor = PostProcessor.doNothing();
+
+			/**
+			 * Sets the default State if no other is explicitly scheduled.
+			 * 
+			 * @param state a state
+			 * @return myself
+			 */
+			public Builder<STATE, CONTEXT> setDefaultState(STATE state) {
+				this.defaultState = state;
+				return this;
+			}
+
+			/**
+			 * Sets a {@link Function} to create a {@link GlobalSimulationsContext}.
+			 * 
+			 * @param contextFunction the context function
+			 * @return myself
+			 */
+			public Builder<STATE, CONTEXT> setContextFunction(
+					Function<GlobalSimulationsContext, CONTEXT> contextFunction) {
+				this.contextFunction = contextFunction;
+				return this;
+			}
+
+			/**
+			 * Sets a {@link Function} to provide {@link InitialPopulation}s.
+			 * 
+			 * @param initialPopulationsFunction the function
+			 * @return myself
+			 */
+			public Builder<STATE, CONTEXT> setInitialPopulationsFunction(
+					Function<GlobalSimulationsContext, List<InitialPopulation<STATE>>> initialPopulationsFunction) {
+				this.initialPopulationsFunction = initialPopulationsFunction;
+				return this;
+			}
+
+			/**
+			 * Sets a {@link Supplier} for available States.
+			 * 
+			 * @param supplier a states supplier
+			 * @return myself
+			 */
+			public Builder<STATE, CONTEXT> setAvailableStates(Supplier<STATE[]> supplier) {
+				this.availableStatesSupplier = supplier;
+				return this;
+			}
+
+			/**
+			 * Sets a {@link WithDifferentStates.Simulator} that modifies a given
+			 * {@link EnergyFlow}.
+			 * 
+			 * @param simulator a simulator
+			 * @return myself
+			 */
+			public Builder<STATE, CONTEXT> setSimulator(WithDifferentStates.Simulator<STATE, CONTEXT> simulator) {
+				this.simulator = simulator;
+				return this;
+			}
+
+			/**
+			 * Sets a {@link PostProcessor}.
+			 * 
+			 * @param postProcessor a {@link PostProcessor}
+			 * @return myself
+			 */
+			public Builder<STATE, CONTEXT> setPostProcessor(
+					WithDifferentStates.PostProcessor<STATE, CONTEXT> postProcessor) {
+				this.postProcessor = postProcessor;
+				return this;
+			}
+
+			/**
+			 * Builds the {@link EnergyScheduleHandler.WithDifferentStates} instance.
+			 *
+			 * @return a {@link EnergyScheduleHandler.WithDifferentStates}
+			 */
+			public WithDifferentStates<STATE, CONTEXT> build() {
+				return new EnergyScheduleHandler.WithDifferentStates<STATE, CONTEXT>(this.defaultState,
+						this.availableStatesSupplier, this.contextFunction, this.initialPopulationsFunction,
+						this.simulator, this.postProcessor);
+			}
+		}
+
+		/**
+		 * Create a {@link EnergyScheduleHandler.WithDifferentStates} for a
+		 * {@link Controller} with different states that can be evaluated.
+		 *
+		 * @param <STATE>   the type of the State
+		 * @param <CONTEXT> the type of the Context
+		 * @return a {@link Builder}
+		 */
+		public static <STATE, CONTEXT> Builder<STATE, CONTEXT> create() {
+			return new Builder<STATE, CONTEXT>();
+		}
+
 		public static interface Simulator<STATE, CONTEXT> {
 			/**
 			 * Simulates a Period.
@@ -164,8 +212,9 @@ public static interface Simulator<STATE, CONTEXT> {
 			 * @param model   the {@link EnergyFlow.Model}
 			 * @param context the Controller Context
 			 * @param state   the simulated State
+			 * @return additional cost to be considered by the cost function
 			 */
-			public void simulate(OneSimulationContext osc, GlobalSimulationsContext.Period period,
+			public double simulate(OneSimulationContext osc, GlobalSimulationsContext.Period period,
 					EnergyFlow.Model model, CONTEXT context, STATE state);
 		}
 
@@ -201,6 +250,7 @@ public static <STATE, CONTEXT> PostProcessor<STATE, CONTEXT> doNothing() {
 
 		private final STATE defaultState;
 		private final Supplier<STATE[]> availableStatesSupplier;
+		private final Function<GlobalSimulationsContext, List<InitialPopulation<STATE>>> initialPopulationsFunction;
 		private final Simulator<STATE, CONTEXT> simulator;
 		private final WithDifferentStates.PostProcessor<STATE, CONTEXT> postProcessor;
 		private final SortedMap<ZonedDateTime, Period<STATE, CONTEXT>> schedule = new TreeMap<>();
@@ -211,11 +261,13 @@ private WithDifferentStates(//
 				STATE defaultState, //
 				Supplier<STATE[]> availableStatesSupplier, //
 				Function<GlobalSimulationsContext, CONTEXT> contextFunction, //
+				Function<GlobalSimulationsContext, List<InitialPopulation<STATE>>> initialPopulationsFunction, //
 				Simulator<STATE, CONTEXT> simulator, //
 				WithDifferentStates.PostProcessor<STATE, CONTEXT> postProcessor) {
 			super(contextFunction);
 			this.defaultState = defaultState;
 			this.availableStatesSupplier = availableStatesSupplier;
+			this.initialPopulationsFunction = initialPopulationsFunction;
 			this.simulator = simulator;
 			this.postProcessor = postProcessor;
 		}
@@ -226,6 +278,32 @@ public void initialize(GlobalSimulationsContext asc) {
 			this.availableStates = this.availableStatesSupplier.get();
 		}
 
+		public static record InitialPopulation<STATE>(List<ZonedDateTime> periods, STATE state) {
+
+			/**
+			 * Creates a {@link InitialPopulation} record.
+			 * 
+			 * @param <STATE> the type of the State
+			 * @param periods a List of {@link ZonedDateTime}s
+			 * @param state   the state
+			 * @return a {@link InitialPopulation} record
+			 */
+			public static <STATE> InitialPopulation<STATE> of(List<ZonedDateTime> periods, STATE state) {
+				return new InitialPopulation<STATE>(periods, state);
+			}
+		}
+
+		/**
+		 * Generates {@link InitialPopulation}s for this
+		 * {@link EnergyScheduleHandler.WithDifferentStates}.
+		 * 
+		 * @param gsc the {@link GlobalSimulationsContext}
+		 * @return a List of {@link InitialPopulation}s
+		 */
+		public List<InitialPopulation<STATE>> getInitialPopulations(GlobalSimulationsContext gsc) {
+			return this.initialPopulationsFunction.apply(gsc);
+		}
+
 		/**
 		 * Gets the default State.
 		 * 
@@ -268,10 +346,11 @@ public STATE[] getAvailableStates() {
 		 * @param period     the simulated {@link GlobalSimulationsContext.Period}
 		 * @param model      the {@link EnergyFlow.Model}
 		 * @param stateIndex the index of the simulated state
+		 * @return additional cost to be considered by the cost function
 		 */
-		public void simulatePeriod(OneSimulationContext osc, GlobalSimulationsContext.Period period,
+		public double simulatePeriod(OneSimulationContext osc, GlobalSimulationsContext.Period period,
 				EnergyFlow.Model model, int stateIndex) {
-			this.simulator.simulate(osc, period, model, this.context, this.availableStates[stateIndex]);
+			return this.simulator.simulate(osc, period, model, this.context, this.availableStates[stateIndex]);
 		}
 
 		/**
@@ -437,6 +516,55 @@ public String toString() {
 
 	public static final class WithOnlyOneState<CONTEXT> extends AbstractEnergyScheduleHandler<CONTEXT> {
 
+		public static final class Builder<CONTEXT> {
+
+			private Function<GlobalSimulationsContext, CONTEXT> contextFunction;
+			private WithOnlyOneState.Simulator<CONTEXT> simulator;
+
+			/**
+			 * Sets a {@link Function} to create a {@link GlobalSimulationsContext}.
+			 * 
+			 * @param contextFunction the context function
+			 * @return myself
+			 */
+			public Builder<CONTEXT> setContextFunction(Function<GlobalSimulationsContext, CONTEXT> contextFunction) {
+				this.contextFunction = contextFunction;
+				return this;
+			}
+
+			/**
+			 * Sets a {@link WithDifferentStates.Simulator} that modifies a given
+			 * {@link EnergyFlow}.
+			 * 
+			 * @param simulator a simulator
+			 * @return myself
+			 */
+			public Builder<CONTEXT> setSimulator(WithOnlyOneState.Simulator<CONTEXT> simulator) {
+				this.simulator = simulator;
+				return this;
+			}
+
+			/**
+			 * Builds the {@link EnergyScheduleHandler.WithDifferentStates} instance.
+			 *
+			 * @return a {@link EnergyScheduleHandler.WithDifferentStates}
+			 */
+			public WithOnlyOneState<CONTEXT> build() {
+				return new EnergyScheduleHandler.WithOnlyOneState<CONTEXT>(this.contextFunction, this.simulator);
+			}
+		}
+
+		/**
+		 * Create a {@link EnergyScheduleHandler.WithOnlyOneState} for a
+		 * {@link Controller} with only a single state.
+		 *
+		 * @param <CONTEXT> the type of the Context
+		 * @return a {@link Builder}
+		 */
+		public static <CONTEXT> Builder<CONTEXT> create() {
+			return new Builder<CONTEXT>();
+		}
+
 		public static interface Simulator<CONTEXT> {
 			/**
 			 * Simulates a Period.
diff --git a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/EnergyFlow.java b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/EnergyFlow.java
index 83a8bb81c1b..c5fe1c3774f 100644
--- a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/EnergyFlow.java
+++ b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/EnergyFlow.java
@@ -49,9 +49,11 @@ public class EnergyFlow {
 	private static final Logger LOG = LoggerFactory.getLogger(EnergyFlow.class);
 
 	private final double[] point;
+	private final int managedConsumption;
 
-	private EnergyFlow(PointValuePair pvp) {
+	private EnergyFlow(PointValuePair pvp, int managedConsumption) {
 		this.point = pvp.getPointRef();
+		this.managedConsumption = managedConsumption;
 	}
 
 	/**
@@ -72,6 +74,15 @@ public int getCons() {
 		return this.getValue(CONS);
 	}
 
+	/**
+	 * Gets the part of {@link Coefficient#CONS} that is actively managed.
+	 * 
+	 * @return the value
+	 */
+	public int getManagedCons() {
+		return this.managedConsumption;
+	}
+
 	/**
 	 * Gets {@link Coefficient#ESS}.
 	 * 
@@ -213,7 +224,7 @@ public static EnergyFlow.Model from(OneSimulationContext osc, Period period) {
 
 		private final List<LinearConstraint> constraints = new ArrayList<LinearConstraint>();
 
-		private int addedConsumption = 0;
+		private int managedConsumption = 0;
 
 		public Model(int production, int unmanagedConsumption, int essMaxCharge, int essMaxDischarge, int gridMaxBuy,
 				int gridMaxSell) {
@@ -359,8 +370,8 @@ public double setGridMaxSell(int value) {
 		 * @return actually set value; {@link Double#NaN} on error
 		 */
 		public synchronized double addConsumption(int value) {
-			this.addedConsumption += value;
-			return this.setFittingCoefficientValue(CONS, GEQ, this.unmanagedConsumption + this.addedConsumption);
+			this.managedConsumption += value;
+			return this.setFittingCoefficientValue(CONS, GEQ, this.unmanagedConsumption + this.managedConsumption);
 		}
 
 		/**
@@ -605,7 +616,8 @@ public EnergyFlow solve() {
 			var coefficients = initializeCoefficients();
 			Arrays.fill(coefficients, 1);
 			try {
-				return new EnergyFlow(solve(MINIMIZE, this.constraints, new LinearObjectiveFunction(coefficients, 0)));
+				return new EnergyFlow(solve(MINIMIZE, this.constraints, new LinearObjectiveFunction(coefficients, 0)),
+						this.managedConsumption);
 			} catch (MathIllegalStateException e) {
 				LOG.warn("[solve] " //
 						+ "Unable to solve EnergyFlow.Model: " + e.getMessage() + " " //
diff --git a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/GlobalSimulationsContext.java b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/GlobalSimulationsContext.java
index 06f4b3791c3..9e74dee2dd4 100644
--- a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/GlobalSimulationsContext.java
+++ b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/simulation/GlobalSimulationsContext.java
@@ -65,7 +65,7 @@ public String toString() {
 				.add("startTime", this.startTime) //
 				.addValue(this.grid) //
 				.addValue(this.ess) //
-				.addValue(this.evcss) //
+				.add("evcss", this.evcss) //
 				.add("eshs", this.eshs) //
 				.toString();
 	}
@@ -226,107 +226,122 @@ public Builder setTimeOfUseTariff(TimeOfUseTariff timeOfUseTariff) {
 		 * @return the {@link GlobalSimulationsContext} record
 		 */
 		public GlobalSimulationsContext build() throws OpenemsException, IllegalArgumentException {
-			assertNull("ComponentManager is not available", this.componentManager);
-			assertNull("EnergyScheduleHandlers are not available", this.eshs);
-			assertNull("Sum is not available", this.sum);
-			assertNull("Predictor-Manager is not available", this.predictorManager);
-			assertNull("TimeOfUseTariff is not available", this.timeOfUseTariff);
-
-			final var clock = this.componentManager.getClock();
-			final var startTime = DateUtils.roundDownToQuarter(ZonedDateTime.now(clock));
-
-			// Prediction values
-			final var consumptions = this.predictorManager.getPrediction(SUM_UNMANAGED_CONSUMPTION);
-			final var productions = this.predictorManager.getPrediction(SUM_PRODUCTION);
-
-			// Prices contains the price values and the time it is retrieved.
-			final var prices = this.timeOfUseTariff.getPrices();
-
-			// Helpers
-			final IntFunction<Period.Quarter> toQuarterPeriod = (i) -> {
-				final var time = startTime.plusMinutes(i * 15);
-				final var consumption = consumptions.getAt(time);
-				final var price = prices.getAt(time);
-				if (consumption == null || price == null) {
-					return null;
-				}
-				final var production = productions.getAtOrElse(time, 0);
-				return new Period.Quarter(time, toEnergy(production), toEnergy(consumption), price);
-			};
-			final IntFunction<Period.Hour> toHourPeriod = (i) -> {
-				final var rangeStart = startTime.plusMinutes(i * 15);
-				final var rangeEnd = startTime.plusMinutes(i * 15).plusMinutes(60);
-
-				final var consumption = consumptions //
-						.getBetween(rangeStart, rangeEnd) //
-						.mapToInt(Integer::intValue) //
-						.toArray();
-				final var priceRange = prices //
-						.getBetween(rangeStart, rangeEnd) //
-						.mapToDouble(Double::doubleValue) //
-						.toArray();
-				if (consumption.length == 0 || priceRange.length == 0) {
-					return null;
-				}
-				final var price = stream(priceRange).average().getAsDouble();
-				final var production = productions //
-						.getBetween(rangeStart, rangeEnd) //
-						.mapToInt(Integer::intValue) //
-						.sum();
-				final var quarterPeriods = IntStream.range(i, i + 4) //
-						.mapToObj(toQuarterPeriod) //
+			try {
+				System.out.println("OPTIMIZER GlobalSimulationsContext::build()");
+
+				assertNull("ComponentManager is not available", this.componentManager);
+				assertNull("EnergyScheduleHandlers are not available", this.eshs);
+				assertNull("Sum is not available", this.sum);
+				assertNull("Predictor-Manager is not available", this.predictorManager);
+				assertNull("TimeOfUseTariff is not available", this.timeOfUseTariff);
+
+				final var clock = this.componentManager.getClock();
+				final var startTime = DateUtils.roundDownToQuarter(ZonedDateTime.now(clock));
+				System.out.println("OPTIMIZER GlobalSimulationsContext::build() startTime=" + startTime);
+
+				// Prediction values
+				final var consumptions = this.predictorManager.getPrediction(SUM_UNMANAGED_CONSUMPTION);
+				System.out.println(
+						"OPTIMIZER GlobalSimulationsContext::build() consumptions=" + consumptions.asArray().length);
+				final var productions = this.predictorManager.getPrediction(SUM_PRODUCTION);
+				System.out.println(
+						"OPTIMIZER GlobalSimulationsContext::build() productions=" + productions.asArray().length);
+
+				// Prices contains the price values and the time it is retrieved.
+				final var prices = this.timeOfUseTariff.getPrices();
+				System.out.println("OPTIMIZER GlobalSimulationsContext::build() prices=" + prices.asArray().length);
+
+				// Helpers
+				final IntFunction<Period.Quarter> toQuarterPeriod = (i) -> {
+					final var time = startTime.plusMinutes(i * 15);
+					final var consumption = consumptions.getAt(time);
+					final var price = prices.getAt(time);
+					if (consumption == null || price == null) {
+						return null;
+					}
+					final var production = productions.getAtOrElse(time, 0);
+					return new Period.Quarter(time, toEnergy(production), toEnergy(consumption), price);
+				};
+				final IntFunction<Period.Hour> toHourPeriod = (i) -> {
+					final var rangeStart = startTime.plusMinutes(i * 15);
+					final var rangeEnd = startTime.plusMinutes(i * 15).plusMinutes(60);
+
+					final var consumption = consumptions //
+							.getBetween(rangeStart, rangeEnd) //
+							.mapToInt(Integer::intValue) //
+							.toArray();
+					final var priceRange = prices //
+							.getBetween(rangeStart, rangeEnd) //
+							.mapToDouble(Double::doubleValue) //
+							.toArray();
+					if (consumption.length == 0 || priceRange.length == 0) {
+						return null;
+					}
+					final var price = stream(priceRange).average().getAsDouble();
+					final var production = productions //
+							.getBetween(rangeStart, rangeEnd) //
+							.mapToInt(Integer::intValue) //
+							.sum();
+					final var quarterPeriods = IntStream.range(i, i + 4) //
+							.mapToObj(toQuarterPeriod) //
+							.filter(Objects::nonNull) //
+							.collect(toImmutableList());
+					return new Period.Hour(rangeStart, //
+							toEnergy(production), toEnergy(stream(consumption).sum()), //
+							price, quarterPeriods);
+				};
+
+				final var periodLengthHourFromIndex = calculatePeriodDurationHourFromIndex(startTime);
+
+				var periods = Stream.concat(//
+						IntStream.range(0, periodLengthHourFromIndex) //
+								.<Period>mapToObj(toQuarterPeriod), //
+						IntStream.iterate(periodLengthHourFromIndex, i -> i + 4) //
+								.<Period>mapToObj(toHourPeriod) //
+								.takeWhile(Objects::nonNull)) //
 						.filter(Objects::nonNull) //
 						.collect(toImmutableList());
-				return new Period.Hour(rangeStart, //
-						toEnergy(production), toEnergy(stream(consumption).sum()), //
-						price, quarterPeriods);
-			};
-
-			final var periodLengthHourFromIndex = calculatePeriodDurationHourFromIndex(startTime);
-
-			var periods = Stream.concat(//
-					IntStream.range(0, periodLengthHourFromIndex) //
-							.<Period>mapToObj(toQuarterPeriod), //
-					IntStream.iterate(periodLengthHourFromIndex, i -> i + 4) //
-							.<Period>mapToObj(toHourPeriod) //
-							.takeWhile(Objects::nonNull)) //
-					.filter(Objects::nonNull) //
-					.collect(toImmutableList());
-
-			if (periods.isEmpty()) {
-				throw new IllegalArgumentException("No forecast periods available. " //
-						+ "Consumptions[" + consumptions.asArray().length + "] " //
-						+ "Productions[" + productions.asArray().length + "] " //
-						+ "Prices[" + prices.asArray().length + "]");
-			}
+				System.out.println("OPTIMIZER GlobalSimulationsContext::build() periods:" + periods.size());
 
-			final Ess ess;
-			{
-				var essTotalEnergy = this.sum.getEssCapacity().getOrError();
-				var essInitialEnergy = socToEnergy(essTotalEnergy, this.sum.getEssSoc().getOrError());
+				if (periods.isEmpty()) {
+					throw new IllegalArgumentException("No forecast periods available. " //
+							+ "Consumptions[" + consumptions.asArray().length + "] " //
+							+ "Productions[" + productions.asArray().length + "] " //
+							+ "Prices[" + prices.asArray().length + "]");
+				}
+
+				final Ess ess;
+				{
+					var essTotalEnergy = this.sum.getEssCapacity().getOrError();
+					var essInitialEnergy = socToEnergy(essTotalEnergy, this.sum.getEssSoc().getOrError());
 
-				// Power Values for scheduling battery for individual periods.
-				var maxDischargePower = TypeUtils.max(1000 /* at least 1000 W */, //
-						this.sum.getEssMaxDischargePower().get());
-				var maxChargePower = TypeUtils.min(-1000 /* at least 1000 W */, //
-						this.sum.getEssMinDischargePower().get());
+					// Power Values for scheduling battery for individual periods.
+					var maxDischargePower = TypeUtils.max(1000 /* at least 1000 W */, //
+							this.sum.getEssMaxDischargePower().get());
+					var maxChargePower = TypeUtils.min(-1000 /* at least 1000 W */, //
+							this.sum.getEssMinDischargePower().get());
 
-				ess = new Ess(essInitialEnergy, essTotalEnergy, toEnergy(abs(maxChargePower)),
-						toEnergy(maxDischargePower));
+					ess = new Ess(essInitialEnergy, essTotalEnergy, toEnergy(abs(maxChargePower)),
+							toEnergy(maxDischargePower));
+				}
+				final var grid = new Grid(40000 /* TODO */, 20000 /* TODO */);
+
+				final var evcss = this.componentManager.getEnabledComponentsOfType(io.openems.edge.evcs.api.Evcs.class)
+						.stream() //
+						.collect(ImmutableMap.toImmutableMap(//
+								OpenemsComponent::id, //
+								evcs -> new Evcs(//
+										evcs.getStatus(), //
+										evcs.getEnergySession().orElse(0))));
+
+				System.out.println("OPTIMIZER GlobalSimulationsContext::build() finished");
+				return new GlobalSimulationsContext(clock, this.riskLevel, startTime, //
+						this.eshs, filterEshsWithDifferentStates(this.eshs).collect(toImmutableList()), //
+						grid, ess, evcss, periods);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw e;
 			}
-			final var grid = new Grid(40000 /* TODO */, 20000 /* TODO */);
-
-			final var evcss = this.componentManager.getEnabledComponentsOfType(io.openems.edge.evcs.api.Evcs.class)
-					.stream() //
-					.collect(ImmutableMap.toImmutableMap(//
-							OpenemsComponent::id, //
-							evcs -> new Evcs(//
-									evcs.getStatus(), //
-									evcs.getEnergySession().orElse(0))));
-
-			return new GlobalSimulationsContext(clock, this.riskLevel, startTime, //
-					this.eshs, filterEshsWithDifferentStates(this.eshs).collect(toImmutableList()), //
-					grid, ess, evcss, periods);
 		}
 	}
 
diff --git a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyEnergySchedulable.java b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyEnergySchedulable.java
index 53bac023549..468849402bc 100644
--- a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyEnergySchedulable.java
+++ b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyEnergySchedulable.java
@@ -1,6 +1,5 @@
 package io.openems.edge.energy.api.test;
 
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.energy.api.EnergySchedulable;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
@@ -26,10 +25,6 @@ protected final DummyEnergySchedulable self() {
 		return this;
 	}
 
-	@Override
-	public void run() throws OpenemsNamedException {
-	}
-
 	@Override
 	public EnergyScheduleHandler getEnergyScheduleHandler() {
 		return this.esh;
diff --git a/io.openems.edge.energy/bnd.bnd b/io.openems.edge.energy/bnd.bnd
index e20541f412c..95805b51ce6 100644
--- a/io.openems.edge.energy/bnd.bnd
+++ b/io.openems.edge.energy/bnd.bnd
@@ -29,6 +29,7 @@ Bundle-Version: 1.0.0.${tstamp}
 	io.openems.edge.controller.ess.gridoptimizedcharge,\
 	io.openems.edge.controller.ess.limittotaldischarge,\
 	io.openems.edge.controller.ess.timeofusetariff,\
+	io.openems.edge.controller.evcs,\
 	io.openems.edge.evcs.api,\
 	io.openems.edge.meter.api,\
 	org.apache.commons.math3,\
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/EnergySchedulerImpl.java b/io.openems.edge.energy/src/io/openems/edge/energy/EnergySchedulerImpl.java
index ff9654b6246..8944a6d3946 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/EnergySchedulerImpl.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/EnergySchedulerImpl.java
@@ -2,6 +2,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.openems.edge.energy.optimizer.Utils.sortByScheduler;
+import static java.util.stream.Collectors.joining;
 
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -85,8 +86,8 @@ public class EnergySchedulerImpl extends AbstractOpenemsComponent implements Ope
 	private void addSchedulable(EnergySchedulable schedulable) {
 		this.schedulables.add(schedulable);
 		var esh = (AbstractEnergyScheduleHandler<?>) schedulable.getEnergyScheduleHandler(); // this is safe
-		esh.setOnRescheduleCallback(() -> this.triggerReschedule());
-		this.triggerReschedule();
+		esh.setOnRescheduleCallback(reason -> this.triggerReschedule(reason));
+		this.triggerReschedule("EnergySchedulerImpl::addSchedulable() " + schedulable.id());
 	}
 
 	@SuppressWarnings("unused")
@@ -94,7 +95,7 @@ private void removeSchedulable(EnergySchedulable schedulable) {
 		this.schedulables.remove(schedulable);
 		var esh = (AbstractEnergyScheduleHandler<?>) schedulable.getEnergyScheduleHandler(); // this is safe
 		esh.removeOnRescheduleCallback();
-		this.triggerReschedule();
+		this.triggerReschedule("EnergySchedulerImpl::removeSchedulable() " + schedulable.id());
 	}
 
 	@Reference(policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
@@ -133,11 +134,17 @@ public EnergySchedulerImpl() {
 		this.optimizer = new Optimizer(//
 				() -> this.config.logVerbosity(), //
 				() -> {
+					System.out.println("OPTIMIZER gscSupplier: "
+							+ this.schedulables.stream().map(s -> s.id()).collect(joining(", ")));
 					// Sort Schedulables by the order in the Scheduler
 					var schedulables = sortByScheduler(this.scheduler, this.schedulables);
+					System.out.println("OPTIMIZER gscSupplier sorted: "
+							+ schedulables.stream().map(s -> s.id()).collect(joining(", ")));
 					var eshs = schedulables.stream() //
 							.map(EnergySchedulable::getEnergyScheduleHandler) //
 							.collect(toImmutableList());
+					System.out.println("OPTIMIZER gscSupplier eshs: "
+							+ eshs.stream().map(e -> e.getClass().getSimpleName()).collect(joining(", ")));
 
 					return GlobalSimulationsContext.create() //
 							.setComponentManager(this.componentManager) //
@@ -155,7 +162,7 @@ public EnergySchedulerImpl() {
 	private void activate(ComponentContext context, Config config) throws OpenemsException {
 		super.activate(context, SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, true);
 
-		if (this.applyConfig(config)) {
+		if (this.applyConfig(config, "activate")) {
 			switch (config.version()) {
 			case V1_ESS_ONLY -> this.optimizerV1.activate(this.id());
 			case V2_ENERGY_SCHEDULABLE -> this.optimizer.activate();
@@ -166,16 +173,16 @@ private void activate(ComponentContext context, Config config) throws OpenemsExc
 	@Modified
 	private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
 		super.modified(context, SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, true);
-		this.applyConfig(config);
+		this.applyConfig(config, "modified");
 	}
 
-	private void triggerReschedule() {
+	private void triggerReschedule(String reason) {
 		if (this.config == null) {
 			return; // Wait for @Activate
 		}
 		switch (this.config.version()) {
 		case V1_ESS_ONLY -> this.optimizerV1.activate(this.id());
-		case V2_ENERGY_SCHEDULABLE -> this.optimizer.triggerReschedule();
+		case V2_ENERGY_SCHEDULABLE -> this.optimizer.triggerReschedule(reason);
 		}
 	}
 
@@ -187,17 +194,17 @@ public String debugLog() {
 		return null;
 	}
 
-	private synchronized boolean applyConfig(Config config) {
+	private synchronized boolean applyConfig(Config config, String reason) {
 		this.config = config;
 		if (OpenemsComponent.validateSingleton(this.cm, SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
 			return false;
 		}
 
 		if (config.enabled()) {
-			this.triggerReschedule();
+			this.triggerReschedule("EnergySchedulerImpl::applyConfig()" + reason);
 		} else {
 			this.optimizerV1.deactivate();
-			this.optimizer.deactivate();
+			this.optimizer.interruptTask();
 			return false;
 		}
 
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/EshCodec.java b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/EshCodec.java
index 978b15cd3bd..f979a534d85 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/EshCodec.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/EshCodec.java
@@ -78,6 +78,8 @@ public static EshCodec of(GlobalSimulationsContext gsc, SimulationResult previou
 						for (var eshIndex = 0; eshIndex < numberOfEshs; eshIndex++) {
 							final int value = gt.get(eshIndex).get(periodIndex).intValue();
 							final int state;
+							// TODO Valid States per Period should be read from ESH here.
+							// Example: might be limited by a SmartConfig with JSCalendar payload
 							if (isFirstPeriodFixed && periodIndex == 0) {
 								final var time = gsc.periods().get(periodIndex).time();
 								final var esh = gsc.eshsWithDifferentStates().get(eshIndex);
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/InitialPopulation.java b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/InitialPopulation.java
index 0d784738770..db4bdacf63c 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/InitialPopulation.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/InitialPopulation.java
@@ -38,6 +38,8 @@ private InitialPopulation() {
 	 */
 	public static ISeq<Genotype<IntegerGene>> generateInitialPopulation(GlobalSimulationsContext gsc, EshCodec codec,
 			SimulationResult previousResult, boolean isCurrentPeriodFixed) {
+		// TODO read good variations from ESHs.
+		// Example: force charge car during cheapest hours
 		return Stream //
 				.concat(//
 						variationsOfAllStatesDefault(gsc, previousResult, isCurrentPeriodFixed), //
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java
index 934df2d495e..17a80bec581 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java
@@ -62,7 +62,10 @@ public Optimizer(Supplier<LogVerbosity> logVerbosity,
 		initializeRandomRegistryForProduction();
 	}
 
-	private synchronized void interruptTask() {
+	/**
+	 * Interrupts the {@link Optimizer} Task.
+	 */
+	public synchronized void interruptTask() {
 		if (this.future != null) {
 			this.future.cancel(true);
 		}
@@ -86,22 +89,32 @@ public synchronized void deactivate() {
 
 	/**
 	 * Triggers Rescheduling.
+	 * 
+	 * @param reason a reason
 	 */
-	public void triggerReschedule() {
-		this.traceLog(() -> "Trigger Reschedule");
-		this.activate(); // interrupt + reschedule
+	public void triggerReschedule(String reason) {
+		// NOTE: This is what happens here:
+		// [_cycle  ] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Trigger Reschedule. Reason: ControllerEvcsImpl::onEvcsStatusChange from 6:The charging limit reached to 1:Not ready for Charging
+		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Optimizer::run() InterruptedException: null
+		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Simulation gave no result!
+		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Run Quick Optimization...
+		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER updateSimulator()...
+		
+		// TODO On interrupt: keep best "regularOptimization" up till now as input for next InitialPopulation
+		this.traceLog(() -> "Trigger Reschedule. Reason: " + reason);
 		this.rescheduleCurrentPeriod.set(true);
+		this.activate(); // interrupt + reschedule
 	}
 
 	@Override
 	public void run() {
-		SimulationResult simulationResult = SimulationResult.EMPTY;
+		var simulationResult = SimulationResult.EMPTY;
 		try {
-			this.traceLog(() -> "Run...");
-
 			if (this.rescheduleCurrentPeriod.getAndSet(false) || this.simulationResult == EMPTY) {
+				this.traceLog(() -> "Run Quick Optimization...");
 				simulationResult = this.runQuickOptimization();
 			} else {
+				this.traceLog(() -> "Run Regular Optimization...");
 				simulationResult = this.runRegularOptimization();
 			}
 
@@ -120,20 +133,26 @@ public void run() {
 	 * @throws InterruptedException on interrupted sleep
 	 */
 	private Simulator updateSimulator() throws InterruptedException {
-		// Create the Simulator with GlobalSimulationsContext
-		createSimulator(this.gscSupplier, //
-				simulator -> this.simulator = simulator, //
-				error -> {
-					this.traceLog(error);
-					this.applySimulationResult(EMPTY);
-				});
-		final var simulator = this.simulator;
-		if (simulator == null) {
-			this.traceLog(() -> "Simulator is null");
-		} else {
-			this.traceLog(() -> "Simulator is " + simulator.toLogString(""));
+		try {
+			// Create the Simulator with GlobalSimulationsContext
+			this.traceLog(() -> "updateSimulator()...");
+			createSimulator(this.gscSupplier, //
+					simulator -> this.simulator = simulator, //
+					error -> {
+						this.traceLog(error);
+						this.applySimulationResult(EMPTY);
+					});
+			final var simulator = this.simulator;
+			if (simulator == null) {
+				this.traceLog(() -> "Simulator is null");
+			} else {
+				this.traceLog(() -> "Simulator is " + simulator.toLogString(""));
+			}
+			return simulator;
+		} catch (Exception e) {
+			e.printStackTrace(); // TODO remove
+			throw e;
 		}
-		return simulator;
 	}
 
 	/**
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/SimulationResult.java b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/SimulationResult.java
index 1406b0d04b2..4928906bd03 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/SimulationResult.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/SimulationResult.java
@@ -145,7 +145,7 @@ private static void log(StringBuilder b, String format, Object... args) {
 	 */
 	public String toLogString(String prefix) {
 		var b = new StringBuilder(prefix) //
-				.append("Time   Price Production Consumption   Ess   Grid ProdToCons ProdToGrid ProdToEss GridToCons GridToEss EssToCons EssInitial\n");
+				.append("Time   Price Production Consumption ManagedCons    Ess   Grid ProdToCons ProdToGrid ProdToEss GridToCons GridToEss EssToCons EssInitial\n");
 		this.periods.entrySet().forEach(e -> {
 			final var time = e.getKey();
 			final var p = e.getValue();
@@ -155,7 +155,8 @@ public String toLogString(String prefix) {
 			log(b, "%s ", time.format(TIME_FORMATTER));
 			log(b, "%6.2f ", c.price());
 			log(b, "%10d ", ef.getProd());
-			log(b, "%10d ", ef.getCons());
+			log(b, "%11d ", ef.getCons());
+			log(b, "%11d ", ef.getManagedCons());
 			log(b, "%6d ", ef.getEss());
 			log(b, "%6d ", ef.getGrid());
 			log(b, "%10d ", ef.getProdToCons());
@@ -170,6 +171,7 @@ public String toLogString(String prefix) {
 			});
 			b.append("\n");
 		});
+		b.append(prefix).append("cost=").append(this.cost);
 		return b.toString();
 	}
 }
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Simulator.java b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Simulator.java
index 7c1b819c0fa..fbdaa6fa30e 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Simulator.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Simulator.java
@@ -125,11 +125,12 @@ public static double simulatePeriod(OneSimulationContext simulation, int[][] sch
 		final var eshs = simulation.global.eshs();
 		final var model = EnergyFlow.Model.from(simulation, period);
 
+		double cost = 0.;
 		var eshIndex = 0;
 		for (var esh : eshs) {
 			if (esh instanceof EnergyScheduleHandler.WithDifferentStates<?, ?> e) {
 				// Simulate with state given by Genotype
-				e.simulatePeriod(simulation, period, model, schedule[periodIndex][eshIndex++]);
+				cost += e.simulatePeriod(simulation, period, model, schedule[periodIndex][eshIndex++]);
 			} else if (esh instanceof EnergyScheduleHandler.WithOnlyOneState<?> e) {
 				e.simulatePeriod(simulation, period, model);
 			}
@@ -149,19 +150,17 @@ public static double simulatePeriod(OneSimulationContext simulation, int[][] sch
 		// Calculate Cost
 		// TODO should be done also by ESH to enable this use-case:
 		// https://community.openems.io/t/limitierung-bei-negativen-preisen-und-lastgang-einkauf/2713/2
-		double cost;
 		if (energyFlow.getGrid() > 0) {
 			// Filter negative prices
 			var price = Math.max(0, period.price());
 
-			cost = // Cost for direct Consumption
+			cost += // Cost for direct Consumption
 					energyFlow.getGridToCons() * price
 							// Cost for future Consumption after storage
 							+ energyFlow.getGridToEss() * price * simulation.global.riskLevel().efficiencyFactor;
 
 		} else {
-			// Sell-to-Grid
-			cost = 0.;
+			// Sell-to-Grid -> no cost
 		}
 		if (bestScheduleCollector != null) {
 			final var srp = SimulationResult.Period.from(period, energyFlow, simulation.ess.getInitialEnergy());
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulatorTest.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulatorTest.java
index 33f5ce9a371..16496d95f2a 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulatorTest.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/SimulatorTest.java
@@ -19,12 +19,14 @@
 
 public class SimulatorTest {
 
-	public static final EnergyScheduleHandler.WithOnlyOneState<Integer> ESH0 = EnergyScheduleHandler.<Integer>of(//
-			simContext -> simContext.ess().totalEnergy(), //
-			(simContext, period, energyFlow, ctrlContext) -> {
-				var minEnergy = socToEnergy(simContext.global.ess().totalEnergy(), 10 /* [%] */);
-				energyFlow.setEssMaxDischarge(Math.max(0, simContext.ess.getInitialEnergy() - minEnergy));
-			});
+	public static final EnergyScheduleHandler.WithOnlyOneState<Integer> ESH0 = //
+			EnergyScheduleHandler.WithOnlyOneState.<Integer>create() //
+					.setContextFunction(simContext -> simContext.ess().totalEnergy()) //
+					.setSimulator((simContext, period, energyFlow, ctrlContext) -> {
+						var minEnergy = socToEnergy(simContext.global.ess().totalEnergy(), 10 /* [%] */);
+						energyFlow.setEssMaxDischarge(Math.max(0, simContext.ess.getInitialEnergy() - minEnergy));
+					}) //
+					.build();
 
 	public static final ManagedSymmetricEss ESS = new DummyManagedSymmetricEss("ess0") //
 			.withMaxApparentPower(10_000) //
@@ -41,12 +43,15 @@ protected static enum Esh2State {
 		FOO, BAR;
 	}
 
-	public static final EnergyScheduleHandler.WithDifferentStates<Esh2State, Object> ESH2 = EnergyScheduleHandler.of(//
-			Esh2State.BAR, //
-			() -> Esh2State.values(), //
-			simContext -> null, //
-			(simContext, period, energyFlow, ctrlContext, state) -> {
-			});
+	public static final EnergyScheduleHandler.WithDifferentStates<Esh2State, Object> ESH2 = //
+			EnergyScheduleHandler.WithDifferentStates.<Esh2State, Object>create() //
+					.setDefaultState(Esh2State.BAR) //
+					.setAvailableStates(() -> Esh2State.values()) //
+					.setContextFunction(simContext -> null) //
+					.setSimulator((simContext, period, energyFlow, ctrlContext, state) -> {
+						return 0.;
+					}) //
+					.build();
 
 	public static final Simulator DUMMY_SIMULATOR = new Simulator(//
 			DummyGlobalSimulationsContext.fromHandlers(ESH0, ESH_TIME_OF_USE_TARIFF_CTRL, ESH2));
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/AppUtils.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/AppUtils.java
index bfa193f02f1..278b7ca1258 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/AppUtils.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/AppUtils.java
@@ -1,6 +1,7 @@
 package io.openems.edge.energy.optimizer.app;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.openems.edge.energy.api.EnergyUtils.filterEshsWithDifferentStates;
 import static java.lang.Double.parseDouble;
 import static java.lang.Integer.parseInt;
@@ -9,12 +10,12 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 
 import io.openems.common.test.TimeLeapClock;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
@@ -22,6 +23,7 @@
 import io.openems.edge.energy.api.simulation.GlobalSimulationsContext;
 import io.openems.edge.energy.api.simulation.GlobalSimulationsContext.Period;
 import io.openems.edge.energy.optimizer.SimulationResult;
+import io.openems.edge.evcs.api.Status;
 
 public class AppUtils {
 
@@ -57,8 +59,13 @@ public static GlobalSimulationsContext parseGlobalSimulationsContextFromLogStrin
 				parseInt(essMatcher.group("maxChargeEnergy")), //
 				parseInt(essMatcher.group("maxDischargeEnergy")));
 
-		// TODO Evcs
-		final var evcss =  ImmutableMap.<String, GlobalSimulationsContext.Evcs>of();
+		final var evcss = Arrays.stream(headerMatcher.group("evcss").split("], ")) //
+				.map(evcs -> applyPattern(EVCS_PATTERN, evcs)) //
+				.collect(toImmutableMap(//
+						m -> m.group("componentId"), //
+						m -> new GlobalSimulationsContext.Evcs(//
+								Status.valueOf(m.group("status")), //
+								parseInt(m.group("energySession"))))); //
 
 		var nextTime = new AtomicReference<>(startDateTime);
 		var periods = log.lines() //
@@ -95,7 +102,9 @@ private static Matcher applyPattern(Pattern pattern, String line) {
 	private static final Pattern HEADER_PATTERN = Pattern.compile("" //
 			+ "startTime=(?<startTime>\\S*), " //
 			+ "Grid\\[(?<grid>.*)\\], " //
-			+ "Ess\\[(?<ess>.*)\\]");
+			+ "Ess\\[(?<ess>.*)\\], " //
+			+ "evcss=\\{(?<evcss>.*)\\}, " //
+			+ "eshs=\\[");
 
 	private static final Pattern GRID_PATTERN = Pattern.compile("" //
 			+ "maxBuy=(?<maxBuy>\\d+), " //
@@ -107,6 +116,11 @@ private static Matcher applyPattern(Pattern pattern, String line) {
 			+ "maxChargeEnergy=(?<maxChargeEnergy>\\d+), " //
 			+ "maxDischargeEnergy=(?<maxDischargeEnergy>\\d+)");
 
+	private static final Pattern EVCS_PATTERN = Pattern.compile("" //
+			+ "(?<componentId>\\S+)=Evcs\\[" //
+			+ "status=(?<status>\\S+), " //
+			+ "energySession=(?<energySession>\\d+)");
+
 	private static final Pattern PERIOD_PATTERN = Pattern.compile("" //
 			+ "(?<time>\\d{2}:\\d{2})" //
 			+ "\\s+(?<price>-?\\d+\\.\\d+)" //
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java
index 859cf22f4cf..1d985f6e1ac 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java
@@ -1,10 +1,17 @@
 package io.openems.edge.energy.optimizer.app;
 
 import static io.jenetics.engine.Limits.byExecutionTime;
+import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static io.openems.edge.energy.optimizer.SimulationResult.EMPTY;
 import static io.openems.edge.energy.optimizer.app.AppUtils.parseGlobalSimulationsContextFromLogString;
+import static java.time.DayOfWeek.FRIDAY;
+import static java.time.DayOfWeek.MONDAY;
+import static java.time.DayOfWeek.THURSDAY;
+import static java.time.DayOfWeek.TUESDAY;
+import static java.time.DayOfWeek.WEDNESDAY;
 import static java.time.Duration.ofSeconds;
 
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 import com.google.common.collect.ImmutableList;
@@ -16,6 +23,8 @@
 import io.openems.edge.controller.ess.limittotaldischarge.ControllerEssLimitTotalDischargeImpl;
 import io.openems.edge.controller.ess.timeofusetariff.ControlMode;
 import io.openems.edge.controller.ess.timeofusetariff.TimeOfUseTariffControllerImpl;
+import io.openems.edge.controller.evcs.JSCalendar;
+import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
 import io.openems.edge.energy.api.EnergyUtils;
 import io.openems.edge.energy.optimizer.Simulator;
@@ -53,13 +62,31 @@ public class RunOptimizerFromLogApp {
 					() -> new ControllerEssFixActivePowerImpl.EshContext(
 							io.openems.edge.controller.ess.fixactivepower.Mode.MANUAL_ON, //
 							EnergyUtils.toEnergy(-1000), Relationship.GREATER_OR_EQUALS)), //
+			io.openems.edge.controller.evcs.Utils.buildEshSmart(//
+					() -> new EshSmartContext("evcs1", 30000, ImmutableList.of(//
+							JSCalendar.Task.<EshSmartContext.Payload>create() //
+									.setStart(LocalDateTime.of(2024, 28, 12, 7, 0, 0)) //
+									.addRecurrenceRule(b -> b //
+											.setFrequency(WEEKLY) //
+											.addByDay(TUESDAY, WEDNESDAY, THURSDAY, FRIDAY)) //
+									.setPayload(new EshSmartContext.Payload(10000)) //
+									.build(), //
+							JSCalendar.Task.<EshSmartContext.Payload>create() //
+									.setStart(LocalDateTime.of(2024, 28, 12, 7, 0, 0)) //
+									.addRecurrenceRule(b -> b //
+											.setFrequency(WEEKLY) //
+											.addByDay(MONDAY)) //
+									.setPayload(new EshSmartContext.Payload(40000)) //
+									.build()))), //
 			ControllerEssGridOptimizedChargeImpl.buildEnergyScheduleHandler(//
 					() -> Mode.MANUAL, //
 					() -> LocalTime.of(10, 00)), //
+			// TODO EssLimiter
 			TimeOfUseTariffControllerImpl.buildEnergyScheduleHandler(//
 					() -> ESS, //
 					() -> ControlMode.CHARGE_CONSUMPTION, //
-					() -> /* maxChargePowerFromGrid */ 20_000));
+					() -> /* maxChargePowerFromGrid */ 20_000) //
+	);
 
 	/** Insert the full log lines including GlobalSimulationsContext header. */
 	private static final String LOG = """
diff --git a/ui/src/app/edge/live/Controller/Evcs/Evcs.ts b/ui/src/app/edge/live/Controller/Evcs/Evcs.ts
index 89fd473682e..a35c74389c0 100644
--- a/ui/src/app/edge/live/Controller/Evcs/Evcs.ts
+++ b/ui/src/app/edge/live/Controller/Evcs/Evcs.ts
@@ -1,8 +1,12 @@
 import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
+import { TranslateService } from "@ngx-translate/core";
+import { ChartDataset } from "chart.js";
+import { TimeOfUseTariffUtils } from "src/app/shared/service/utils";
 import { SharedModule } from "src/app/shared/shared.module";
 import { FlatComponent } from "./flat/flat";
 import { ModalComponent } from "./modal/modal";
+import { ScheduleChartComponent } from "./modal/scheduleChart";
 import { PopoverComponent } from "./popover/popover";
 
 @NgModule({
@@ -14,6 +18,7 @@ import { PopoverComponent } from "./popover/popover";
     FlatComponent,
     ModalComponent,
     PopoverComponent,
+    ScheduleChartComponent,
   ],
   exports: [
     FlatComponent,
@@ -21,4 +26,106 @@ import { PopoverComponent } from "./popover/popover";
 })
 export class Controller_Evcs { }
 
+export namespace Controller_Evcs {
 
+  export type ScheduleChartData = {
+    datasets: ChartDataset[],
+    colors: any[],
+    labels: Date[]
+  };
+
+  export enum SmartMode {
+    ZERO = 0,
+    SURPLUS_PV = 1,
+    FORCE = 3,
+  }
+
+  /**
+   * Gets the schedule chart data containing datasets, colors and labels.
+   *
+   * @param size The length of the dataset
+   * @param prices The Time-of-Use-Tariff quarterly price array
+   * @param states The Time-of-Use-Tariff state array
+   * @param timestamps The Time-of-Use-Tariff timestamps array
+   * @param translate The Translate service
+   * @returns The ScheduleChartData.
+   */
+  export function getScheduleChartData(size: number, prices: number[], states: number[], timestamps: string[], translate: TranslateService): Controller_Evcs.ScheduleChartData {
+
+    const datasets: ChartDataset[] = [];
+    const colors: any[] = [];
+    const labels: Date[] = [];
+
+    // Initializing States.
+    const barZero = Array(size).fill(null);
+    const barSurplusPv = Array(size).fill(null);
+    const barForce = Array(size).fill(null);
+
+    for (let index = 0; index < size; index++) {
+      const quarterlyPrice = TimeOfUseTariffUtils.formatPrice(prices[index]);
+      const state = states[index];
+      labels.push(new Date(timestamps[index]));
+
+      if (state !== null) {
+        switch (state) {
+          case Controller_Evcs.SmartMode.ZERO:
+            barZero[index] = quarterlyPrice;
+            break;
+          case Controller_Evcs.SmartMode.SURPLUS_PV:
+            barSurplusPv[index] = quarterlyPrice;
+            break;
+          case Controller_Evcs.SmartMode.FORCE:
+            barForce[index] = quarterlyPrice;
+            break;
+        }
+      }
+    }
+
+    // Set datasets
+    datasets.push({
+      type: "bar",
+      label: "No Charge",
+      data: barZero,
+      order: 1,
+    });
+    colors.push({
+      // Dark Green
+      backgroundColor: "rgba(51,102,0,0.8)",
+      borderColor: "rgba(51,102,0,1)",
+    });
+
+    // Set dataset for ChargeGrid.
+    datasets.push({
+      type: "bar",
+      label: "Surplus PV",
+      data: barSurplusPv,
+      order: 1,
+    });
+    colors.push({
+      // Sky blue
+      backgroundColor: "rgba(0, 204, 204,0.5)",
+      borderColor: "rgba(0, 204, 204,0.7)",
+    });
+
+    // Set dataset for buy from grid
+    datasets.push({
+      type: "bar",
+      label: "Force Charge",
+      data: barForce,
+      order: 1,
+    });
+    colors.push({
+      // Black
+      backgroundColor: "rgba(0,0,0,0.8)",
+      borderColor: "rgba(0,0,0,0.9)",
+    });
+
+    const scheduleChartData: Controller_Evcs.ScheduleChartData = {
+      colors: colors,
+      datasets: datasets,
+      labels: labels,
+    };
+
+    return scheduleChartData;
+  }
+}
diff --git a/ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleRequest.ts b/ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleRequest.ts
new file mode 100644
index 00000000000..a667977635c
--- /dev/null
+++ b/ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleRequest.ts
@@ -0,0 +1,24 @@
+import { JsonrpcRequest } from "src/app/shared/jsonrpc/base";
+
+/**
+ * Wraps a JSON-RPC Request for an OpenEMS Component that implements JsonApi
+ *
+ * <pre>
+ * {
+ *   "jsonrpc": "2.0",
+ *   "id": "UUID",
+ *   "method": "getSchedule",
+ *   "params": {}
+ * }
+ * </pre>
+ */
+export class GetScheduleRequest extends JsonrpcRequest {
+
+    private static METHOD: string = "getSchedule";
+
+    public constructor(
+    ) {
+        super(GetScheduleRequest.METHOD, {});
+    }
+
+}
diff --git a/ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleResponse.ts b/ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleResponse.ts
new file mode 100644
index 00000000000..b836ba20842
--- /dev/null
+++ b/ui/src/app/edge/live/Controller/Evcs/jsonrpc/getScheduleResponse.ts
@@ -0,0 +1,36 @@
+import { JsonrpcResponseSuccess } from "src/app/shared/jsonrpc/base";
+
+/**
+ * Wraps a JSON-RPC Response for a GetScheduleRequest.
+ *
+ * <pre>
+ * {
+ *   "jsonrpc": "2.0",
+ *   "id": UUID,
+ *   "result": {
+ *     "schedule": [{
+ *     	"timestamp": string,
+ *      "price": number,
+ *      "state": number,
+ *     }]
+ *   }
+ * }
+ * </pre>
+ */
+export class GetScheduleResponse extends JsonrpcResponseSuccess {
+
+
+    public constructor(
+        public override readonly id: string,
+        public override readonly result: {
+            schedule: {
+                timestamp: string;
+                price: number;
+                state: number;
+            }[]
+        },
+    ) {
+        super(id, result);
+    }
+
+}
diff --git a/ui/src/app/edge/live/Controller/Evcs/modal/modal.html b/ui/src/app/edge/live/Controller/Evcs/modal/modal.html
index 38a9b89e745..1af3217ccb0 100644
--- a/ui/src/app/edge/live/Controller/Evcs/modal/modal.html
+++ b/ui/src/app/edge/live/Controller/Evcs/modal/modal.html
@@ -70,6 +70,15 @@
     <oe-modal-horizontal-line></oe-modal-horizontal-line>
     <ng-container *ngIf="controller">
 
+      <ng-container *ngIf="edge.roleIsAtLeast('admin') && controller['properties']['smartMode'] === true">
+        <oe-modal-info-line [info]="'Edge.Index.Widgets.SCHEDULE.CHART_TITLE_ADMIN'| translate"></oe-modal-info-line>
+
+        <scheduleChart class="ion-padding" [refresh]="refreshChart" [component]="component" [edge]="edge">
+        </scheduleChart>
+
+        <oe-modal-horizontal-line></oe-modal-horizontal-line>
+      </ng-container>
+
       <!--Force Charge settings-->
       <ng-container *ngIf="formGroup.value.chargeMode === 'FORCE_CHARGE'">
         <ng-container>
diff --git a/ui/src/app/edge/live/Controller/Evcs/modal/scheduleChart.ts b/ui/src/app/edge/live/Controller/Evcs/modal/scheduleChart.ts
new file mode 100644
index 00000000000..813c1da9a53
--- /dev/null
+++ b/ui/src/app/edge/live/Controller/Evcs/modal/scheduleChart.ts
@@ -0,0 +1,164 @@
+// @ts-strict-ignore
+import { Component, Input, OnChanges, OnDestroy, OnInit } from "@angular/core";
+import { TranslateService } from "@ngx-translate/core";
+import * as Chart from "chart.js";
+import { filter, take } from "rxjs/operators";
+import { AbstractHistoryChart } from "src/app/edge/history/abstracthistorychart";
+import { calculateResolution } from "src/app/edge/history/shared";
+import { ChartConstants } from "src/app/shared/components/chart/chart.constants";
+import { ComponentJsonApiRequest } from "src/app/shared/jsonrpc/request/componentJsonApiRequest";
+import { ChartAxis, HistoryUtils, TimeOfUseTariffUtils, YAxisType } from "src/app/shared/service/utils";
+import { ChannelAddress, Currency, Edge, EdgeConfig, Service, Websocket } from "src/app/shared/shared";
+import { ColorUtils } from "src/app/shared/utils/color/color.utils";
+import { Controller_Evcs } from "../Evcs";
+import { GetScheduleRequest } from "../jsonrpc/getScheduleRequest";
+import { GetScheduleResponse } from "../jsonrpc/getScheduleResponse";
+
+@Component({
+    selector: "scheduleChart",
+    templateUrl: "../../../../history/abstracthistorychart.html",
+    standalone: false,
+})
+export class ScheduleChartComponent extends AbstractHistoryChart implements OnInit, OnChanges, OnDestroy {
+
+    @Input({ required: true }) public refresh!: boolean;
+    @Input({ required: true }) public override edge!: Edge;
+    @Input({ required: true }) public component!: EdgeConfig.Component;
+
+    protected evcsComponent: EdgeConfig.Component;
+    private currencyLabel: Currency.Label; // Default
+    private currencyUnit: Currency.Unit; // Default
+
+    constructor(
+        protected override service: Service,
+        protected override translate: TranslateService,
+        private websocket: Websocket,
+    ) {
+        super("schedule-chart", service, translate);
+    }
+
+    public getChartHeight(): number {
+        return TimeOfUseTariffUtils.getChartHeight(this.service.isSmartphoneResolution);
+    }
+
+    public async ngOnChanges() {
+        this.edge.getConfig(this.websocket).pipe(filter(config => !!config), take(1)).subscribe(config => {
+            this.evcsComponent = config?.getComponentsByFactory("Controller.Evcs")
+                .find(element => "evcs.id" in element.properties && element.properties["evcs.id"] == this.component.id);
+            const meta: EdgeConfig.Component = config?.getComponent("_meta");
+            const currency: string = config?.getPropertyFromComponent<string>(meta, "currency");
+            this.currencyLabel = Currency.getCurrencyLabelByCurrency(currency);
+            this.currencyUnit = Currency.getChartCurrencyUnitLabel(currency);
+        });
+        this.updateChart();
+    }
+
+    public ngOnInit() {
+        this.service.startSpinner(this.spinnerId);
+    }
+
+    public ngOnDestroy() {
+        this.unsubscribeChartRefresh();
+    }
+
+    protected override updateChart() {
+        this.autoSubscribeChartRefresh();
+        this.service.startSpinner(this.spinnerId);
+        this.loading = true;
+
+        this.edge.sendRequest(
+            this.websocket,
+            new ComponentJsonApiRequest({ componentId: this.evcsComponent.id, payload: new GetScheduleRequest() }),
+        ).then(response => {
+            const result = (response as GetScheduleResponse).result;
+            const schedule = result.schedule;
+
+            // Extracting prices, states, timestamps from the schedule array
+            const { priceArray, stateArray, timestampArray } = {
+                priceArray: schedule.map(entry => entry.price),
+                stateArray: schedule.map(entry => entry.state),
+                timestampArray: schedule.map(entry => entry.timestamp),
+            };
+
+            const scheduleChartData = Controller_Evcs.getScheduleChartData(schedule.length, priceArray,
+                stateArray, timestampArray, this.translate);
+
+            this.colors = scheduleChartData.colors;
+            this.labels = scheduleChartData.labels;
+
+            this.datasets = scheduleChartData.datasets;
+            this.loading = false;
+            this.setLabel();
+            this.stopSpinner();
+
+        }).catch((reason) => {
+            console.error(reason);
+            this.initializeChart();
+            return;
+
+        }).finally(async () => {
+            this.unit = YAxisType.CURRENCY;
+            await this.setOptions(this.options);
+            this.applyControllerSpecificOptions();
+        });
+    }
+
+    protected setLabel() {
+        this.options = this.createDefaultChartOptions();
+    }
+
+    protected getChannelAddresses(): Promise<ChannelAddress[]> {
+        return new Promise(() => { []; });
+    }
+
+    private applyControllerSpecificOptions() {
+
+        this.options.scales.x["time"].unit = calculateResolution(this.service, this.service.historyPeriod.value.from, this.service.historyPeriod.value.to).timeFormat;
+        this.options.scales.x["ticks"] = { source: "auto", autoSkip: false };
+        this.options.scales.x.ticks.maxTicksLimit = 30;
+        this.options.scales.x["offset"] = false;
+        this.options.scales.x.ticks.callback = function (value) {
+            const date = new Date(value);
+
+            // Display the label only if the minutes are zero (full hour)
+            return date.getMinutes() === 0 ? date.getHours() + ":00" : "";
+        };
+
+        // options.plugins.
+        this.options.plugins.tooltip.mode = "index";
+        this.options.plugins.tooltip.callbacks.labelColor = (item: Chart.TooltipItem<any>) => {
+            if (!item) {
+                return;
+            }
+            return {
+                borderColor: ColorUtils.changeOpacityFromRGBA(item.dataset.borderColor, 1),
+                backgroundColor: item.dataset.backgroundColor,
+            };
+        };
+
+        this.options.plugins.tooltip.callbacks.label = (item: Chart.TooltipItem<any>) => {
+
+            const label = item.dataset.label;
+            const value = item.dataset.data[item.dataIndex];
+
+            return TimeOfUseTariffUtils.getLabel(value, label, this.translate, this.currencyLabel);
+        };
+
+        this.datasets = this.datasets.map((el) => {
+            const opacity = el.type === "line" ? 0.2 : 0.5;
+
+            if (el.backgroundColor && el.borderColor) {
+                el.backgroundColor = ColorUtils.changeOpacityFromRGBA(el.backgroundColor.toString(), opacity);
+                el.borderColor = ColorUtils.changeOpacityFromRGBA(el.borderColor.toString(), 1);
+            }
+            return el;
+        });
+
+        const leftYAxis: HistoryUtils.yAxes = { position: "left", unit: this.unit, yAxisId: ChartAxis.LEFT, customTitle: this.currencyUnit, scale: { dynamicScale: true } };
+
+        this.options.scales[ChartAxis.LEFT] = {
+            ...this.options.scales[ChartAxis.LEFT],
+            ...ChartConstants.DEFAULT_Y_SCALE_OPTIONS(leftYAxis, this.translate, "bar", this.datasets.filter(el => el["yAxisID"] === ChartAxis.LEFT), true),
+        };
+    }
+}

From 934b16dba752ff8620a32a9bc0787b617d3981ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:54:27 +0100
Subject: [PATCH 21/49] Bump @typescript-eslint/types from 8.18.1 to 8.19.0 in
 /ui in the eslint group across 1 directory (#2948)

* Bump @typescript-eslint/types

Bumps the eslint group with 1 update in the /ui directory: [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/types).


Updates `@typescript-eslint/types` from 8.18.1 to 8.19.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/types/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.19.0/packages/types)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/types"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>

* Format environments

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json                          | 73 ++++++++++++++++++-
 ui/package.json                               |  2 +-
 .../openems/environments/backend-dev.ts       |  3 +-
 .../openems/environments/backend-prod.ts      |  3 +-
 .../themes/openems/environments/edge-dev.ts   |  3 +-
 .../themes/openems/environments/edge-prod.ts  |  3 +-
 6 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 9dc993b1dcd..9ca7dce1ce0 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -84,7 +84,7 @@
         "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^8.18.0",
         "@typescript-eslint/parser": "^8.18.0",
-        "@typescript-eslint/types": "^8.18.0",
+        "@typescript-eslint/types": "^8.19.0",
         "eslint": "^9.16.0",
         "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-check-file": "^2.8.0",
@@ -7025,6 +7025,19 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
@@ -7042,6 +7055,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.1.tgz",
@@ -7066,9 +7092,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7104,6 +7130,19 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.1.tgz",
@@ -7127,6 +7166,19 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
@@ -7144,6 +7196,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
diff --git a/ui/package.json b/ui/package.json
index 318ce7c2cf9..c35c74a7ac2 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -79,7 +79,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.18.0",
     "@typescript-eslint/parser": "^8.18.0",
-    "@typescript-eslint/types": "^8.18.0",
+    "@typescript-eslint/types": "^8.19.0",
     "eslint": "^9.16.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",
diff --git a/ui/src/themes/openems/environments/backend-dev.ts b/ui/src/themes/openems/environments/backend-dev.ts
index 66af32592b9..962ce0115cd 100644
--- a/ui/src/themes/openems/environments/backend-dev.ts
+++ b/ui/src/themes/openems/environments/backend-dev.ts
@@ -1,5 +1,4 @@
-import { Environment } from "src/environments";
-import { getWebsocketScheme } from "src/environments";
+import { Environment , getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
diff --git a/ui/src/themes/openems/environments/backend-prod.ts b/ui/src/themes/openems/environments/backend-prod.ts
index 7c695bab038..70ec8f4e578 100644
--- a/ui/src/themes/openems/environments/backend-prod.ts
+++ b/ui/src/themes/openems/environments/backend-prod.ts
@@ -1,5 +1,4 @@
-import { Environment } from "src/environments";
-import { getWebsocketScheme } from "src/environments";
+import { Environment , getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
diff --git a/ui/src/themes/openems/environments/edge-dev.ts b/ui/src/themes/openems/environments/edge-dev.ts
index 8e7292f8b81..30ee3318fef 100644
--- a/ui/src/themes/openems/environments/edge-dev.ts
+++ b/ui/src/themes/openems/environments/edge-dev.ts
@@ -1,5 +1,4 @@
-import { Environment } from "src/environments";
-import { getWebsocketScheme } from "src/environments";
+import { Environment , getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {
diff --git a/ui/src/themes/openems/environments/edge-prod.ts b/ui/src/themes/openems/environments/edge-prod.ts
index 2bda82ceee5..32dda90b29d 100644
--- a/ui/src/themes/openems/environments/edge-prod.ts
+++ b/ui/src/themes/openems/environments/edge-prod.ts
@@ -1,5 +1,4 @@
-import { Environment } from "src/environments";
-import { getWebsocketScheme } from "src/environments";
+import { Environment , getWebsocketScheme } from "src/environments";
 import { theme } from "./theme";
 
 export const environment: Environment = {

From d4de5767b63e2bb5f0fa609f052f750c177f8ceb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:59:07 +0100
Subject: [PATCH 22/49] Bump @ngx-translate/core from 16.0.3 to 16.0.4 in /ui
 (#2945)

Bumps [@ngx-translate/core](https://github.com/ngx-translate/core) from 16.0.3 to 16.0.4.
- [Release notes](https://github.com/ngx-translate/core/releases)
- [Commits](https://github.com/ngx-translate/core/compare/v16.0.3...v16.0.4)

---
updated-dependencies:
- dependency-name: "@ngx-translate/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json | 8 ++++----
 ui/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 9ca7dce1ce0..e7973be246c 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -30,7 +30,7 @@
         "@ngx-formly/core": "^6.3.12",
         "@ngx-formly/ionic": "^6.3.12",
         "@ngx-formly/schematics": "^6.3.12",
-        "@ngx-translate/core": "^16.0.3",
+        "@ngx-translate/core": "^16.0.4",
         "@nodro7/angular-mydatepicker": "^0.14.0",
         "capacitor-blob-writer": "^1.1.17",
         "capacitor-ios-autofill-save-password": "^4.0.0",
@@ -5513,9 +5513,9 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@ngx-translate/core": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.3.tgz",
-      "integrity": "sha512-UPse66z9tRUmIpeorYodXBQY6O4foUmj9jy9cCuuja7lqdOwRBWPzCWqc+qYIXv5L2QoqZdxgHtqoUz+Q9weSA==",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.4.tgz",
+      "integrity": "sha512-s8llTL2SJvROhqttxvEs7Cg+6qSf4kvZPFYO+cTOY1d8DWTjlutRkWAleZcPPoeX927Dm7ALfL07G7oYDJ7z6w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
diff --git a/ui/package.json b/ui/package.json
index c35c74a7ac2..c20dd2b2d39 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -25,7 +25,7 @@
     "@ngx-formly/core": "^6.3.12",
     "@ngx-formly/ionic": "^6.3.12",
     "@ngx-formly/schematics": "^6.3.12",
-    "@ngx-translate/core": "^16.0.3",
+    "@ngx-translate/core": "^16.0.4",
     "@nodro7/angular-mydatepicker": "^0.14.0",
     "capacitor-blob-writer": "^1.1.17",
     "capacitor-ios-autofill-save-password": "^4.0.0",

From c759c883dd6b5758a9d158d79853290b7182b890 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 15:48:16 +0100
Subject: [PATCH 23/49] Bump capacitor-blob-writer from 1.1.18 to 1.1.19 in /ui
 (#2944)

Bumps [capacitor-blob-writer](https://github.com/diachedelic/capacitor-blob-writer) from 1.1.18 to 1.1.19.
- [Commits](https://github.com/diachedelic/capacitor-blob-writer/compare/v1.1.18...v1.1.19)

---
updated-dependencies:
- dependency-name: capacitor-blob-writer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ui/package-lock.json | 8 ++++----
 ui/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index e7973be246c..7a5086ee8b8 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -32,7 +32,7 @@
         "@ngx-formly/schematics": "^6.3.12",
         "@ngx-translate/core": "^16.0.4",
         "@nodro7/angular-mydatepicker": "^0.14.0",
-        "capacitor-blob-writer": "^1.1.17",
+        "capacitor-blob-writer": "^1.1.19",
         "capacitor-ios-autofill-save-password": "^4.0.0",
         "capacitor-secure-storage-plugin": "^0.10.0",
         "chart.js": "^4.4.7",
@@ -8625,9 +8625,9 @@
       ]
     },
     "node_modules/capacitor-blob-writer": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/capacitor-blob-writer/-/capacitor-blob-writer-1.1.18.tgz",
-      "integrity": "sha512-Bv473r0kGwtMuQ3s38GbuqgeVLisl59GOBf7yv0RzXq025qg7/gK2wll6VR1gC3ex6lgJ8/5ngnppHTgibs7EQ==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/capacitor-blob-writer/-/capacitor-blob-writer-1.1.19.tgz",
+      "integrity": "sha512-2uZjL/y6F2yblA6lc5SP0JE+rQhxZcinmsLQKwGuSIDQySAdrcDkCAoQ07nqQV9qMtaeWsVTD6n08wo4R2sSjA==",
       "peerDependencies": {
         "@capacitor/core": ">=3.0.0",
         "@capacitor/filesystem": ">=1.0.0"
diff --git a/ui/package.json b/ui/package.json
index c20dd2b2d39..3e26877bc27 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -27,7 +27,7 @@
     "@ngx-formly/schematics": "^6.3.12",
     "@ngx-translate/core": "^16.0.4",
     "@nodro7/angular-mydatepicker": "^0.14.0",
-    "capacitor-blob-writer": "^1.1.17",
+    "capacitor-blob-writer": "^1.1.19",
     "capacitor-ios-autofill-save-password": "^4.0.0",
     "capacitor-secure-storage-plugin": "^0.10.0",
     "chart.js": "^4.4.7",

From 292ebf7df6201ed4cc9d13c0bf348a74b058597c Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Wed, 1 Jan 2025 16:26:14 +0100
Subject: [PATCH 24/49] Gradle: Update to version 8.12.0

https://github.com/gradle/gradle/releases/tag/v8.12.0
---
 .gradle-wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
index e2847c82004..cea7a793a84 100644
--- a/.gradle-wrapper/gradle-wrapper.properties
+++ b/.gradle-wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 3da39f034b087b2e22caf3d04662c03369d8b2ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:34:17 +0100
Subject: [PATCH 25/49] Bump @schematics/angular from 19.0.5 to 19.0.6 in /ui
 (#2943)

* Bump @schematics/angular from 19.0.5 to 19.0.6 in /ui

Bumps [@schematics/angular](https://github.com/angular/angular-cli) from 19.0.5 to 19.0.6.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/19.0.5...19.0.6)

---
updated-dependencies:
- dependency-name: "@schematics/angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update dependabot.yml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 .github/dependabot.yml |  1 +
 ui/package-lock.json   | 73 ++++++++++++++++++++++++++++++++++++++----
 ui/package.json        |  2 +-
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fd5504558db..227b6249f1c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -33,6 +33,7 @@ updates:
           - "@angular/*"
           - "@angular-devkit/*"
           - "@angular-eslint/*"
+          - "@schematics/angular"
       capacitor:
         patterns:
           - "@capacitor/*"
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 7a5086ee8b8..264cf1733f5 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -72,7 +72,7 @@
         "@capacitor/cli": "6.2.0",
         "@ionic/angular-toolkit": "^12.1.1",
         "@ionic/cli": "^7.2.0",
-        "@schematics/angular": "^19.0.5",
+        "@schematics/angular": "^19.0.6",
         "@stylistic/eslint-plugin": "^2.12.1",
         "@types/jasmine": "~5.1.5",
         "@types/jasminewd2": "~2.0.13",
@@ -927,6 +927,22 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular/cli/node_modules/@schematics/angular": {
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.0.5.tgz",
+      "integrity": "sha512-4nBJZF8HvSdj/RoyIixAfOuKEQaEBsEBtohIow8iHX1wcLax558d70O/ZM6EOh2FQxmEaxUe1x4KwBQIha8RxA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "19.0.5",
+        "@angular-devkit/schematics": "19.0.5",
+        "jsonc-parser": "3.3.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
     "node_modules/@angular/common": {
       "version": "19.0.3",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.0.3.tgz",
@@ -6423,13 +6439,13 @@
       "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "19.0.5",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.0.5.tgz",
-      "integrity": "sha512-4nBJZF8HvSdj/RoyIixAfOuKEQaEBsEBtohIow8iHX1wcLax558d70O/ZM6EOh2FQxmEaxUe1x4KwBQIha8RxA==",
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.0.6.tgz",
+      "integrity": "sha512-HicclmbW/+mlljU7a4PzbyIWG+7tognoL5LsgMFJQUDzJXHNjRt1riL0vk57o8Pcprnz9FheeWZXO1KRhXkQuw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "19.0.5",
-        "@angular-devkit/schematics": "19.0.5",
+        "@angular-devkit/core": "19.0.6",
+        "@angular-devkit/schematics": "19.0.6",
         "jsonc-parser": "3.3.1"
       },
       "engines": {
@@ -6438,6 +6454,51 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.6.tgz",
+      "integrity": "sha512-WUWJhzQDsovfMY6jtb9Ktz/5sJszsaErj+XV2aXab85f1OweI/Iv2urPZnJwUSilvVN5Ok/fy3IJ6SuihK4Ceg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.0.6.tgz",
+      "integrity": "sha512-R9hlHfAh1HKoIWgnYJlOEKhUezhTNl0fpUmHxG2252JSY5FLRxmYArTtJYYmbNdBbsBLNg3UHyM/GBPvJSA3NQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "19.0.6",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.12",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
     "node_modules/@sigstore/bundle": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.0.0.tgz",
diff --git a/ui/package.json b/ui/package.json
index 3e26877bc27..b8b4fb3e705 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -67,7 +67,7 @@
     "@capacitor/cli": "6.2.0",
     "@ionic/angular-toolkit": "^12.1.1",
     "@ionic/cli": "^7.2.0",
-    "@schematics/angular": "^19.0.5",
+    "@schematics/angular": "^19.0.6",
     "@stylistic/eslint-plugin": "^2.12.1",
     "@types/jasmine": "~5.1.5",
     "@types/jasminewd2": "~2.0.13",

From 4e833054e39c15d5d2464f28f650e0f9e99869d5 Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Wed, 1 Jan 2025 16:55:41 +0100
Subject: [PATCH 26/49] Docs: update link to chart example (#2910)

---
 .../ROOT/pages/ui/implementing-a-widget/components/chart.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/modules/ROOT/pages/ui/implementing-a-widget/components/chart.adoc b/doc/modules/ROOT/pages/ui/implementing-a-widget/components/chart.adoc
index 283db853759..c13f06a39d2 100644
--- a/doc/modules/ROOT/pages/ui/implementing-a-widget/components/chart.adoc
+++ b/doc/modules/ROOT/pages/ui/implementing-a-widget/components/chart.adoc
@@ -8,7 +8,7 @@ Charts are mainly used in the History-View and should be acting like the `modal`
 
 Creating or updating charts has been very difficult, but if you use the recommended and new way of creating them, its much easier and can be done fast. Furthermore they are unittestable now. 
 
-If we take a look at a link:src\app\edge\history\common\autarchy\chart\chart.ts[Working Example], we will see, that the chart directory includes not only the chart.ts but also the corresponding .spec-file. If you are not familiar with angulars unit testing, check it out link:https://angular.io/guide/testing#test-file-name-and-location[here].
+If we take a look at a link:https://github.com/OpenEMS/openems/blob/develop/ui/src/app/edge/history/common/autarchy/chart/chart.ts[Working Example], we will see, that the chart directory includes not only the chart.ts but also the corresponding .spec-file. If you are not familiar with angulars unit testing, check it out link:https://angular.io/guide/testing#test-file-name-and-location[here].
 
 NOTE: It is recommended to have the `component.ts` and `component.spec.ts` files in the same folder.
 
@@ -55,4 +55,4 @@ The `output` is then defining the dataset, with the `nameSuffix` callback having
 
 The second one is passed with the output callback, and has to be used for the converter callback-function.
 
-Additionally we define the formatting of the data in the tooltip and the yAxes.
\ No newline at end of file
+Additionally we define the formatting of the data in the tooltip and the yAxes.

From e63d9442b9a84cedd5689642adeaac17598b8c22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:58:08 +0100
Subject: [PATCH 27/49] Bump the angular group across 1 directory with 3
 updates (#2942)

* Bump the angular group across 1 directory with 3 updates

Bumps the angular group with 3 updates in the /ui directory: [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common), [@angular-devkit/core](https://github.com/angular/angular-cli) and [@angular-devkit/schematics](https://github.com/angular/angular-cli).


Updates `@angular/common` from 19.0.3 to 19.0.5
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/19.0.5/packages/common)

Updates `@angular-devkit/core` from 19.0.5 to 19.0.6
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/19.0.5...19.0.6)

Updates `@angular-devkit/schematics` from 19.0.5 to 19.0.6
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/19.0.5...19.0.6)

---
updated-dependencies:
- dependency-name: "@angular/common"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/schematics"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump the angular group across 1 directory with 3 updates

Bumps the angular group with 3 updates in the /ui directory: [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common), [@angular-devkit/core](https://github.com/angular/angular-cli) and [@angular-devkit/schematics](https://github.com/angular/angular-cli).


Updates `@angular/common` from 19.0.3 to 19.0.5
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/19.0.5/packages/common)

Updates `@angular-devkit/core` from 19.0.5 to 19.0.6
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/19.0.5...19.0.6)

Updates `@angular-devkit/schematics` from 19.0.5 to 19.0.6
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/19.0.5...19.0.6)

---
updated-dependencies:
- dependency-name: "@angular/common"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/schematics"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json | 1634 ++++++++++++++++++------------------------
 ui/package.json      |   40 +-
 2 files changed, 722 insertions(+), 952 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 264cf1733f5..239a3415054 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -9,16 +9,16 @@
       "version": "2025.1.0-SNAPSHOT",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@angular/animations": "19.0.3",
-        "@angular/common": "19.0.3",
-        "@angular/core": "19.0.3",
-        "@angular/forms": "19.0.3",
-        "@angular/platform-browser": "19.0.3",
-        "@angular/platform-browser-dynamic": "19.0.3",
-        "@angular/router": "19.0.3",
-        "@angular/service-worker": "19.0.3",
-        "@awesome-cordova-plugins/core": "^6.12.0",
-        "@awesome-cordova-plugins/file-opener": "^6.12.0",
+        "@angular/animations": "19.0.5",
+        "@angular/common": "19.0.5",
+        "@angular/core": "19.0.5",
+        "@angular/forms": "19.0.5",
+        "@angular/platform-browser": "19.0.5",
+        "@angular/platform-browser-dynamic": "19.0.5",
+        "@angular/router": "19.0.5",
+        "@angular/service-worker": "19.0.5",
+        "@awesome-cordova-plugins/core": "^6.13.0",
+        "@awesome-cordova-plugins/file-opener": "^6.13.0",
         "@capacitor-community/file-opener": "^6.0.1",
         "@capacitor/android": "^6.2.0",
         "@capacitor/app": "^6.0.2",
@@ -57,17 +57,17 @@
         "zone.js": "~0.15.0"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "^19.0.3",
-        "@angular-devkit/core": "^19.0.5",
-        "@angular-devkit/schematics": "^19.0.5",
+        "@angular-devkit/build-angular": "^19.0.6",
+        "@angular-devkit/core": "^19.0.6",
+        "@angular-devkit/schematics": "^19.0.6",
         "@angular-eslint/builder": "^19.0.2",
         "@angular-eslint/eslint-plugin": "^19.0.2",
         "@angular-eslint/eslint-plugin-template": "^19.0.2",
         "@angular-eslint/template-parser": "^19.0.2",
-        "@angular/cli": "^19.0.5",
-        "@angular/compiler": "19.0.3",
-        "@angular/compiler-cli": "19.0.3",
-        "@angular/language-service": "19.0.3",
+        "@angular/cli": "^19.0.6",
+        "@angular/compiler": "19.0.5",
+        "@angular/compiler-cli": "19.0.5",
+        "@angular/language-service": "19.0.5",
         "@capacitor/assets": "^3.0.5",
         "@capacitor/cli": "6.2.0",
         "@ionic/angular-toolkit": "^12.1.1",
@@ -82,10 +82,10 @@
         "@types/range-parser": "^1.2.7",
         "@types/send": "^0.17.4",
         "@types/uuid": "^10.0.0",
-        "@typescript-eslint/eslint-plugin": "^8.18.0",
-        "@typescript-eslint/parser": "^8.18.0",
+        "@typescript-eslint/eslint-plugin": "^8.19.0",
+        "@typescript-eslint/parser": "^8.19.0",
         "@typescript-eslint/types": "^8.19.0",
-        "eslint": "^9.16.0",
+        "eslint": "^9.17.0",
         "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-check-file": "^2.8.0",
         "eslint-plugin-import": "^2.31.0",
@@ -119,12 +119,13 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1900.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.5.tgz",
-      "integrity": "sha512-JxgoIxwGw3QNj6e70d04g5yJ8ZK0g/my22UK0TlRJRbYcfFQr8pL7u3wq77iNlgeHMDwBskZEf4TEZOVSbm7mw==",
+      "version": "0.1900.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.6.tgz",
+      "integrity": "sha512-w11bAXQnNWBawTJfQPjvaTRrzrqsOUm9tK9WNvaia/xjiRFpmO0CfmKtn3axNSEJM8jb/czaNQrgTwG+TGc/8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "19.0.5",
+        "@angular-devkit/core": "19.0.6",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -134,16 +135,17 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.0.3.tgz",
-      "integrity": "sha512-uC8I9WT2y6eMXSOmKGT0X7a9BKNpzfCEWaTvE2VX4RkwqQhNC/2wr2PIz9AeyIBfLGyarsI9QA9TmZ7Qyu25ow==",
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.0.6.tgz",
+      "integrity": "sha512-dWTAsE6BSI8z0xglQdYBdqTBwg1Q+RWE3OrmlGs+520Dcoq/F0Z41Y1F3MiuHuQPdDAIQr88iB0APkIRW4clMg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1900.3",
-        "@angular-devkit/build-webpack": "0.1900.3",
-        "@angular-devkit/core": "19.0.3",
-        "@angular/build": "19.0.3",
+        "@angular-devkit/architect": "0.1900.6",
+        "@angular-devkit/build-webpack": "0.1900.6",
+        "@angular-devkit/core": "19.0.6",
+        "@angular/build": "19.0.6",
         "@babel/core": "7.26.0",
         "@babel/generator": "7.26.2",
         "@babel/helper-annotate-as-pure": "7.25.9",
@@ -154,7 +156,7 @@
         "@babel/preset-env": "7.26.0",
         "@babel/runtime": "7.26.0",
         "@discoveryjs/json-ext": "0.6.3",
-        "@ngtools/webpack": "19.0.3",
+        "@ngtools/webpack": "19.0.6",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.20",
@@ -208,7 +210,7 @@
         "@angular/localize": "^19.0.0",
         "@angular/platform-server": "^19.0.0",
         "@angular/service-worker": "^19.0.0",
-        "@angular/ssr": "^19.0.3",
+        "@angular/ssr": "^19.0.6",
         "@web/test-runner": "^0.19.0",
         "browser-sync": "^3.0.2",
         "jest": "^29.5.0",
@@ -258,25 +260,30 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1900.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.3.tgz",
-      "integrity": "sha512-8goF98QbzC2pkZkNytun4ViTRnLjMhPIx6ze60V2+OaMjUCkJ25nWcyTd0Q3rNx7wYr9IVuzpeAQBmiZ5igEMg==",
+    "node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1900.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1900.6.tgz",
+      "integrity": "sha512-WehtVrbBow4fc7hsaUKb+BZ6MDE5lO98/tgv7GR5PkRdGKnyLA0pW1AfPLJJQDgcaKjneramMhDFNc1eGSX0mQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "19.0.3",
+        "@angular-devkit/architect": "0.1900.6",
         "rxjs": "7.8.1"
       },
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.30.0",
+        "webpack-dev-server": "^5.0.2"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.3.tgz",
-      "integrity": "sha512-nrzmSKpebmEHGToiRi1NWxZVgzU0M/PCEqsj8Q/LIHrho/YgKVxJ9pX3F7Emo9SmnJJLMYYOQ9qZdAxz4joSMw==",
+    "node_modules/@angular-devkit/core": {
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.6.tgz",
+      "integrity": "sha512-WUWJhzQDsovfMY6jtb9Ktz/5sJszsaErj+XV2aXab85f1OweI/Iv2urPZnJwUSilvVN5Ok/fy3IJ6SuihK4Ceg==",
       "dev": true,
       "dependencies": {
         "ajv": "8.17.1",
@@ -300,14 +307,129 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular/build": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.0.3.tgz",
-      "integrity": "sha512-lUM8+/8iQuCzq+tGpuaHklsmgai19aBjaI8QWUmD5KYKQcg0DBtrx8WgG3bRKvhvY77AVVLhabMimzTjtrKVXA==",
+    "node_modules/@angular-devkit/schematics": {
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.0.6.tgz",
+      "integrity": "sha512-R9hlHfAh1HKoIWgnYJlOEKhUezhTNl0fpUmHxG2252JSY5FLRxmYArTtJYYmbNdBbsBLNg3UHyM/GBPvJSA3NQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "19.0.6",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.12",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-eslint/builder": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-19.0.2.tgz",
+      "integrity": "sha512-BdmMSndQt2fSBiTVniskUcUpQaeweUapbsL0IDfQ7a13vL0NVXpc3K89YXuVE/xsb08uHtqphuwxPAAj6kX3OA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": ">= 0.1900.0 < 0.2000.0",
+        "@angular-devkit/core": ">= 19.0.0 < 20.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/bundled-angular-compiler": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.0.2.tgz",
+      "integrity": "sha512-HPmp92r70SNO/0NdIaIhxrgVSpomqryuUk7jszvNRtu+OzYCJGcbLhQD38T3dbBWT/AV0QXzyzExn6/2ai9fEw==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/eslint-plugin": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.0.2.tgz",
+      "integrity": "sha512-DLuNVVGGFicSThOcMSJyNje+FZSPdG0B3lCBRiqcgKH/16kfM4pV8MobPM7RGK2NhaOmmZ4zzJNwpwWPSgi+Lw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "19.0.2",
+        "@angular-eslint/utils": "19.0.2"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.0.2.tgz",
+      "integrity": "sha512-f/OCF9ThnxQ8m0eNYPwnCrySQPhYfCOF6STL7F9LnS8Bs3ZeW3/oT1yLaMIZ1Eg0ogIkgxksMAJZjrJPUPBD1Q==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "19.0.2",
+        "@angular-eslint/utils": "19.0.2",
+        "aria-query": "5.3.2",
+        "axobject-query": "4.1.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/types": "^7.11.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.0.2.tgz",
+      "integrity": "sha512-z3rZd2sBfuYcFf9rGDsB2zz2fbGX8kkF+0ftg9eocyQmzWrlZHFmuw9ha7oP/Mz8gpblyCS/aa1U/Srs6gz0UQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "19.0.2",
+        "eslint-scope": "^8.0.2"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/utils": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.0.2.tgz",
+      "integrity": "sha512-HotBT8OKr7zCaX1S9k27JuhRiTVIbbYVl6whlb3uwdMIPIWY8iOcEh1tjI4qDPUafpLfR72Dhwi5bO1E17F3/Q==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "19.0.2"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular/animations": {
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.0.5.tgz",
+      "integrity": "sha512-HCOF2CrhUvjoZWusd4nh32VOxpUrg6bV+3Z8Q36Ix3aZdni8v0qoP2rl5wGbotaPtYg5RtyDH60Z2AOPKqlrZg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "19.0.5"
+      }
+    },
+    "node_modules/@angular/build": {
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.0.6.tgz",
+      "integrity": "sha512-KEVNLgTZUF2dfpOYQn+yR2HONHUTxq/2rFVhiK9qAvrm/m+uKJNEXx7hGtbRyoqenZff4ScJq+7feITUldfX8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1900.3",
+        "@angular-devkit/architect": "0.1900.6",
         "@babel/core": "7.26.0",
         "@babel/helper-annotate-as-pure": "7.25.9",
         "@babel/helper-split-export-declaration": "7.24.7",
@@ -346,7 +468,7 @@
         "@angular/localize": "^19.0.0",
         "@angular/platform-server": "^19.0.0",
         "@angular/service-worker": "^19.0.0",
-        "@angular/ssr": "^19.0.3",
+        "@angular/ssr": "^19.0.6",
         "less": "^4.2.0",
         "postcss": "^8.4.0",
         "tailwindcss": "^2.0.0 || ^3.0.0",
@@ -376,11 +498,12 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@inquirer/confirm": {
+    "node_modules/@angular/build/node_modules/@inquirer/confirm": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.0.2.tgz",
       "integrity": "sha512-KJLUHOaKnNCYzwVbryj3TNBxyZIrr56fR5N45v6K9IPrbT6B7DcudBMfylkV1A8PUdJE15mybkEQyp2/ZUpxUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@inquirer/core": "^10.1.0",
         "@inquirer/type": "^3.0.1"
@@ -392,576 +515,91 @@
         "@types/node": ">=18"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.26.0.tgz",
-      "integrity": "sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.26.0.tgz",
-      "integrity": "sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.26.0.tgz",
-      "integrity": "sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@angular/build/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.26.0.tgz",
-      "integrity": "sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+    "node_modules/@angular/cdk": {
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.0.3.tgz",
+      "integrity": "sha512-sPdIKbSgNk4z02FqdTTMUS62aLVA2R/DsnOk3qdH+nEfeS4nNWQEzwrvMf6dDsTeLQ6YJLWXfZfemsGYpOoiWg==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "optionalDependencies": {
+        "parse5": "^7.1.2"
+      },
+      "peerDependencies": {
+        "@angular/common": "^19.0.0 || ^20.0.0",
+        "@angular/core": "^19.0.0 || ^20.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.26.0.tgz",
-      "integrity": "sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@angular/cli": {
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.0.6.tgz",
+      "integrity": "sha512-ZEHhgRRVIdn10dbsAjB8TE9Co32hfuL9/im5Jcfa1yrn6KJefmigz6KN8Xu7FXMH5FkdqfQ11QpLBxJSPb9aww==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/architect": "0.1900.6",
+        "@angular-devkit/core": "19.0.6",
+        "@angular-devkit/schematics": "19.0.6",
+        "@inquirer/prompts": "7.1.0",
+        "@listr2/prompt-adapter-inquirer": "2.0.18",
+        "@schematics/angular": "19.0.6",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "5.0.0",
+        "jsonc-parser": "3.3.1",
+        "listr2": "8.2.5",
+        "npm-package-arg": "12.0.0",
+        "npm-pick-manifest": "10.0.0",
+        "pacote": "20.0.0",
+        "resolve": "1.22.8",
+        "semver": "7.6.3",
+        "symbol-observable": "4.0.0",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "ng": "bin/ng.js"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.26.0.tgz",
-      "integrity": "sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.26.0.tgz",
-      "integrity": "sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.26.0.tgz",
-      "integrity": "sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.26.0.tgz",
-      "integrity": "sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.26.0.tgz",
-      "integrity": "sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.26.0.tgz",
-      "integrity": "sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.26.0.tgz",
-      "integrity": "sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.26.0.tgz",
-      "integrity": "sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.26.0.tgz",
-      "integrity": "sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.26.0.tgz",
-      "integrity": "sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.26.0.tgz",
-      "integrity": "sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.26.0.tgz",
-      "integrity": "sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.26.0.tgz",
-      "integrity": "sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/rollup": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.26.0.tgz",
-      "integrity": "sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.6"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.26.0",
-        "@rollup/rollup-android-arm64": "4.26.0",
-        "@rollup/rollup-darwin-arm64": "4.26.0",
-        "@rollup/rollup-darwin-x64": "4.26.0",
-        "@rollup/rollup-freebsd-arm64": "4.26.0",
-        "@rollup/rollup-freebsd-x64": "4.26.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.26.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.26.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.26.0",
-        "@rollup/rollup-linux-arm64-musl": "4.26.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.26.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.26.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.26.0",
-        "@rollup/rollup-linux-x64-gnu": "4.26.0",
-        "@rollup/rollup-linux-x64-musl": "4.26.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.26.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.26.0",
-        "@rollup/rollup-win32-x64-msvc": "4.26.0",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1900.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1900.3.tgz",
-      "integrity": "sha512-aXsF3J0Ply2ghT4GLKQQ2kfp+deQxtNjlvk5/yhgB2MG7HIk14c8K/f6VWd9cuJ/vrSkd9EP1f4aFWRyAaA5hw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1900.3",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.30.0",
-        "webpack-dev-server": "^5.0.2"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
-      "version": "0.1900.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1900.3.tgz",
-      "integrity": "sha512-8goF98QbzC2pkZkNytun4ViTRnLjMhPIx6ze60V2+OaMjUCkJ25nWcyTd0Q3rNx7wYr9IVuzpeAQBmiZ5igEMg==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "19.0.3",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.3.tgz",
-      "integrity": "sha512-nrzmSKpebmEHGToiRi1NWxZVgzU0M/PCEqsj8Q/LIHrho/YgKVxJ9pX3F7Emo9SmnJJLMYYOQ9qZdAxz4joSMw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/core": {
-      "version": "19.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.5.tgz",
-      "integrity": "sha512-njBblpYHmlDI+Jtbub9NEm9RH+SBIFmmsgL9uJB8GxQVSo2qo4+f69nTkijRNN8WNKsSkYoRR9+JSl9QXWbyEA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/schematics": {
-      "version": "19.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.0.5.tgz",
-      "integrity": "sha512-dhLVBVb0ECfcIP59azoD/5lJMSMU//bo1LEbuE0VrFA9orVxQhgilNuZeVXBr5sOll1PFjxs/fqyX8sAH9xQYw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "19.0.5",
-        "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.12",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-eslint/builder": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-19.0.2.tgz",
-      "integrity": "sha512-BdmMSndQt2fSBiTVniskUcUpQaeweUapbsL0IDfQ7a13vL0NVXpc3K89YXuVE/xsb08uHtqphuwxPAAj6kX3OA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": ">= 0.1900.0 < 0.2000.0",
-        "@angular-devkit/core": ">= 19.0.0 < 20.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.0.2.tgz",
-      "integrity": "sha512-HPmp92r70SNO/0NdIaIhxrgVSpomqryuUk7jszvNRtu+OzYCJGcbLhQD38T3dbBWT/AV0QXzyzExn6/2ai9fEw==",
-      "dev": true
-    },
-    "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.0.2.tgz",
-      "integrity": "sha512-DLuNVVGGFicSThOcMSJyNje+FZSPdG0B3lCBRiqcgKH/16kfM4pV8MobPM7RGK2NhaOmmZ4zzJNwpwWPSgi+Lw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "19.0.2",
-        "@angular-eslint/utils": "19.0.2"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.0.2.tgz",
-      "integrity": "sha512-f/OCF9ThnxQ8m0eNYPwnCrySQPhYfCOF6STL7F9LnS8Bs3ZeW3/oT1yLaMIZ1Eg0ogIkgxksMAJZjrJPUPBD1Q==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "19.0.2",
-        "@angular-eslint/utils": "19.0.2",
-        "aria-query": "5.3.2",
-        "axobject-query": "4.1.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/types": "^7.11.0 || ^8.0.0",
-        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/template-parser": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.0.2.tgz",
-      "integrity": "sha512-z3rZd2sBfuYcFf9rGDsB2zz2fbGX8kkF+0ftg9eocyQmzWrlZHFmuw9ha7oP/Mz8gpblyCS/aa1U/Srs6gz0UQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "19.0.2",
-        "eslint-scope": "^8.0.2"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/utils": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.0.2.tgz",
-      "integrity": "sha512-HotBT8OKr7zCaX1S9k27JuhRiTVIbbYVl6whlb3uwdMIPIWY8iOcEh1tjI4qDPUafpLfR72Dhwi5bO1E17F3/Q==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "19.0.2"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular/animations": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.0.3.tgz",
-      "integrity": "sha512-YWoXM2S5p+Eq6cX1xjtFaai23oVNnbf3u34pEQCyKDjZpqI5lMu8e63lQT0tf7fZttEWlNUYRTwQ9+MpZ0sjzQ==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "19.0.3"
-      }
-    },
-    "node_modules/@angular/cdk": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.0.3.tgz",
-      "integrity": "sha512-sPdIKbSgNk4z02FqdTTMUS62aLVA2R/DsnOk3qdH+nEfeS4nNWQEzwrvMf6dDsTeLQ6YJLWXfZfemsGYpOoiWg==",
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "optionalDependencies": {
-        "parse5": "^7.1.2"
-      },
-      "peerDependencies": {
-        "@angular/common": "^19.0.0 || ^20.0.0",
-        "@angular/core": "^19.0.0 || ^20.0.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/cli": {
-      "version": "19.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.0.5.tgz",
-      "integrity": "sha512-AalLr1EbgJqBbzk+5ZtXwg6wCwLlRLd+CRrZZcC6QSee69mfsU9jEP2KFlMAecajOCqAGK3H4ZRiTZNeQ3y5AA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1900.5",
-        "@angular-devkit/core": "19.0.5",
-        "@angular-devkit/schematics": "19.0.5",
-        "@inquirer/prompts": "7.1.0",
-        "@listr2/prompt-adapter-inquirer": "2.0.18",
-        "@schematics/angular": "19.0.5",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "5.0.0",
-        "jsonc-parser": "3.3.1",
-        "listr2": "8.2.5",
-        "npm-package-arg": "12.0.0",
-        "npm-pick-manifest": "10.0.0",
-        "pacote": "20.0.0",
-        "resolve": "1.22.8",
-        "semver": "7.6.3",
-        "symbol-observable": "4.0.0",
-        "yargs": "17.7.2"
-      },
-      "bin": {
-        "ng": "bin/ng.js"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@schematics/angular": {
-      "version": "19.0.5",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.0.5.tgz",
-      "integrity": "sha512-4nBJZF8HvSdj/RoyIixAfOuKEQaEBsEBtohIow8iHX1wcLax558d70O/ZM6EOh2FQxmEaxUe1x4KwBQIha8RxA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "19.0.5",
-        "@angular-devkit/schematics": "19.0.5",
-        "jsonc-parser": "3.3.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/common": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.0.3.tgz",
-      "integrity": "sha512-YyBVZU+LQ38R+/U5vF/b1T3muROKpR0kkupMw7VKnGhQfgrRX5Dk3H2nr9ritt0zPc7TOUuQSlHMf3QWah2GDg==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "19.0.3",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
+    "node_modules/@angular/common": {
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.0.5.tgz",
+      "integrity": "sha512-fFK+euCj1AjBHBCpj9VnduMSeqoMRhZZHbhPYiND7tucRRJ8vwGU0sYK2KI/Ko+fsrNIXL/0O4F36jVPl09Smg==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "19.0.5",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
     },
     "node_modules/@angular/compiler": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.0.3.tgz",
-      "integrity": "sha512-cxtK4SlHAPstcXfjwOaoR1dAszrzo2iDF8ZiihbZPgKUG3m27qIU3Lp5XBgxfZPlO4jh6TXkWznY7f6Tyxkb0Q==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.0.5.tgz",
+      "integrity": "sha512-S8ku5Ljp0kqX3shfmE9DVo09629jeYJSlBRGbj2Glb92dd+VQZPOz7KxqKRTwmAl7lQIV/+4Lr6G/GVTsoC4vg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -969,7 +607,7 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "19.0.3"
+        "@angular/core": "19.0.5"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -978,10 +616,11 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.0.3.tgz",
-      "integrity": "sha512-nayLcC3hSHoGKXCZInMdFcIZJEHYkEGNsdAutgCMuSj+lXCGuRUysuGC0rGzJc2R6nhgfaLJnO8T/O5acqaqdA==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.0.5.tgz",
+      "integrity": "sha512-KSzuWCTZlvJsoAenxM9cjTOzNM8mrFxDBInj0KVPz7QU83amGS4rcv1pWO/QGYQcErfskcN84TAdMegaRWWCmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "7.26.0",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -1001,14 +640,15 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "19.0.3",
+        "@angular/compiler": "19.0.5",
         "typescript": ">=5.5 <5.7"
       }
     },
     "node_modules/@angular/core": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.0.3.tgz",
-      "integrity": "sha512-WM844gDzrbHtcM2TJB9DmfCmenUYyNSI6h924CeppDW5oG8ShinQGiWNjF5oI6EZ4tG60uK3QvCm3kjr1dmbOA==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.0.5.tgz",
+      "integrity": "sha512-Ywc6sPO6G/Y1stfk3y/MallV/h0yzQ0vdOHRWueLrk5kD1DTdbolV4X03Cs3PuVvravgcSVE3nnuuHFuH32emQ==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1021,9 +661,10 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.0.3.tgz",
-      "integrity": "sha512-8wf8yDR6cW+lOhpzhmxUOiI5Wjr1Kf7o8NuJ2P5K6b7IMNRzRyR5q/6R4NUwtF6aaJ1wNqmSof+goQmtn1HOcw==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.0.5.tgz",
+      "integrity": "sha512-OhNFkfOoguqCDq07vNBV28FFrmTM8S11Z3Cd6PQZJJF9TgAtpV5KtF7A3eXBCN92W4pmqluomPjfK7YyImzIYQ==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1031,25 +672,27 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "19.0.3",
-        "@angular/core": "19.0.3",
-        "@angular/platform-browser": "19.0.3",
+        "@angular/common": "19.0.5",
+        "@angular/core": "19.0.5",
+        "@angular/platform-browser": "19.0.5",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-19.0.3.tgz",
-      "integrity": "sha512-SkUFggQayulgMWW4rwslLVCD7woZ1m7dCB87NCQdlZv9NIrHbNkaPfxHzaX3YrdKhw+u65XcttzD7cworcMcVQ==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-19.0.5.tgz",
+      "integrity": "sha512-E4WFEsCzHuF3DYe4EfOCiMGW1zWmq3UYi5XXOBNLyzWDvwU5xTfdme6ECXGawHMc2kCaWMVNL4DzYpVsUgLG0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.0.3.tgz",
-      "integrity": "sha512-vggWHSzOsCpYqnGq5IIN+n7xdEvXfgUGaMdgzPhFMTsnlMTUs5+VEFl9tX9FANHkXKB5S1RttVyvEXRqJM9ncQ==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.0.5.tgz",
+      "integrity": "sha512-41+Jo5DEil4Ifvv+UE/p1l9YJtYN+xfhx+/C9cahVgvV5D2q+givyK73d0Mnb6XOfe1q+hoV5lZ+XhQYp21//g==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1057,9 +700,9 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "19.0.3",
-        "@angular/common": "19.0.3",
-        "@angular/core": "19.0.3"
+        "@angular/animations": "19.0.5",
+        "@angular/common": "19.0.5",
+        "@angular/core": "19.0.5"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -1068,9 +711,10 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.0.3.tgz",
-      "integrity": "sha512-gFh+QN7JvepnD3mS0XmOtDmfY8h5sSkk2/guesE2A68Na8q+M3fGZlz7I37tCXToLth5us1X0Gi0UPCSESc4SA==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.0.5.tgz",
+      "integrity": "sha512-KKFdue/uJVxkWdrntRAXkz+ycp4nD3SuGOH5pPf2svCBxieuHuFlWDi+DYVuFSEpC/ICCmlhrtzIAm44A4qzzQ==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1078,16 +722,17 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "19.0.3",
-        "@angular/compiler": "19.0.3",
-        "@angular/core": "19.0.3",
-        "@angular/platform-browser": "19.0.3"
+        "@angular/common": "19.0.5",
+        "@angular/compiler": "19.0.5",
+        "@angular/core": "19.0.5",
+        "@angular/platform-browser": "19.0.5"
       }
     },
     "node_modules/@angular/router": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.0.3.tgz",
-      "integrity": "sha512-L/s8crRC6nj5knmHsnPeOXMNdC7vUOSOvTQonXhmT0FdlP9bPnnRrNeVDnLnd8AzjPSBfIFE2eQw6T8jCwdxMA==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.0.5.tgz",
+      "integrity": "sha512-6tNubVVj/rRyTg+OXjQxACfufvCLHAwDQtv9wqt6q/3OYSnysHTik3ho3FaFPwu7fXJ+6p9Rjzkh2VY9QMk4bw==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1095,16 +740,17 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "19.0.3",
-        "@angular/core": "19.0.3",
-        "@angular/platform-browser": "19.0.3",
+        "@angular/common": "19.0.5",
+        "@angular/core": "19.0.5",
+        "@angular/platform-browser": "19.0.5",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/service-worker": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.0.3.tgz",
-      "integrity": "sha512-MPvAs0lFAyZbwoHQ6NJgvUM1rHA65UhXZjqRJNq2O5k9Ajd4xFkCtp7UuAOaiTgOlo8ecKB1SMWOw+b86N4+oQ==",
+      "version": "19.0.5",
+      "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.0.5.tgz",
+      "integrity": "sha512-qU5lgx1WJ+feCOV/EhkN9m20xFdIslpEQcSZZC+VJnEwcG6VTbofg1dRaHWZ9HAjS1uP7bFoK0HUYu4el0bHGA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1115,8 +761,8 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "19.0.3",
-        "@angular/core": "19.0.3"
+        "@angular/common": "19.0.5",
+        "@angular/core": "19.0.5"
       }
     },
     "node_modules/@awesome-cordova-plugins/core": {
@@ -1451,6 +1097,7 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
       "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -3024,6 +2671,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -3040,6 +2688,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3056,6 +2705,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3072,6 +2722,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3088,6 +2739,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3104,6 +2756,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3120,6 +2773,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -3136,6 +2790,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -3152,6 +2807,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3168,6 +2824,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3184,6 +2841,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3200,6 +2858,7 @@
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3216,6 +2875,7 @@
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3232,6 +2892,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3248,6 +2909,7 @@
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3264,6 +2926,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3280,6 +2943,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3296,6 +2960,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -3312,6 +2977,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -3328,6 +2994,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -3344,6 +3011,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -3360,6 +3028,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3376,6 +3045,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3392,6 +3062,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -4748,6 +4419,7 @@
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
       "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
       },
@@ -4764,6 +4436,7 @@
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.1.tgz",
       "integrity": "sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@jsonjoy.com/base64": "^1.1.1",
         "@jsonjoy.com/util": "^1.1.2",
@@ -4786,6 +4459,7 @@
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz",
       "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
       },
@@ -4806,7 +4480,8 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@listr2/prompt-adapter-inquirer": {
       "version": "2.0.18",
@@ -4852,6 +4527,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -4865,6 +4541,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -4878,6 +4555,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -4891,6 +4569,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -4904,6 +4583,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -4917,6 +4597,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -4930,6 +4611,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -4943,6 +4625,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -4956,6 +4639,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -4969,6 +4653,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -4982,6 +4667,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -4995,6 +4681,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -5005,6 +4692,7 @@
       "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.0.1.tgz",
       "integrity": "sha512-zM0mVWSXE0a0h9aKACLwKmD6nHcRiKrPpCfvaKqG1CqDEyjEawId0ocXxVzPMCAm6kkWr2P025msfxXEnt8UGQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">= 10"
@@ -5040,6 +4728,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -5056,6 +4745,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -5072,6 +4762,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -5088,6 +4779,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -5104,6 +4796,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -5120,6 +4813,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5136,6 +4830,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5152,6 +4847,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5168,6 +4864,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5184,6 +4881,7 @@
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5200,6 +4898,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5216,6 +4915,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5232,6 +4932,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5248,6 +4949,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -5264,6 +4966,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -5280,6 +4983,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -5289,10 +4993,11 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.0.3.tgz",
-      "integrity": "sha512-z2xdbPKdYrKuypsIvCXEgPH1UWBV52JBKfShJB+zZerUWsAVJRqzsqVQKMhbyhbuqT/XJwP6EoVE6ADCGuTj/Q==",
+      "version": "19.0.6",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.0.6.tgz",
+      "integrity": "sha512-eWrIb0tS1CK6+JvFS4GgTD4fN9TtmApKrlaj3pPQXKXKKd42361ec85fuQQXdb4G8eEEq0vyd/bn4NJllh/3vw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
@@ -6186,247 +5891,252 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz",
-      "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.26.0.tgz",
+      "integrity": "sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz",
-      "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.26.0.tgz",
+      "integrity": "sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz",
-      "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.26.0.tgz",
+      "integrity": "sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz",
-      "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.26.0.tgz",
+      "integrity": "sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz",
-      "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.26.0.tgz",
+      "integrity": "sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz",
-      "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.26.0.tgz",
+      "integrity": "sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz",
-      "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.26.0.tgz",
+      "integrity": "sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz",
-      "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.26.0.tgz",
+      "integrity": "sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz",
-      "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.26.0.tgz",
+      "integrity": "sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz",
-      "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.26.0.tgz",
+      "integrity": "sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz",
-      "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz",
-      "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.26.0.tgz",
+      "integrity": "sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz",
-      "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.26.0.tgz",
+      "integrity": "sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz",
-      "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.26.0.tgz",
+      "integrity": "sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz",
-      "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.26.0.tgz",
+      "integrity": "sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz",
-      "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.26.0.tgz",
+      "integrity": "sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz",
-      "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.26.0.tgz",
+      "integrity": "sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz",
-      "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.26.0.tgz",
+      "integrity": "sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz",
-      "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.26.0.tgz",
+      "integrity": "sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -6454,51 +6164,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "19.0.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.6.tgz",
-      "integrity": "sha512-WUWJhzQDsovfMY6jtb9Ktz/5sJszsaErj+XV2aXab85f1OweI/Iv2urPZnJwUSilvVN5Ok/fy3IJ6SuihK4Ceg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
-      "version": "19.0.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.0.6.tgz",
-      "integrity": "sha512-R9hlHfAh1HKoIWgnYJlOEKhUezhTNl0fpUmHxG2252JSY5FLRxmYArTtJYYmbNdBbsBLNg3UHyM/GBPvJSA3NQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "19.0.6",
-        "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.12",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@sigstore/bundle": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.0.0.tgz",
@@ -6748,6 +6413,7 @@
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
       "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -6758,6 +6424,7 @@
       "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
       "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6767,6 +6434,7 @@
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6776,6 +6444,7 @@
       "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
       "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
@@ -6832,6 +6501,7 @@
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
       "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -6840,10 +6510,11 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz",
-      "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.3.tgz",
+      "integrity": "sha512-JEhMNwUJt7bw728CydvYzntD0XJeTmDnvwLlbfbAhE7Tbslm/ax6bdIiUwTgeVlZTsJQPwZwKpAkyDtIjsvx3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -6856,6 +6527,7 @@
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
       "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -6881,7 +6553,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/http-proxy": {
       "version": "1.17.15",
@@ -6945,6 +6618,7 @@
       "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
       "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6971,7 +6645,8 @@
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
       "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/send": {
       "version": "0.17.4",
@@ -6988,6 +6663,7 @@
       "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
       "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
@@ -6997,6 +6673,7 @@
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
       "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
         "@types/node": "*",
@@ -7014,6 +6691,7 @@
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
       "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -7029,21 +6707,23 @@
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
       "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.1.tgz",
-      "integrity": "sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz",
+      "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.18.1",
-        "@typescript-eslint/type-utils": "8.18.1",
-        "@typescript-eslint/utils": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/type-utils": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -7063,15 +6743,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
-      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz",
+      "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.1",
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/typescript-estree": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/typescript-estree": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -7086,41 +6767,16 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
-      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
+      "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
-      "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7130,13 +6786,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.1.tgz",
-      "integrity": "sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz",
+      "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.18.1",
-        "@typescript-eslint/utils": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -7166,13 +6823,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
-      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz",
+      "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -7191,29 +6849,17 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.1.tgz",
-      "integrity": "sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz",
+      "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.18.1",
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/typescript-estree": "8.18.1"
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/typescript-estree": "8.19.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7227,26 +6873,14 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
-      "integrity": "sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz",
+      "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/types": "8.19.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -7257,24 +6891,12 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
       "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.6.0"
       },
@@ -7661,6 +7283,7 @@
       "engines": [
         "node >= 0.8.0"
       ],
+      "license": "Apache-2.0",
       "bin": {
         "ansi-html": "bin/ansi-html"
       }
@@ -7762,7 +7385,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/array-ify": {
       "version": "1.0.0",
@@ -8152,13 +7776,15 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/beasties": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.1.0.tgz",
       "integrity": "sha512-+Ssscd2gVG24qRNC+E2g88D+xsQW4xwakWtKAiGEQ3Pw54/FGdyo9RrfxhGhEv6ilFVbB7r3Lgx+QnAxnSpECw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "css-select": "^5.1.0",
         "css-what": "^6.1.0",
@@ -8175,6 +7801,7 @@
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
       "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.1.0",
@@ -8191,6 +7818,7 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
       "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.2",
@@ -8205,6 +7833,7 @@
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
       "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.3.0"
       },
@@ -8216,10 +7845,11 @@
       }
     },
     "node_modules/beasties/node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.1.tgz",
+      "integrity": "sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
@@ -8234,6 +7864,7 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -8337,6 +7968,7 @@
       "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
       "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "multicast-dns": "^7.2.5"
@@ -8465,6 +8097,7 @@
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
       "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "run-applescript": "^7.0.0"
       },
@@ -9156,6 +8789,7 @@
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
       },
@@ -9168,6 +8802,7 @@
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
       "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "compressible": "~2.0.18",
@@ -9186,6 +8821,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -9194,13 +8830,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/compression/node_modules/negotiator": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
       "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9231,6 +8869,7 @@
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -9255,6 +8894,7 @@
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -9523,7 +9163,8 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cookiejar": {
       "version": "2.1.4",
@@ -10295,6 +9936,7 @@
       "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
       "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bundle-name": "^4.1.0",
         "default-browser-id": "^5.0.0"
@@ -10311,6 +9953,7 @@
       "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
       "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -10351,6 +9994,7 @@
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
       "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -10524,7 +10168,8 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/dezalgo": {
       "version": "1.0.4",
@@ -10577,6 +10222,7 @@
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
       "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
       },
@@ -11084,6 +10730,7 @@
       "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -11618,6 +11265,7 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -11686,6 +11334,7 @@
       "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
       "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -11732,6 +11381,7 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
       "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -11741,6 +11391,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -11750,6 +11401,7 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11759,6 +11411,7 @@
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
       "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~2.0.0",
@@ -11776,13 +11429,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/express/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,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11907,6 +11562,7 @@
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
@@ -12159,6 +11815,7 @@
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -12181,6 +11838,7 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -12727,7 +12385,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/handlebars": {
       "version": "4.7.8",
@@ -12904,6 +12563,7 @@
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
       "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -12915,13 +12575,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/hpack.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,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -12936,13 +12598,15 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/hpack.js/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,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -12961,7 +12625,8 @@
           "type": "patreon",
           "url": "https://patreon.com/mdevils"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
@@ -12981,6 +12646,7 @@
           "url": "https://github.com/sponsors/fb55"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.3",
@@ -12993,6 +12659,7 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
       "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.2",
@@ -13007,6 +12674,7 @@
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
       "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.3.0"
       },
@@ -13018,10 +12686,11 @@
       }
     },
     "node_modules/htmlparser2/node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.1.tgz",
+      "integrity": "sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
@@ -13036,6 +12705,7 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -13053,7 +12723,8 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
       "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
@@ -13084,7 +12755,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
@@ -13157,6 +12829,7 @@
       "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
       "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.18"
       }
@@ -13407,6 +13080,7 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
       "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -13566,6 +13240,7 @@
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
       "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -13641,6 +13316,7 @@
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
       "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^3.0.0"
       },
@@ -13691,6 +13367,7 @@
       "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
       "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=16"
       },
@@ -13956,6 +13633,7 @@
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
       "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-inside-container": "^1.0.0"
       },
@@ -14013,6 +13691,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -14744,6 +14423,7 @@
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
       "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picocolors": "^1.0.0",
         "shell-quote": "^1.8.1"
@@ -15028,6 +14708,7 @@
       "integrity": "sha512-46Mch5Drq+A93Ss3gtbg+Xuvf5BOgIuvhKDWoGa3HcPHI6BL2NCOkRdSx1D4VfzwrxhnsjbyIVsLRlQHu6URvw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "msgpackr": "^1.11.2",
@@ -15053,6 +14734,7 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
       "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/load-json-file": {
@@ -15564,10 +15246,11 @@
       }
     },
     "node_modules/memfs": {
-      "version": "4.15.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.15.0.tgz",
-      "integrity": "sha512-q9MmZXd2rRWHS6GU3WEm3HyiXZyyoA1DqdOhEq0lxPBmKb5S7IAOwX0RgUCwJfqjelDCySa5h8ujOy24LqsWcw==",
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.15.2.tgz",
+      "integrity": "sha512-n8/qP8AT6CtY6kxCPYgYVusT5rS6axaT66dD3tYi2lm+l1iMH7YYpmW8H/qL5bfV4YvInCCgUDAWIRvrNS7kbQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@jsonjoy.com/json-pack": "^1.0.3",
         "@jsonjoy.com/util": "^1.3.0",
@@ -15753,6 +15436,7 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
       "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -15924,7 +15608,8 @@
       "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
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/minimatch": {
       "version": "9.0.5",
@@ -16172,6 +15857,7 @@
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
       "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -16187,6 +15873,7 @@
       "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz",
       "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "optionalDependencies": {
         "msgpackr-extract": "^3.0.2"
@@ -16198,6 +15885,7 @@
       "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "node-gyp-build-optional-packages": "5.2.2"
@@ -16219,6 +15907,7 @@
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
@@ -16455,6 +16144,7 @@
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true,
+      "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
       }
@@ -16488,6 +16178,7 @@
       "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
       "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.1"
@@ -16503,6 +16194,7 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
       "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -16903,7 +16595,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
@@ -16922,6 +16615,7 @@
       "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,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -16954,6 +16648,7 @@
       "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
       "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "default-browser": "^5.2.1",
         "define-lazy-prop": "^3.0.0",
@@ -17011,6 +16706,7 @@
       "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
       "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/os-name": {
@@ -17085,6 +16781,7 @@
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
       "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.2",
         "is-network-error": "^1.0.0",
@@ -17102,6 +16799,7 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -17259,6 +16957,7 @@
       "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz",
       "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "entities": "^4.3.0",
         "parse5": "^7.0.0",
@@ -17273,6 +16972,7 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -17285,6 +16985,7 @@
       "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz",
       "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parse5": "^7.0.0"
       },
@@ -17372,7 +17073,8 @@
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
       "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "5.0.0",
@@ -17424,6 +17126,7 @@
       "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.7.0.tgz",
       "integrity": "sha512-b8hvkpp9zS0zsfa939b/jXbe64Z2gZv0Ha7FYPNUiDIB1y2AtxcOZdfP8xN8HFjUaqQiT9gRlfjAsoL8vdJ1Iw==",
       "dev": true,
+      "license": "MIT",
       "optionalDependencies": {
         "@napi-rs/nice": "^1.0.1"
       }
@@ -17620,7 +17323,8 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
       "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/postcss-modules-extract-imports": {
       "version": "3.1.0",
@@ -17854,6 +17558,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,
+      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -17867,6 +17572,7 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
@@ -18258,7 +17964,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
       "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.8",
@@ -18823,10 +18530,11 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz",
-      "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.26.0.tgz",
+      "integrity": "sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -18838,25 +18546,24 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.28.1",
-        "@rollup/rollup-android-arm64": "4.28.1",
-        "@rollup/rollup-darwin-arm64": "4.28.1",
-        "@rollup/rollup-darwin-x64": "4.28.1",
-        "@rollup/rollup-freebsd-arm64": "4.28.1",
-        "@rollup/rollup-freebsd-x64": "4.28.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.28.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.28.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.28.1",
-        "@rollup/rollup-linux-arm64-musl": "4.28.1",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.28.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.28.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.28.1",
-        "@rollup/rollup-linux-x64-gnu": "4.28.1",
-        "@rollup/rollup-linux-x64-musl": "4.28.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.28.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.28.1",
-        "@rollup/rollup-win32-x64-msvc": "4.28.1",
+        "@rollup/rollup-android-arm-eabi": "4.26.0",
+        "@rollup/rollup-android-arm64": "4.26.0",
+        "@rollup/rollup-darwin-arm64": "4.26.0",
+        "@rollup/rollup-darwin-x64": "4.26.0",
+        "@rollup/rollup-freebsd-arm64": "4.26.0",
+        "@rollup/rollup-freebsd-x64": "4.26.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.26.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.26.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.26.0",
+        "@rollup/rollup-linux-arm64-musl": "4.26.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.26.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.26.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.26.0",
+        "@rollup/rollup-linux-x64-gnu": "4.26.0",
+        "@rollup/rollup-linux-x64-musl": "4.26.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.26.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.26.0",
+        "@rollup/rollup-win32-x64-msvc": "4.26.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -18874,6 +18581,7 @@
       "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
       "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -19092,13 +18800,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
       "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
       "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
@@ -19124,6 +18834,7 @@
       "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
       "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -19148,6 +18859,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -19156,13 +18868,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -19175,6 +18889,7 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -19193,6 +18908,7 @@
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -19211,6 +18927,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -19220,6 +18937,7 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -19229,6 +18947,7 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -19243,25 +18962,29 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "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
+      "dev": true,
+      "license": "MIT"
     },
     "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
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/serve-static": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
       "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
@@ -19277,6 +19000,7 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -19401,6 +19125,7 @@
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
       "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -19740,6 +19465,7 @@
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
       "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
@@ -19751,6 +19477,7 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -19893,6 +19620,7 @@
       "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
       "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "handle-thing": "^2.0.0",
@@ -19909,6 +19637,7 @@
       "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "detect-node": "^2.0.4",
@@ -20612,6 +20341,7 @@
       "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
       "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
       "dev": true,
+      "license": "Unlicense",
       "engines": {
         "node": ">=10.18"
       },
@@ -20638,7 +20368,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tmp": {
       "version": "0.2.3",
@@ -20681,6 +20412,7 @@
       "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz",
       "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
       },
@@ -21334,6 +21066,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
       "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -21396,6 +21129,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -21412,6 +21146,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -21428,6 +21163,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -21444,6 +21180,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -21460,6 +21197,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -21476,6 +21214,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -21492,6 +21231,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -21508,6 +21248,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -21524,6 +21265,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21540,6 +21282,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21556,6 +21299,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21572,6 +21316,7 @@
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21588,6 +21333,7 @@
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21604,6 +21350,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21620,6 +21367,7 @@
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21636,6 +21384,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21652,6 +21401,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -21668,6 +21418,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -21684,6 +21435,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -21700,6 +21452,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -21716,6 +21469,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -21732,6 +21486,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -21748,6 +21503,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -21762,6 +21518,7 @@
       "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -21821,6 +21578,7 @@
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimalistic-assert": "^1.0.0"
       }
@@ -21838,6 +21596,7 @@
       "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
       "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/webidl-conversions": {
@@ -21897,6 +21656,7 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
       "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^4.6.0",
@@ -21926,6 +21686,7 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz",
       "integrity": "sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.13",
         "@types/connect-history-api-fallback": "^1.5.4",
@@ -21983,6 +21744,7 @@
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -22007,6 +21769,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -22019,6 +21782,7 @@
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
       "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -22043,6 +21807,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -22055,6 +21820,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -22067,6 +21833,7 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -22079,6 +21846,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -22221,6 +21989,7 @@
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -22235,6 +22004,7 @@
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
       }
diff --git a/ui/package.json b/ui/package.json
index b8b4fb3e705..578f92b4806 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,16 +4,16 @@
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
-    "@angular/animations": "19.0.3",
-    "@angular/common": "19.0.3",
-    "@angular/core": "19.0.3",
-    "@angular/forms": "19.0.3",
-    "@angular/platform-browser": "19.0.3",
-    "@angular/platform-browser-dynamic": "19.0.3",
-    "@angular/router": "19.0.3",
-    "@angular/service-worker": "19.0.3",
-    "@awesome-cordova-plugins/core": "^6.12.0",
-    "@awesome-cordova-plugins/file-opener": "^6.12.0",
+    "@angular/animations": "19.0.5",
+    "@angular/common": "19.0.5",
+    "@angular/core": "19.0.5",
+    "@angular/forms": "19.0.5",
+    "@angular/platform-browser": "19.0.5",
+    "@angular/platform-browser-dynamic": "19.0.5",
+    "@angular/router": "19.0.5",
+    "@angular/service-worker": "19.0.5",
+    "@awesome-cordova-plugins/core": "^6.13.0",
+    "@awesome-cordova-plugins/file-opener": "^6.13.0",
     "@capacitor-community/file-opener": "^6.0.1",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.2",
@@ -52,17 +52,17 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^19.0.3",
-    "@angular-devkit/core": "^19.0.5",
-    "@angular-devkit/schematics": "^19.0.5",
+    "@angular-devkit/build-angular": "^19.0.6",
+    "@angular-devkit/core": "^19.0.6",
+    "@angular-devkit/schematics": "^19.0.6",
     "@angular-eslint/builder": "^19.0.2",
     "@angular-eslint/eslint-plugin": "^19.0.2",
     "@angular-eslint/eslint-plugin-template": "^19.0.2",
     "@angular-eslint/template-parser": "^19.0.2",
-    "@angular/cli": "^19.0.5",
-    "@angular/compiler": "19.0.3",
-    "@angular/compiler-cli": "19.0.3",
-    "@angular/language-service": "19.0.3",
+    "@angular/cli": "^19.0.6",
+    "@angular/compiler": "19.0.5",
+    "@angular/compiler-cli": "19.0.5",
+    "@angular/language-service": "19.0.5",
     "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "6.2.0",
     "@ionic/angular-toolkit": "^12.1.1",
@@ -77,10 +77,10 @@
     "@types/range-parser": "^1.2.7",
     "@types/send": "^0.17.4",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.18.0",
-    "@typescript-eslint/parser": "^8.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.19.0",
     "@typescript-eslint/types": "^8.19.0",
-    "eslint": "^9.16.0",
+    "eslint": "^9.17.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",
     "eslint-plugin-import": "^2.31.0",

From 2b55fa460d2d412a5565e7de14236126fd2a7ece Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Wed, 1 Jan 2025 17:16:30 +0100
Subject: [PATCH 28/49] Push version to 2025.1.0

---
 io.openems.common/src/io/openems/common/OpenemsConstants.java | 2 +-
 ui/package-lock.json                                          | 4 ++--
 ui/package.json                                               | 2 +-
 ui/src/app/changelog/view/component/changelog.constants.ts    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java
index b1f740a86c5..9e7cf71367f 100644
--- a/io.openems.common/src/io/openems/common/OpenemsConstants.java
+++ b/io.openems.common/src/io/openems/common/OpenemsConstants.java
@@ -36,7 +36,7 @@ public class OpenemsConstants {
 	/**
 	 * The additional version string.
 	 */
-	public static final String VERSION_STRING = "SNAPSHOT";
+	public static final String VERSION_STRING = "";
 
 	/**
 	 * The complete version as a SemanticVersion.
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 239a3415054..a48a50f5b8b 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "openems-ui",
-  "version": "2025.1.0-SNAPSHOT",
+  "version": "2025.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "openems-ui",
-      "version": "2025.1.0-SNAPSHOT",
+      "version": "2025.1.0",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "19.0.5",
diff --git a/ui/package.json b/ui/package.json
index 578f92b4806..9470ce7a696 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openems-ui",
-  "version": "2025.1.0-SNAPSHOT",
+  "version": "2025.1.0",
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
diff --git a/ui/src/app/changelog/view/component/changelog.constants.ts b/ui/src/app/changelog/view/component/changelog.constants.ts
index f1d4189c47b..9b4f6bf340e 100644
--- a/ui/src/app/changelog/view/component/changelog.constants.ts
+++ b/ui/src/app/changelog/view/component/changelog.constants.ts
@@ -2,7 +2,7 @@ import { Role } from "src/app/shared/type/role";
 
 export class Changelog {
 
-    public static readonly UI_VERSION = "2025.1.0-SNAPSHOT";
+    public static readonly UI_VERSION = "2025.1.0";
 
     public static product(...products: Product[]) {
         return products.map(product => Changelog.link(product.name, product.url)).join(", ") + ". ";

From 5eae9c57fdceb87570c8c793b3f3b7f4db062835 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Wed, 1 Jan 2025 17:28:57 +0100
Subject: [PATCH 29/49] Start development of 2025.2.0-SNAPSHOT

---
 io.openems.common/src/io/openems/common/OpenemsConstants.java | 4 ++--
 ui/package-lock.json                                          | 4 ++--
 ui/package.json                                               | 2 +-
 ui/src/app/changelog/view/component/changelog.constants.ts    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java
index 9e7cf71367f..3d6116e121b 100644
--- a/io.openems.common/src/io/openems/common/OpenemsConstants.java
+++ b/io.openems.common/src/io/openems/common/OpenemsConstants.java
@@ -22,7 +22,7 @@ public class OpenemsConstants {
 	 * <p>
 	 * This is the month of the release.
 	 */
-	public static final short VERSION_MINOR = 1;
+	public static final short VERSION_MINOR = 2;
 
 	/**
 	 * The patch version of OpenEMS.
@@ -36,7 +36,7 @@ public class OpenemsConstants {
 	/**
 	 * The additional version string.
 	 */
-	public static final String VERSION_STRING = "";
+	public static final String VERSION_STRING = "SNAPSHOT";
 
 	/**
 	 * The complete version as a SemanticVersion.
diff --git a/ui/package-lock.json b/ui/package-lock.json
index a48a50f5b8b..98a1ea01792 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "openems-ui",
-  "version": "2025.1.0",
+  "version": "2025.2.0-SNAPSHOT",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "openems-ui",
-      "version": "2025.1.0",
+      "version": "2025.2.0-SNAPSHOT",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "19.0.5",
diff --git a/ui/package.json b/ui/package.json
index 9470ce7a696..1de4641ae07 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openems-ui",
-  "version": "2025.1.0",
+  "version": "2025.2.0-SNAPSHOT",
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
diff --git a/ui/src/app/changelog/view/component/changelog.constants.ts b/ui/src/app/changelog/view/component/changelog.constants.ts
index 9b4f6bf340e..77596a0f31f 100644
--- a/ui/src/app/changelog/view/component/changelog.constants.ts
+++ b/ui/src/app/changelog/view/component/changelog.constants.ts
@@ -2,7 +2,7 @@ import { Role } from "src/app/shared/type/role";
 
 export class Changelog {
 
-    public static readonly UI_VERSION = "2025.1.0";
+    public static readonly UI_VERSION = "2025.2.0-SNAPSHOT";
 
     public static product(...products: Product[]) {
         return products.map(product => Changelog.link(product.name, product.url)).join(", ") + ". ";

From 8d409659c697648892d19c611651ffbfd16a8ad8 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Thu, 2 Jan 2025 19:24:06 +0100
Subject: [PATCH 30/49] General Cleanup (#2949)

- Apply Eclipse AutoFormat and Organize Inputs globally
- Use more static imports
- Update year of copyright
- Move some TestUtils and JSCalendar to common
---
 .woodpecker/ui-build.yml                      |   80 -
 README.md                                     |    4 +-
 .../alerting/scheduler/TimedExecutor.java     |    2 +-
 .../openems/backend/alerting/MessageTest.java |    2 +-
 .../common/jscalendar}/JSCalendar.java        |   13 +-
 .../common/jscalendar/package-info.java       |   11 +
 .../io/openems/common/oem/OpenemsEdgeOem.java |    2 +-
 .../src/io/openems/common/test/TestUtils.java |   35 +
 .../common/timedata/XlsxExportDetailData.java |    3 +-
 .../common/timedata/XlsxWorksheetWrapper.java |    2 +-
 .../common/jscalendar}/JSCalendarTest.java    |   13 +-
 .../BatteryFeneconCommercialImplTest.java     |    2 +-
 .../home/BatteryFeneconHomeImplTest.java      |    2 +-
 .../soltaro/cluster/versionb/SingleRack.java  |  137 +-
 .../blueplanetgridsave/KacoSunSpecModel.java  |    3 +-
 ...nverterKacoBlueplanetGridsaveImplTest.java |   15 +-
 .../http/dummy/DummyBridgeHttpExecutor.java   |    2 +-
 .../bridge/http/api/BridgeHttpTimeTest.java   |    2 +-
 .../modbus/sunspec/DefaultSunSpecModel.java   | 2259 +++++++++--------
 .../modbus/BridgeModbusTcpImplTest.java       |    4 +-
 .../internal/DefectiveComponentsTest.java     |    2 +-
 .../internal/TasksSupplierImplTest.java       |    2 +-
 .../AbstractOpenemsSunSpecComponentTest.java  |    4 +-
 .../onewire/adapter/UAdapterState.java        |    6 +-
 .../onewire/impl/BridgeOnewireImpl.java       |    3 +-
 .../edge/common/currency/Currency.java        |    1 -
 .../src/io/openems/edge/common/host/Host.java |    2 +-
 .../common/jsonapi/MultipleJsonApiBinder.java |    4 +-
 .../common/test/DummyComponentManager.java    |    8 +-
 .../openems/edge/common/test/TestUtils.java   |   29 -
 .../openems/edge/common/jsonapi/CallTest.java |    4 +-
 .../edge/common/type/QuarterlyValuesTest.java |   11 +-
 .../api/backend/SendChannelValuesWorker.java  |    2 +-
 .../edge/controller/api/common/Status.java    |    5 -
 .../controller/api/common/WriteObject.java    |    2 +-
 .../common/handler/QueryRequestHandler.java   |    7 +-
 .../ControllerApiModbusTcpReadOnlyImpl.java   |   10 +-
 .../api/modbus/readwrite/Config.java          |    2 +-
 .../ControllerApiModbusTcpReadWrite.java      |   11 +-
 .../api/modbus/readwrite/MyConfig.java        |    4 +-
 .../ControllerApiRestReadOnlyImplTest.java    |    5 +-
 .../ControllerApiRestReadWriteImplTest.java   |    3 +-
 .../websocket/handler/EdgeRequestHandler.java |    3 +-
 .../statemachine/StateMachine.java            |   21 +-
 .../statemachine/DeactivationTimeHandler.java |    2 +-
 ...ontrollerFastFrequencyReserveImplTest.java |    2 +-
 ...lerEssHybridSurplusFeedToGridImplTest.java |    2 +-
 .../controller/ess/limiter14a/Config.java     |    2 +-
 .../controller/ess/limiter14a/MyConfig.java   |    4 +-
 ...trollerEssLimitTotalDischargeImplTest.java |    2 +-
 ...ivePowerVoltageCharacteristicImplTest.java |    2 +-
 .../TimeOfUseTariffControllerImplTest.java    |    2 +-
 .../openems/edge/controller/evcs/Utils.java   |    3 +-
 .../evcs/ControllerEvcsImplTest.java          |    2 +-
 .../io/analog/MyControllerTest.java           |    2 +-
 .../ControllerHeatingElementImplTest4.java    |   15 +-
 .../ControllerIoHeatingElementImplTest.java   |    2 +-
 .../ControllerIoHeatPumpSgReadyImplTest.java  |    2 +-
 .../app/common/props/CommunicationProps.java  |   21 +-
 .../openems/edge/app/evcs/AlpitronicEvcs.java |    5 +-
 .../core/appmanager/OpenemsAppCategory.java   |    2 +-
 .../edge/core/host/OperatingSystem.java       |    2 +-
 .../edge/core/host/OperatingSystemMac.java    |    2 +-
 .../core/host/OperatingSystemWindows.java     |    2 +-
 .../core/host/jsonrpc/GetIpAddresses.java     |    4 +-
 .../TestFeneconHome10Gen2.java                |    3 +-
 .../io/openems/edge/core/meta/MyConfig.java   |    2 +-
 .../PredictorManagerImplTest.java             |    2 +-
 .../edge/core/sum/ExtremeEverValuesTest.java  |    2 +-
 .../test/DummyGlobalSimulationsContext.java   |    4 +-
 .../edge/energy/optimizer/Optimizer.java      |   21 +-
 .../edge/energy/EnergySchedulerImplTest.java  |    2 +-
 .../optimizer/InitialPopulationTest.java      |    2 +-
 .../edge/energy/optimizer/OptimizerTest.java  |    2 +-
 .../edge/energy/optimizer/UtilsTest.java      |    2 +-
 .../optimizer/app/RunOptimizerFromLogApp.java |    4 +-
 .../energy/v1/optimizer/EnergyFlowV1Test.java |    4 +-
 .../ess/core/power/NearEqualSolverTest.java   |    1 -
 .../src/io/openems/edge/evcs/api/Evcs.java    |    3 +-
 .../evcs/api/AbstractManagedEvcsTest.java     |    6 +-
 .../keba/kecontact/EvcsKebaKeContact.java     |    2 +-
 .../evcs/keba/kecontact/ReadWorkerTest.java   |    2 +-
 .../io/openems/edge/goodwe/common/GoodWe.java |    2 +-
 .../GoodWeBatteryInverterImplTest.java        |    4 +-
 .../io/shelly/shellyplusplugs/Config.java     |    2 +-
 .../edge/io/shelly/shellypro3/Config.java     |    4 +-
 .../edge/io/shelly/shellypro3em/Config.java   |   15 +-
 .../em300/MeterCarloGavazziEm300ImplTest.java |    4 +-
 .../meter/carlo/gavazzi/em300/MyConfig.java   |    2 +-
 .../api/test/DummyPredictorManagerTest.java   |    2 +-
 .../api/test/DummyPredictorTest.java          |    2 +-
 .../PredictorPersistenceModelImplTest.java    |    2 +-
 .../daily/SchedulerDailyImplTest.java         |    2 +-
 .../api/utils/ExchangeRateApiTest.java        |    3 +-
 .../timeofusetariff/entsoe/ParserTest.java    |    4 +-
 .../groupe/TimeOfUseTariffGroupeImplTest.java |    2 +-
 .../edge/timeofusetariff/hassfurt/Config.java |    2 +-
 .../timeofusetariff/hassfurt/TariffType.java  |    2 +-
 .../TimeOfUseTariffHassfurtImplTest.java      |    2 +-
 .../TimeOfUseTariffRabotChargeImplTest.java   |   25 +-
 .../TimeOfUseTariffSwisspowerImplTest.java    |    6 +-
 101 files changed, 1512 insertions(+), 1465 deletions(-)
 delete mode 100644 .woodpecker/ui-build.yml
 rename {io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs => io.openems.common/src/io/openems/common/jscalendar}/JSCalendar.java (97%)
 create mode 100644 io.openems.common/src/io/openems/common/jscalendar/package-info.java
 create mode 100644 io.openems.common/src/io/openems/common/test/TestUtils.java
 rename {io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs => io.openems.common/test/io/openems/common/jscalendar}/JSCalendarTest.java (90%)

diff --git a/.woodpecker/ui-build.yml b/.woodpecker/ui-build.yml
deleted file mode 100644
index 224fc19ad14..00000000000
--- a/.woodpecker/ui-build.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-variables:
-  - &sftp-settings
-    server: ${CACHE_SERVER}
-    username: user
-    password: pass
-    ignore_branch: true
-    port: 2222
-    path: /cache
-    mount:
-      - cache
-
-  - &rsync-settings
-    user: fenecon-docs
-    hosts:
-      - ${ARTIFACT_SERVER}
-    port: 22
-    key:
-      from_secret: ssh_key_intranet
-    args: '-v'
-
-  - &main-build
-    - branch: [main, develop]
-    - evaluate: 'CI_COMMIT_MESSAGE contains "[APP]"'
-    - path:
-        include: ['.woodpecker/ui-build.yml']
-        on_empty: false
-
-when:
-  event:
-    - push
-
-matrix:
-  THEME:
-    - fenecon
-    - heckert
-
-clone:
-  git:
-    when: *main-build
-    image: woodpeckerci/plugin-git
-
-steps:
-  restore-cache:
-    when: *main-build
-    image: appleboy/drone-sftp-cache
-    settings:
-      restore: true
-      <<: *sftp-settings
-
-  prepare-environment:
-    when: *main-build
-    image: openems-bash
-    commands:
-      - export CACHE=$CI_WORKSPACE/cache
-      - mkdir -p $CI_WORKSPACE/cache build/target
-      - source tools/common.sh
-      - common_initialize_environment
-      - common_build_snapshot_version
-      - common_save_environment $CI_WORKSPACE/.openems-env
-    depends_on: [restore-cache]
-
-  build-android-app:
-    when: *main-build
-    image: openems-android:20.32
-    environment:
-      - THEME=${THEME}
-    commands:
-      - source $CI_WORKSPACE/.openems-env
-      - source tools/common.sh
-      - common_build_android_app
-    depends_on: [prepare-environment]
-
-  refresh-dev-android:
-    when: *main-build
-    image: woodpeckerci/rsync:latest
-    settings:
-      <<: *rsync-settings
-      source: $CI_WORKSPACE/ui/android/target/
-      target: /var/opt/develop/fems-artifacts/html/${CI_COMMIT_BRANCH}
-    depends_on: [build-android-app]
diff --git a/README.md b/README.md
index 519047007e3..b1ad40deb8a 100644
--- a/README.md
+++ b/README.md
@@ -80,14 +80,14 @@ If you use OpenEMS in your scientific research, please use our Zenodo Digital Ob
 * OpenEMS Edge 
 * OpenEMS Backend
 
-Copyright (C) 2016-2022 OpenEMS Association e.V.
+Copyright (C) 2016-2025 OpenEMS Association e.V.
 
 This product includes software developed at FENECON GmbH: you can
 redistribute it and/or modify it under the terms of the [Eclipse Public License version 2.0](LICENSE-EPL-2.0). 
 
  * OpenEMS UI
 
-Copyright (C) 2016-2022 OpenEMS Association e.V.
+Copyright (C) 2016-2025 OpenEMS Association e.V.
 
 This product includes software developed at FENECON GmbH: you can
 redistribute it and/or modify it under the terms of the [GNU Affero General Public License version 3](LICENSE-AGPL-3.0).
diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java
index debb78c6cbf..ba255e80876 100644
--- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java
+++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java
@@ -16,7 +16,7 @@ public TimedTask(ZonedDateTime executeAt, Consumer<ZonedDateTime> task) {
 
 		@Override
 		public int compareTo(TimedTask other) {
-			if (other == null  || other.executeAt == null) {
+			if (other == null || other.executeAt == null) {
 				return 1;
 			}
 			return this.executeAt.compareTo(other.executeAt);
diff --git a/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java b/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java
index d1e2296f3c2..132858e15ab 100644
--- a/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java
+++ b/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java
@@ -35,7 +35,7 @@ public void testMessage() {
 
 		assertTrue("msg10 should be greater than msg11", msg10.compareTo(msg11) > 0);
 		assertTrue("msg10 should be lower than msg20", msg10.compareTo(msg20) < 0);
-		
+
 		assertTrue("msg10 should be greater than null", msg10.compareTo(null) > 0);
 	}
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java b/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
similarity index 97%
rename from io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
rename to io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
index ab9fcbf39b9..fcf4e8f06ec 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
+++ b/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
@@ -1,7 +1,8 @@
-package io.openems.edge.controller.evcs;
+package io.openems.common.jscalendar;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
+import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static io.openems.common.utils.JsonUtils.getAsEnum;
 import static io.openems.common.utils.JsonUtils.getAsJsonArray;
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
@@ -11,7 +12,6 @@
 import static io.openems.common.utils.JsonUtils.getAsZonedDateTime;
 import static io.openems.common.utils.JsonUtils.stream;
 import static io.openems.common.utils.JsonUtils.toJsonArray;
-import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static java.time.DayOfWeek.FRIDAY;
 import static java.time.DayOfWeek.MONDAY;
 import static java.time.DayOfWeek.SATURDAY;
@@ -47,13 +47,12 @@
 import io.openems.common.utils.JsonUtils;
 
 /**
- * This implementation is based on RFC 8984 "JSCalendar: A JSON Representation
- * of Calendar Data".
+ * Implementation of RFC 8984 "JSCalendar: A JSON Representation of Calendar
+ * Data".
  * 
  * <p>
- * 
- * @link <a href=
- *       "https://www.rfc-editor.org/rfc/rfc8984.html">https://www.rfc-editor.org/rfc/rfc8984.html</a>
+ * See <a href=
+ * "https://www.rfc-editor.org/rfc/rfc8984.html">https://www.rfc-editor.org/rfc/rfc8984.html</a>
  */
 // CHECKSTYLE:OFF
 public class JSCalendar<PAYLOAD> {
diff --git a/io.openems.common/src/io/openems/common/jscalendar/package-info.java b/io.openems.common/src/io/openems/common/jscalendar/package-info.java
new file mode 100644
index 00000000000..0d681ebdb59
--- /dev/null
+++ b/io.openems.common/src/io/openems/common/jscalendar/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Implementation of RFC 8984 "JSCalendar: A JSON Representation of Calendar
+ * Data".
+ * 
+ * <p>
+ * See <a href=
+ * "https://www.rfc-editor.org/rfc/rfc8984.html">https://www.rfc-editor.org/rfc/rfc8984.html</a>
+ */
+@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.bundle.Export
+package io.openems.common.jscalendar;
diff --git a/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java b/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java
index ef291a2c75c..a4a0c63c948 100644
--- a/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java
+++ b/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java
@@ -141,7 +141,7 @@ public record OAuthClientRegistration(String clientId, String clientSecret) {
 	public default OAuthClientRegistration getRabotChargeCredentials() {
 		return null;
 	}
-	
+
 	/**
 	 * Gets the OEM authorization for Battery.BMW.
 	 * 
diff --git a/io.openems.common/src/io/openems/common/test/TestUtils.java b/io.openems.common/src/io/openems/common/test/TestUtils.java
new file mode 100644
index 00000000000..36ccf762ed7
--- /dev/null
+++ b/io.openems.common/src/io/openems/common/test/TestUtils.java
@@ -0,0 +1,35 @@
+package io.openems.common.test;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.time.Instant;
+
+public class TestUtils {
+
+	private TestUtils() {
+	}
+
+	/**
+	 * Creates a {@link TimeLeapClock} for 1st January 2000 00:00.
+	 * 
+	 * @return the {@link TimeLeapClock}
+	 */
+	public static TimeLeapClock createDummyClock() {
+		return new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */);
+	}
+
+	/**
+	 * Finds and returns an open port.
+	 *
+	 * <p>
+	 * Source https://stackoverflow.com/a/26644672
+	 *
+	 * @return an open port
+	 * @throws IOException on error
+	 */
+	public static int findRandomOpenPortOnAllLocalInterfaces() throws IOException {
+		try (var socket = new ServerSocket(0);) {
+			return socket.getLocalPort();
+		}
+	}
+}
diff --git a/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java b/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java
index 199bc345846..94e40fafe63 100644
--- a/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java
+++ b/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java
@@ -11,8 +11,7 @@
 
 public record XlsxExportDetailData(//
 		EnumMap<XlsxExportCategory, List<XlsxExportDataEntry>> data, //
-		CurrencyConfig currency
-) {
+		CurrencyConfig currency) {
 
 	public Map<HistoricTimedataSaveType, List<ChannelAddress>> getChannelsBySaveType() {
 		return this.data().values().stream().flatMap(List::stream).collect(Collectors.groupingBy(
diff --git a/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java b/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java
index faec99a684a..a39b7742d6c 100644
--- a/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java
+++ b/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java
@@ -38,7 +38,7 @@ public void setForRange(int r1, int c1, int r2, int c2, Consumer<XlsxCellWrapper
 		for (int row = r1; row <= r2; row++) {
 			for (int col = c1; col <= c2; col++) {
 				var cell = this.getCellWrapper(row, col);
-				styleSetterFunc.accept(cell);;
+				styleSetterFunc.accept(cell);
 			}
 		}
 	}
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java b/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
similarity index 90%
rename from io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
rename to io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
index defe0bf80cb..73061feb84a 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
+++ b/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
@@ -1,10 +1,10 @@
-package io.openems.edge.controller.evcs;
+package io.openems.common.jscalendar;
 
+import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.WEEKLY;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.common.utils.JsonUtils.buildJsonObject;
 import static io.openems.common.utils.JsonUtils.prettyToString;
 import static io.openems.common.utils.UuidUtils.getNilUuid;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
-import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static java.time.DayOfWeek.FRIDAY;
 import static java.time.DayOfWeek.MONDAY;
 import static java.time.DayOfWeek.SATURDAY;
@@ -22,6 +22,7 @@
 import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.utils.JsonUtils;
 
 //CHECKSTYLE:OFF
 public class JSCalendarTest {
@@ -78,8 +79,10 @@ public void testWeekday() throws OpenemsNamedException {
 		assertEquals("2024-06-24T07:00Z", next.toString()); // same
 
 		// Parse JSON
-		var fromJson = JSCalendar.Task.fromJson(sut.toJson(identity()), identity());
-		assertEquals(sut.toJson(identity()), fromJson.toJson(identity()));
+		var fromJson = JSCalendar.Task.fromJson(JsonUtils.buildJsonArray() //
+				.add(sut.toJson(identity())) //
+				.build(), j -> j);
+		assertEquals(sut.toJson(identity()), fromJson.get(0).toJson(identity()));
 	}
 
 	@Test
diff --git a/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java b/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
index 8fec9839f16..17038a5c183 100644
--- a/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
+++ b/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.battery.fenecon.commercial;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.battery.api.Battery.ChannelId.CHARGE_MAX_CURRENT;
 import static io.openems.edge.battery.api.Battery.ChannelId.DISCHARGE_MAX_CURRENT;
 import static io.openems.edge.battery.api.Battery.ChannelId.SOC;
@@ -7,7 +8,6 @@
 import static io.openems.edge.battery.fenecon.commercial.BatteryFeneconCommercial.ChannelId.RUNNING;
 import static io.openems.edge.battery.fenecon.commercial.BatteryFeneconCommercial.ChannelId.STATE_MACHINE;
 import static io.openems.edge.common.startstop.StartStoppable.ChannelId.START_STOP;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.io.test.DummyInputOutput.ChannelId.INPUT_OUTPUT7;
 
 import org.junit.Test;
diff --git a/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java b/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
index b0029262635..77062d93093 100644
--- a/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
+++ b/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.battery.fenecon.home;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.battery.api.Battery.ChannelId.CHARGE_MAX_CURRENT;
 import static io.openems.edge.battery.api.Battery.ChannelId.CURRENT;
 import static io.openems.edge.battery.api.Battery.ChannelId.MAX_CELL_VOLTAGE;
@@ -22,7 +23,6 @@
 import static io.openems.edge.battery.protection.BatteryProtection.ChannelId.BP_CHARGE_BMS;
 import static io.openems.edge.battery.protection.BatteryProtection.ChannelId.BP_CHARGE_MAX_SOC;
 import static io.openems.edge.bridge.modbus.api.ModbusComponent.ChannelId.MODBUS_COMMUNICATION_FAILED;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.io.test.DummyInputOutput.ChannelId.INPUT_OUTPUT4;
 import static java.lang.Math.round;
 import static java.time.temporal.ChronoUnit.SECONDS;
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java
index 02835194b33..e5d4529f972 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java
@@ -1,5 +1,14 @@
 package io.openems.edge.battery.soltaro.cluster.versionb;
 
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static io.openems.common.channel.Level.OK;
+import static io.openems.common.channel.Level.WARNING;
+import static io.openems.common.channel.Unit.DEZIDEGREE_CELSIUS;
+import static io.openems.common.channel.Unit.MILLIAMPERE;
+import static io.openems.common.channel.Unit.MILLIVOLT;
+import static io.openems.common.channel.Unit.NONE;
+import static io.openems.common.channel.Unit.PERCENT;
+import static io.openems.common.types.OpenemsType.INTEGER;
 import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_2;
 import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_MINUS_1;
 
@@ -9,10 +18,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import io.openems.common.channel.AccessMode;
-import io.openems.common.channel.Level;
-import io.openems.common.channel.Unit;
-import io.openems.common.types.OpenemsType;
 import io.openems.edge.battery.soltaro.common.enums.ChargeIndication;
 import io.openems.edge.bridge.modbus.api.AbstractOpenemsModbusComponent;
 import io.openems.edge.bridge.modbus.api.element.BitsWordElement;
@@ -426,104 +431,102 @@ private Map<String, Channel<?>> createChannelMap() {
 	private Map<String, ChannelId> createChannelIdMap() {
 		Map<String, ChannelId> map = new HashMap<>();
 
-		this.addEntry(map, KEY_VOLTAGE, new IntegerDoc().unit(Unit.MILLIVOLT));
-		this.addEntry(map, KEY_CURRENT, new IntegerDoc().unit(Unit.MILLIAMPERE));
+		this.addEntry(map, KEY_VOLTAGE, new IntegerDoc().unit(MILLIVOLT));
+		this.addEntry(map, KEY_CURRENT, new IntegerDoc().unit(MILLIAMPERE));
 		this.addEntry(map, KEY_CHARGE_INDICATION, Doc.of(ChargeIndication.values()));
-		this.addEntry(map, KEY_SOC, new IntegerDoc().unit(Unit.PERCENT));
-		this.addEntry(map, KEY_SOH, new IntegerDoc().unit(Unit.PERCENT));
-		this.addEntry(map, KEY_MAX_CELL_VOLTAGE_ID, new IntegerDoc().unit(Unit.NONE));
-		this.addEntry(map, KEY_MAX_CELL_VOLTAGE, new IntegerDoc().unit(Unit.MILLIVOLT));
-		this.addEntry(map, KEY_MIN_CELL_VOLTAGE_ID, new IntegerDoc().unit(Unit.NONE));
-		this.addEntry(map, KEY_MIN_CELL_VOLTAGE, new IntegerDoc().unit(Unit.MILLIVOLT));
-		this.addEntry(map, KEY_MAX_CELL_TEMPERATURE_ID, new IntegerDoc().unit(Unit.NONE));
-		this.addEntry(map, KEY_MAX_CELL_TEMPERATURE, new IntegerDoc().unit(Unit.DEZIDEGREE_CELSIUS));
-		this.addEntry(map, KEY_MIN_CELL_TEMPERATURE_ID, new IntegerDoc().unit(Unit.NONE));
-		this.addEntry(map, KEY_MIN_CELL_TEMPERATURE, new IntegerDoc().unit(Unit.DEZIDEGREE_CELSIUS));
-		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_LOW, Doc.of(Level.WARNING)
+		this.addEntry(map, KEY_SOC, new IntegerDoc().unit(PERCENT));
+		this.addEntry(map, KEY_SOH, new IntegerDoc().unit(PERCENT));
+		this.addEntry(map, KEY_MAX_CELL_VOLTAGE_ID, new IntegerDoc().unit(NONE));
+		this.addEntry(map, KEY_MAX_CELL_VOLTAGE, new IntegerDoc().unit(MILLIVOLT));
+		this.addEntry(map, KEY_MIN_CELL_VOLTAGE_ID, new IntegerDoc().unit(NONE));
+		this.addEntry(map, KEY_MIN_CELL_VOLTAGE, new IntegerDoc().unit(MILLIVOLT));
+		this.addEntry(map, KEY_MAX_CELL_TEMPERATURE_ID, new IntegerDoc().unit(NONE));
+		this.addEntry(map, KEY_MAX_CELL_TEMPERATURE, new IntegerDoc().unit(DEZIDEGREE_CELSIUS));
+		this.addEntry(map, KEY_MIN_CELL_TEMPERATURE_ID, new IntegerDoc().unit(NONE));
+		this.addEntry(map, KEY_MIN_CELL_TEMPERATURE, new IntegerDoc().unit(DEZIDEGREE_CELSIUS));
+		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_LOW, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Discharge Temperature Low Alarm Level 2")); /* Bit 15 */
-		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_HIGH, Doc.of(Level.WARNING)
+		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_HIGH, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Discharge Temperature High Alarm Level 2")); /* Bit 14 */
 		this.addEntry(map, KEY_ALARM_LEVEL_2_GR_TEMPERATURE_HIGH,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 2")); /* Bit 10 */
-		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_LOW, Doc.of(Level.WARNING)
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 2")); /* Bit 10 */
+		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_LOW, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Charge Temperature Low Alarm Level 2")); /* Bit 7 */
-		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_HIGH, Doc.of(Level.WARNING)
+		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_HIGH, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Charge Temperature High Alarm Level 2")); /* Bit 6 */
-		this.addEntry(map, KEY_ALARM_LEVEL_2_DISCHA_CURRENT_HIGH, Doc.of(Level.WARNING)
-				.text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 2")); /* Bit 5 */
+		this.addEntry(map, KEY_ALARM_LEVEL_2_DISCHA_CURRENT_HIGH,
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 2")); /* Bit 5 */
 		this.addEntry(map, KEY_ALARM_LEVEL_2_TOTAL_VOLTAGE_LOW,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 2")); /* Bit 4 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 2")); /* Bit 4 */
 		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_VOLTAGE_LOW,
-				Doc.of(Level.WARNING).text("Cluster 1 Cell Voltage Low Alarm Level 2")); /* Bit 3 */
+				Doc.of(WARNING).text("Cluster 1 Cell Voltage Low Alarm Level 2")); /* Bit 3 */
 		this.addEntry(map, KEY_ALARM_LEVEL_2_CHA_CURRENT_HIGH,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Charge Current High Alarm Level 2")); /* Bit 2 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Charge Current High Alarm Level 2")); /* Bit 2 */
 		this.addEntry(map, KEY_ALARM_LEVEL_2_TOTAL_VOLTAGE_HIGH,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 2")); /* Bit 1 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 2")); /* Bit 1 */
 		this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_VOLTAGE_HIGH,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 2")); /* Bit 0 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_LOW, Doc.of(Level.WARNING)
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 2")); /* Bit 0 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_LOW, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Discharge Temperature Low Alarm Level 1")); /* Bit 15 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_HIGH, Doc.of(Level.WARNING)
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_HIGH, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Discharge Temperature High Alarm Level 1")); /* Bit 14 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_DIFF_HIGH, Doc.of(Level.WARNING)
-				.text("Rack" + this.rackNumber + " Total Voltage Diff High Alarm Level 1")); /* Bit 13 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_DIFF_HIGH, Doc.of(Level.WARNING)
-				.text("Rack" + this.rackNumber + " Cell Voltage Diff High Alarm Level 1")); /* Bit 11 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_GR_TEMPERATURE_HIGH, Doc.of(Level.WARNING)
-				.text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 1")); /* Bit 10 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_TEMP_DIFF_HIGH, Doc.of(Level.WARNING)
+		this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_DIFF_HIGH,
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage Diff High Alarm Level 1")); /* Bit 13 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_DIFF_HIGH,
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage Diff High Alarm Level 1")); /* Bit 11 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_GR_TEMPERATURE_HIGH,
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 1")); /* Bit 10 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_TEMP_DIFF_HIGH, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell temperature Diff High Alarm Level 1")); /* Bit 9 */
 		this.addEntry(map, KEY_ALARM_LEVEL_1_SOC_LOW,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " SOC Low Alarm Level 1")); /* Bit 8 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_LOW, Doc.of(Level.WARNING)
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " SOC Low Alarm Level 1")); /* Bit 8 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_LOW, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Charge Temperature Low Alarm Level 1")); /* Bit 7 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_HIGH, Doc.of(Level.WARNING)
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_HIGH, Doc.of(WARNING)
 				.text("Rack" + this.rackNumber + " Cell Charge Temperature High Alarm Level 1")); /* Bit 6 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_DISCHA_CURRENT_HIGH, Doc.of(Level.WARNING)
-				.text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 1")); /* Bit 5 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_DISCHA_CURRENT_HIGH,
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 1")); /* Bit 5 */
 		this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_LOW,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 1")); /* Bit 4 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 1")); /* Bit 4 */
 		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_LOW,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Cell Voltage Low Alarm Level 1")); /* Bit 3 */
-		this.addEntry(map, KEY_ALARM_LEVEL_1_CHA_CURRENT_HIGH, Doc.of(Level.WARNING)
-				.text("Rack" + this.rackNumber + " Charge Current High Alarm Level 1")); /* Bit 2 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage Low Alarm Level 1")); /* Bit 3 */
+		this.addEntry(map, KEY_ALARM_LEVEL_1_CHA_CURRENT_HIGH,
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Charge Current High Alarm Level 1")); /* Bit 2 */
 		this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_HIGH,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 1")); /* Bit 1 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 1")); /* Bit 1 */
 		this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_HIGH,
-				Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 1")); /* Bit 0 */
+				Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 1")); /* Bit 0 */
 		this.addEntry(map, KEY_RUN_STATE, Doc.of(Enums.ClusterRunState.values())); //
-		this.addEntry(map, KEY_FAILURE_INITIALIZATION, Doc.of(Level.WARNING).text("Initialization failure")); /* Bit */
-		this.addEntry(map, KEY_FAILURE_EEPROM, Doc.of(Level.WARNING).text("EEPROM fault")); /* Bit 11 */
+		this.addEntry(map, KEY_FAILURE_INITIALIZATION, Doc.of(WARNING).text("Initialization failure")); /* Bit */
+		this.addEntry(map, KEY_FAILURE_EEPROM, Doc.of(WARNING).text("EEPROM fault")); /* Bit 11 */
 		this.addEntry(map, KEY_FAILURE_INTRANET_COMMUNICATION,
-				Doc.of(Level.WARNING).text("Internal communication fault")); /* Bit 10 */
+				Doc.of(WARNING).text("Internal communication fault")); /* Bit 10 */
 		this.addEntry(map, KEY_FAILURE_TEMPERATURE_SENSOR_CABLE,
-				Doc.of(Level.WARNING).text("Temperature sensor cable fault")); /* Bit 9 */
-		this.addEntry(map, KEY_FAILURE_BALANCING_MODULE, Doc.of(Level.OK).text("Balancing module fault")); /* Bit 8 */
-		this.addEntry(map, KEY_FAILURE_TEMPERATURE_PCB, Doc.of(Level.WARNING).text("Temperature PCB error")); /* Bit 7 */
-		this.addEntry(map, KEY_FAILURE_GR_TEMPERATURE, Doc.of(Level.WARNING).text("GR Temperature error")); /* Bit 6 */
-		this.addEntry(map, KEY_FAILURE_TEMP_SENSOR, Doc.of(Level.WARNING).text("Temperature sensor fault")); /* Bit 5 */
-		this.addEntry(map, KEY_FAILURE_TEMP_SAMPLING,
-				Doc.of(Level.WARNING).text("Temperature sampling fault")); /* Bit 4 */
-		this.addEntry(map, KEY_FAILURE_VOLTAGE_SAMPLING,
-				Doc.of(Level.WARNING).text("Voltage sampling fault")); /* Bit 3 */
-		this.addEntry(map, KEY_FAILURE_LTC6803, Doc.of(Level.WARNING).text("LTC6803 fault")); /* Bit 2 */
-		this.addEntry(map, KEY_FAILURE_CONNECTOR_WIRE, Doc.of(Level.WARNING).text("connector wire fault")); /* Bit 1 */
-		this.addEntry(map, KEY_FAILURE_SAMPLING_WIRE, Doc.of(Level.WARNING).text("sampling wire fault")); /* Bit 0 */
-		this.addEntry(map, KEY_SLEEP, Doc.of(OpenemsType.INTEGER).accessMode(AccessMode.READ_WRITE));
-		this.addEntry(map, KEY_RESET, Doc.of(OpenemsType.INTEGER).accessMode(AccessMode.READ_WRITE));
+				Doc.of(WARNING).text("Temperature sensor cable fault")); /* Bit 9 */
+		this.addEntry(map, KEY_FAILURE_BALANCING_MODULE, Doc.of(OK).text("Balancing module fault")); /* Bit 8 */
+		this.addEntry(map, KEY_FAILURE_TEMPERATURE_PCB, Doc.of(WARNING).text("Temperature PCB error")); /* Bit 7 */
+		this.addEntry(map, KEY_FAILURE_GR_TEMPERATURE, Doc.of(WARNING).text("GR Temperature error")); /* Bit 6 */
+		this.addEntry(map, KEY_FAILURE_TEMP_SENSOR, Doc.of(WARNING).text("Temperature sensor fault")); /* Bit 5 */
+		this.addEntry(map, KEY_FAILURE_TEMP_SAMPLING, Doc.of(WARNING).text("Temperature sampling fault")); /* Bit 4 */
+		this.addEntry(map, KEY_FAILURE_VOLTAGE_SAMPLING, Doc.of(WARNING).text("Voltage sampling fault")); /* Bit 3 */
+		this.addEntry(map, KEY_FAILURE_LTC6803, Doc.of(WARNING).text("LTC6803 fault")); /* Bit 2 */
+		this.addEntry(map, KEY_FAILURE_CONNECTOR_WIRE, Doc.of(WARNING).text("connector wire fault")); /* Bit 1 */
+		this.addEntry(map, KEY_FAILURE_SAMPLING_WIRE, Doc.of(WARNING).text("sampling wire fault")); /* Bit 0 */
+		this.addEntry(map, KEY_SLEEP, Doc.of(INTEGER).accessMode(READ_WRITE));
+		this.addEntry(map, KEY_RESET, Doc.of(INTEGER).accessMode(READ_WRITE));
 
 		// Cell voltages formatted like: "RACK_1_BATTERY_000_VOLTAGE"
 		for (var i = 0; i < this.numberOfSlaves; i++) {
 			for (var j = i * VOLTAGE_SENSORS_PER_MODULE; j < (i + 1) * VOLTAGE_SENSORS_PER_MODULE; j++) {
 				var key = this.getSingleCellPrefix(j) + "_" + VOLTAGE;
-				this.addEntry(map, key, new IntegerDoc().unit(Unit.MILLIVOLT));
+				this.addEntry(map, key, new IntegerDoc().unit(MILLIVOLT));
 			}
 		}
 		// Cell temperatures formatted like : "RACK_1_BATTERY_000_TEMPERATURE"
 		for (var i = 0; i < this.numberOfSlaves; i++) {
 			for (var j = i * TEMPERATURE_SENSORS_PER_MODULE; j < (i + 1) * TEMPERATURE_SENSORS_PER_MODULE; j++) {
 				var key = this.getSingleCellPrefix(j) + "_" + TEMPERATURE;
-				this.addEntry(map, key, new IntegerDoc().unit(Unit.DEZIDEGREE_CELSIUS));
+				this.addEntry(map, key, new IntegerDoc().unit(DEZIDEGREE_CELSIUS));
 			}
 		}
 
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java
index 88974aeedf0..751aed62757 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java
@@ -106,8 +106,7 @@ public static enum S64201 implements SunSpecPoint {
 		V_AR(new ScaledValuePoint("S64201_V_AR", "AC Reactive Power", "", //
 				ValuePoint.Type.INT16, true, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "V_AR_SF")), //
 		HZ(new ScaledValuePoint("S64201_HZ", "Line Frequency", "", //
-				ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")
-		), //
+				ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		RESERVED_36(new ReservedPoint("S64201_RESERVED_36")), //
 		RESERVED_37(new ReservedPoint("S64201_RESERVED_37")), //
 		RESERVED_38(new ReservedPoint("S64201_RESERVED_38")), //
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
index fc68eda27ec..d3d8025f5e1 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.batteryinverter.kaco.blueplanetgridsave;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.batteryinverter.api.SymmetricBatteryInverter.ChannelId.MAX_APPARENT_POWER;
 import static io.openems.edge.batteryinverter.kaco.blueplanetgridsave.BatteryInverterKacoBlueplanetGridsave.WATCHDOG_TIMEOUT_SECONDS;
 import static io.openems.edge.batteryinverter.kaco.blueplanetgridsave.BatteryInverterKacoBlueplanetGridsave.WATCHDOG_TRIGGER_SECONDS;
@@ -27,7 +28,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TestUtils;
 
 public class BatteryInverterKacoBlueplanetGridsaveImplTest {
 
@@ -49,17 +49,16 @@ protected void handleEvent(String topic) throws Exception {
 
 	}
 
-	private static TimeLeapClock clock;
+	private static final TimeLeapClock CLOCK = createDummyClock();
 	private static ComponentTest test;
 
 	@Before
 	public void prepareTest() throws Exception {
-		clock = TestUtils.createDummyClock();
 		var sut = new BatteryInverterKacoBlueplanetGridsaveImpl();
 
 		test = new MyComponentTest(sut) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
-				.addReference("componentManager", new DummyComponentManager(clock)) //
+				.addReference("componentManager", new DummyComponentManager(CLOCK)) //
 				.addReference("setModbus", new DummyModbusBridge("modbus0"));
 
 		// TODO implement proper Dummy-Modbus-Bridge with SunSpec support. Till then...
@@ -97,10 +96,10 @@ public void testStart() throws Exception {
 						.input(MAX_APPARENT_POWER, 50_000) //
 						.output(STATE_MACHINE, State.UNDEFINED)) //
 				.next(new TestCase() //
-						.timeleap(clock, 4, SECONDS) //
+						.timeleap(CLOCK, 4, SECONDS) //
 						.output(STATE_MACHINE, State.GO_RUNNING)) //
 				.next(new TestCase() //
-						.timeleap(clock, 1, SECONDS) //
+						.timeleap(CLOCK, 1, SECONDS) //
 						.input(CURRENT_STATE.getChannelId(), S64201CurrentState.GRID_CONNECTED) //
 						.output(WATCHDOG.getChannelId(), WATCHDOG_TIMEOUT_SECONDS)) //
 				.next(new TestCase() //
@@ -114,10 +113,10 @@ public void testWatchdog() throws Exception {
 				.next(new TestCase() //
 						.output(WATCHDOG.getChannelId(), WATCHDOG_TIMEOUT_SECONDS)) //
 				.next(new TestCase() //
-						.timeleap(clock, WATCHDOG_TRIGGER_SECONDS - 1, SECONDS) //
+						.timeleap(CLOCK, WATCHDOG_TRIGGER_SECONDS - 1, SECONDS) //
 						.output(WATCHDOG.getChannelId(), null /* waiting till next watchdog trigger */)) //
 				.next(new TestCase() //
-						.timeleap(clock, 1, SECONDS) //
+						.timeleap(CLOCK, 1, SECONDS) //
 						.output(WATCHDOG.getChannelId(), WATCHDOG_TIMEOUT_SECONDS)) //
 		;
 	}
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java
index cf1d07df092..71b7370b2fb 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java
@@ -1,6 +1,6 @@
 package io.openems.edge.bridge.http.dummy;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 
 import java.time.Clock;
 import java.time.Duration;
diff --git a/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java b/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java
index db098dab702..203f1f8ceb7 100644
--- a/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java
+++ b/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java
@@ -1,7 +1,7 @@
 package io.openems.edge.bridge.http.api;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.bridge.http.time.DelayTimeProviderChain.fixedDelay;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static org.junit.Assert.assertEquals;
 
 import java.time.Duration;
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
index 8911c6ee34e..7d5a31e4c8d 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
@@ -2,7 +2,29 @@
 
 package io.openems.edge.bridge.modbus.sunspec;
 
-import io.openems.common.channel.AccessMode;
+import static io.openems.common.channel.AccessMode.READ_ONLY;
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.Type.BITFIELD16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.Type.BITFIELD32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint.Type.ENUM16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint.Type.ENUM32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.ACC32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.ACC64;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.FLOAT32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.INT16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.INT32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING2;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING20;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING4;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING5;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING6;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING8;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.UINT16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.UINT32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.UINT64;
+
 import io.openems.common.channel.Level;
 import io.openems.common.channel.Unit;
 import io.openems.common.types.OptionsEnum;
@@ -166,25 +188,25 @@ public enum DefaultSunSpecModel implements SunSpecModel {
 	public static enum S1 implements SunSpecPoint {
 		MN(new ValuePoint("S1_MN", "Manufacturer", //
 				"Well known value registered with SunSpec for compliance", //
-				ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		MD(new ValuePoint("S1_MD", "Model", //
 				"Manufacturer specific value (32 chars)", //
-				ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		OPT(new ValuePoint("S1_OPT", "Options", //
 				"Manufacturer specific value (16 chars)", //
-				ValuePoint.Type.STRING8, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING8, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		VR(new ValuePoint("S1_VR", "Version", //
 				"Manufacturer specific value (16 chars)", //
-				ValuePoint.Type.STRING8, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING8, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		SN(new ValuePoint("S1_SN", "Serial Number", //
 				"Manufacturer specific value (32 chars)", //
-				ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		DA(new ValuePoint("S1_DA", "Device Address", //
 				"Modbus device address", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		PAD(new ValuePoint("S1_PAD", "", //
 				"Force even alignment", //
-				ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -201,34 +223,34 @@ public Point get() {
 	public static enum S2 implements SunSpecPoint {
 		AID(new ValuePoint("S2_AID", "AID", //
 				"Aggregated model id", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N(new ValuePoint("S2_N", "N", //
 				"Number of aggregated models", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		UN(new ValuePoint("S2_UN", "UN", //
 				"Update Number.  Incrementing number each time the mapping is changed.  If the number is not changed from the last reading the direct access to a specific offset will result in reading the same logical model as before.  Otherwise the entire model must be read to refresh the changes", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ST(new EnumPoint("S2_ST", "Status", //
 				"Enumerated status code", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S2_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S2_St.values())), //
 		ST_VND(new EnumPoint("S2_ST_VND", "Vendor Status", //
 				"Vendor specific status code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT(new BitFieldPoint("S2_EVT", "Event Code", //
 				"Bitmask event code", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S2_Evt.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S2_Evt.values())), //
 		EVT_VND(new BitFieldPoint("S2_EVT_VND", "Vendor Event Code", //
 				"Vendor specific event code", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		CTL(new EnumPoint("S2_CTL", "Control", //
 				"Control register for all aggregated devices", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S2_Ctl.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S2_Ctl.values())), //
 		CTL_VND(new EnumPoint("S2_CTL_VND", "Vendor Control", //
 				"Vendor control register for all aggregated devices", //
-				EnumPoint.Type.ENUM32, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM32, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		CTL_VL(new EnumPoint("S2_CTL_VL", "Control Value", //
 				"Numerical value used as a parameter to the control", //
-				EnumPoint.Type.ENUM32, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0]));
+				ENUM32, false /* mandatory? */, READ_ONLY, new OptionsEnum[0]));
 
 		private final Point point;
 
@@ -343,42 +365,42 @@ public OptionsEnum getUndefined() {
 	public static enum S15 implements SunSpecPoint {
 		CLR(new ValuePoint("S15_CLR", "Clear", //
 				"Write a \"1\" to clear all counters", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		IN_CNT(new ValuePoint("S15_IN_CNT", "Input Count", //
 				"Number of bytes received", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		IN_UC_CNT(new ValuePoint("S15_IN_UC_CNT", "Input Unicast Count", //
 				"Number of Unicast packets received", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		IN_N_UC_CNT(new ValuePoint("S15_IN_N_UC_CNT", "Input Non-Unicast Count", //
 				"Number of non-Unicast packets received", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		IN_DSC_CNT(new ValuePoint("S15_IN_DSC_CNT", "Input Discarded Count", //
 				"Number of inbound packets received on the interface but discarded", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		IN_ERR_CNT(new ValuePoint("S15_IN_ERR_CNT", "Input Error Count", //
 				"Number of inbound packets that contain errors (excluding discards)", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		IN_UNK_CNT(new ValuePoint("S15_IN_UNK_CNT", "Input Unknown Count", //
 				"Number of inbound packets with unknown protocol", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		OUT_CNT(new ValuePoint("S15_OUT_CNT", "Output Count", //
 				"Total number of bytes transmitted on this interface", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		OUT_UC_CNT(new ValuePoint("S15_OUT_UC_CNT", "Output Unicast Count", //
 				"Number of Unicast packets transmitted", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		OUT_N_UC_CNT(new ValuePoint("S15_OUT_N_UC_CNT", "Output Non-Unicast Count", //
 				"Number of Non-Unicast packets transmitted", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		OUT_DSC_CNT(new ValuePoint("S15_OUT_DSC_CNT", "Output Discarded Count", //
 				"Number of Discarded output packets", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		OUT_ERR_CNT(new ValuePoint("S15_OUT_ERR_CNT", "Output Error Count", //
 				"Number of outbound error packets", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		PAD(new ValuePoint("S15_PAD", "", "", //
-				ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -395,19 +417,19 @@ public Point get() {
 	public static enum S18 implements SunSpecPoint {
 		NAM(new ValuePoint("S18_NAM", "Name", //
 				"Interface name", //
-				ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				STRING4, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		IMEI(new ValuePoint("S18_IMEI", "IMEI", //
 				"International Mobile Equipment Identifier for the interface", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		APN(new ValuePoint("S18_APN", "APN", //
 				"Access Point Name for the interface", //
-				ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				STRING4, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		NUM(new ValuePoint("S18_NUM", "Number", //
 				"Phone number for the interface", //
-				ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				STRING6, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		PIN(new ValuePoint("S18_PIN", "PIN", //
 				"Personal Identification Number for the interface", //
-				ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE));
+				STRING6, false /* mandatory? */, READ_WRITE, Unit.NONE));
 
 		private final Point point;
 
@@ -424,109 +446,109 @@ public Point get() {
 	public static enum S101 implements SunSpecPoint {
 		A(new ScaledValuePoint("S101_A", "Amps", //
 				"AC Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S101_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S101_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S101_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S101_A_SF", "", "")), //
 		P_P_VPH_A_B(new ScaledValuePoint("S101_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_B_C(new ScaledValuePoint("S101_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_C_A(new ScaledValuePoint("S101_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S101_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S101_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S101_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S101_V_SF", "", "")), //
 		W(new ScaledValuePoint("S101_W", "Watts", //
 				"AC Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S101_W_SF", "", "")), //
 		HZ(new ScaledValuePoint("S101_HZ", "Hz", //
 				"Line Frequency", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S101_HZ_S_F", "", "")), //
 		VA(new ScaledValuePoint("S101_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S101_VA_SF", "", "")), //
 		V_AR(new ScaledValuePoint("S101_V_AR", "VAr", //
 				"AC Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
 		V_AR_S_F(new ScaleFactorPoint("S101_V_AR_S_F", "", "")), //
 		PF(new ScaledValuePoint("S101_PF", "PF", //
 				"AC Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S101_PF_SF", "", "")), //
 		WH(new ScaledValuePoint("S101_WH", "WattHours", //
 				"AC Energy", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
 		WH_SF(new ScaleFactorPoint("S101_WH_SF", "", "")), //
 		DCA(new ScaledValuePoint("S101_DCA", "DC Amps", //
 				"DC Current", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
 		DCA_SF(new ScaleFactorPoint("S101_DCA_SF", "", "")), //
 		DCV(new ScaledValuePoint("S101_DCV", "DC Voltage", //
 				"DC Voltage", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "DCV_SF")), //
 		DCV_SF(new ScaleFactorPoint("S101_DCV_SF", "", "")), //
 		DCW(new ScaledValuePoint("S101_DCW", "DC Watts", //
 				"DC Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
 		DCW_SF(new ScaleFactorPoint("S101_DCW_SF", "", "")), //
 		TMP_CAB(new ScaledValuePoint("S101_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet Temperature", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_SNK(new ScaledValuePoint("S101_TMP_SNK", "Heat Sink Temperature", //
 				"Heat Sink Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_TRNS(new ScaledValuePoint("S101_TMP_TRNS", "Transformer Temperature", //
 				"Transformer Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_OT(new ScaledValuePoint("S101_TMP_OT", "Other Temperature", //
 				"Other Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_S_F(new ScaleFactorPoint("S101_TMP_S_F", "", "")), //
 		ST(new EnumPoint("S101_ST", "Operating State", //
 				"Enumerated value.  Operating state", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S101_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S101_St.values())), //
 		ST_VND(new EnumPoint("S101_ST_VND", "Vendor Operating State", //
 				"Vendor specific operating state code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT1(new BitFieldPoint("S101_EVT1", "Event1", //
 				"Bitmask value. Event fields", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S101_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S101_Evt1.values())), //
 		EVT2(new BitFieldPoint("S101_EVT2", "Event Bitfield 2", //
 				"Reserved for future use", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S101_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S101_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND3(new BitFieldPoint("S101_EVT_VND3", "Vendor Event Bitfield 3", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND4(new BitFieldPoint("S101_EVT_VND4", "Vendor Event Bitfield 4", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
 
 		private final Point point;
 
@@ -608,109 +630,109 @@ public BitPoint get() {
 	public static enum S102 implements SunSpecPoint {
 		A(new ScaledValuePoint("S102_A", "Amps", //
 				"AC Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S102_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S102_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S102_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S102_A_SF", "", "")), //
 		P_P_VPH_A_B(new ScaledValuePoint("S102_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_B_C(new ScaledValuePoint("S102_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_C_A(new ScaledValuePoint("S102_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S102_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S102_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S102_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S102_V_SF", "", "")), //
 		W(new ScaledValuePoint("S102_W", "Watts", //
 				"AC Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S102_W_SF", "", "")), //
 		HZ(new ScaledValuePoint("S102_HZ", "Hz", //
 				"Line Frequency", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S102_HZ_S_F", "", "")), //
 		VA(new ScaledValuePoint("S102_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S102_VA_SF", "", "")), //
 		V_AR(new ScaledValuePoint("S102_V_AR", "VAr", //
 				"AC Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
 		V_AR_S_F(new ScaleFactorPoint("S102_V_AR_S_F", "", "")), //
 		PF(new ScaledValuePoint("S102_PF", "PF", //
 				"AC Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S102_PF_SF", "", "")), //
 		WH(new ScaledValuePoint("S102_WH", "WattHours", //
 				"AC Energy", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
 		WH_SF(new ScaleFactorPoint("S102_WH_SF", "", "")), //
 		DCA(new ScaledValuePoint("S102_DCA", "DC Amps", //
 				"DC Current", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
 		DCA_SF(new ScaleFactorPoint("S102_DCA_SF", "", "")), //
 		DCV(new ScaledValuePoint("S102_DCV", "DC Voltage", //
 				"DC Voltage", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "DCV_SF")), //
 		DCV_SF(new ScaleFactorPoint("S102_DCV_SF", "", "")), //
 		DCW(new ScaledValuePoint("S102_DCW", "DC Watts", //
 				"DC Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
 		DCW_SF(new ScaleFactorPoint("S102_DCW_SF", "", "")), //
 		TMP_CAB(new ScaledValuePoint("S102_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet Temperature", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_SNK(new ScaledValuePoint("S102_TMP_SNK", "Heat Sink Temperature", //
 				"Heat Sink Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_TRNS(new ScaledValuePoint("S102_TMP_TRNS", "Transformer Temperature", //
 				"Transformer Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_OT(new ScaledValuePoint("S102_TMP_OT", "Other Temperature", //
 				"Other Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_S_F(new ScaleFactorPoint("S102_TMP_S_F", "", "")), //
 		ST(new EnumPoint("S102_ST", "Operating State", //
 				"Enumerated value.  Operating state", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S102_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S102_St.values())), //
 		ST_VND(new EnumPoint("S102_ST_VND", "Vendor Operating State", //
 				"Vendor specific operating state code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT1(new BitFieldPoint("S102_EVT1", "Event1", //
 				"Bitmask value. Event fields", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S102_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S102_Evt1.values())), //
 		EVT2(new BitFieldPoint("S102_EVT2", "Event Bitfield 2", //
 				"Reserved for future use", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S102_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S102_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND3(new BitFieldPoint("S102_EVT_VND3", "Vendor Event Bitfield 3", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND4(new BitFieldPoint("S102_EVT_VND4", "Vendor Event Bitfield 4", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
 
 		private final Point point;
 
@@ -792,109 +814,109 @@ public BitPoint get() {
 	public static enum S103 implements SunSpecPoint {
 		A(new ScaledValuePoint("S103_A", "Amps", //
 				"AC Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S103_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S103_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S103_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S103_A_SF", "", "")), //
 		P_P_VPH_A_B(new ScaledValuePoint("S103_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_B_C(new ScaledValuePoint("S103_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_C_A(new ScaledValuePoint("S103_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S103_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S103_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S103_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S103_V_SF", "", "")), //
 		W(new ScaledValuePoint("S103_W", "Watts", //
 				"AC Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S103_W_SF", "", "")), //
 		HZ(new ScaledValuePoint("S103_HZ", "Hz", //
 				"Line Frequency", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S103_HZ_S_F", "", "")), //
 		VA(new ScaledValuePoint("S103_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S103_VA_SF", "", "")), //
 		V_AR(new ScaledValuePoint("S103_V_AR", "VAr", //
 				"AC Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
 		V_AR_S_F(new ScaleFactorPoint("S103_V_AR_S_F", "", "")), //
 		PF(new ScaledValuePoint("S103_PF", "PF", //
 				"AC Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S103_PF_SF", "", "")), //
 		WH(new ScaledValuePoint("S103_WH", "WattHours", //
 				"AC Energy", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
 		WH_SF(new ScaleFactorPoint("S103_WH_SF", "", "")), //
 		DCA(new ScaledValuePoint("S103_DCA", "DC Amps", //
 				"DC Current", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
 		DCA_SF(new ScaleFactorPoint("S103_DCA_SF", "", "")), //
 		DCV(new ScaledValuePoint("S103_DCV", "DC Voltage", //
 				"DC Voltage", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "DCV_SF")), //
 		DCV_SF(new ScaleFactorPoint("S103_DCV_SF", "", "")), //
 		DCW(new ScaledValuePoint("S103_DCW", "DC Watts", //
 				"DC Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
 		DCW_SF(new ScaleFactorPoint("S103_DCW_SF", "", "")), //
 		TMP_CAB(new ScaledValuePoint("S103_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet Temperature", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_SNK(new ScaledValuePoint("S103_TMP_SNK", "Heat Sink Temperature", //
 				"Heat Sink Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_TRNS(new ScaledValuePoint("S103_TMP_TRNS", "Transformer Temperature", //
 				"Transformer Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_OT(new ScaledValuePoint("S103_TMP_OT", "Other Temperature", //
 				"Other Temperature", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_S_F(new ScaleFactorPoint("S103_TMP_S_F", "", "")), //
 		ST(new EnumPoint("S103_ST", "Operating State", //
 				"Enumerated value.  Operating state", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S103_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S103_St.values())), //
 		ST_VND(new EnumPoint("S103_ST_VND", "Vendor Operating State", //
 				"Vendor specific operating state code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT1(new BitFieldPoint("S103_EVT1", "Event1", //
 				"Bitmask value. Event fields", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S103_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S103_Evt1.values())), //
 		EVT2(new BitFieldPoint("S103_EVT2", "Event Bitfield 2", //
 				"Reserved for future use", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S103_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S103_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND3(new BitFieldPoint("S103_EVT_VND3", "Vendor Event Bitfield 3", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND4(new BitFieldPoint("S103_EVT_VND4", "Vendor Event Bitfield 4", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
 
 		private final Point point;
 
@@ -976,97 +998,97 @@ public BitPoint get() {
 	public static enum S111 implements SunSpecPoint {
 		A(new ValuePoint("S111_A", "Amps", //
 				"AC Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_A(new ValuePoint("S111_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_B(new ValuePoint("S111_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_C(new ValuePoint("S111_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		P_P_VPH_A_B(new ValuePoint("S111_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		P_P_VPH_B_C(new ValuePoint("S111_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		P_P_VPH_C_A(new ValuePoint("S111_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_A(new ValuePoint("S111_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_B(new ValuePoint("S111_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_C(new ValuePoint("S111_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		W(new ValuePoint("S111_W", "Watts", //
 				"AC Power", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.WATT)), //
 		HZ(new ValuePoint("S111_HZ", "Hz", //
 				"Line Frequency", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.HERTZ)), //
 		VA(new ValuePoint("S111_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE)), //
 		V_AR(new ValuePoint("S111_V_AR", "VAr", //
 				"AC Reactive Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
 		PF(new ValuePoint("S111_PF", "PF", //
 				"AC Power Factor", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		WH(new ValuePoint("S111_WH", "WattHours", //
 				"AC Energy", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
 		DCA(new ValuePoint("S111_DCA", "DC Amps", //
 				"DC Current", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		DCV(new ValuePoint("S111_DCV", "DC Voltage", //
 				"DC Voltage", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		DCW(new ValuePoint("S111_DCW", "DC Watts", //
 				"DC Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.WATT)), //
 		TMP_CAB(new ValuePoint("S111_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet Temperature", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_SNK(new ValuePoint("S111_TMP_SNK", "Heat Sink Temperature", //
 				"Heat Sink Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_TRNS(new ValuePoint("S111_TMP_TRNS", "Transformer Temperature", //
 				"Transformer Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_OT(new ValuePoint("S111_TMP_OT", "Other Temperature", //
 				"Other Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		ST(new EnumPoint("S111_ST", "Operating State", //
 				"Enumerated value.  Operating state", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S111_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S111_St.values())), //
 		ST_VND(new EnumPoint("S111_ST_VND", "Vendor Operating State", //
 				"Vendor specific operating state code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT1(new BitFieldPoint("S111_EVT1", "Event1", //
 				"Bitmask value. Event fields", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S111_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S111_Evt1.values())), //
 		EVT2(new BitFieldPoint("S111_EVT2", "Event Bitfield 2", //
 				"Reserved for future use", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S111_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S111_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND3(new BitFieldPoint("S111_EVT_VND3", "Vendor Event Bitfield 3", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND4(new BitFieldPoint("S111_EVT_VND4", "Vendor Event Bitfield 4", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
 
 		private final Point point;
 
@@ -1148,97 +1170,97 @@ public BitPoint get() {
 	public static enum S112 implements SunSpecPoint {
 		A(new ValuePoint("S112_A", "Amps", //
 				"AC Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_A(new ValuePoint("S112_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_B(new ValuePoint("S112_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_C(new ValuePoint("S112_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		P_P_VPH_A_B(new ValuePoint("S112_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		P_P_VPH_B_C(new ValuePoint("S112_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		P_P_VPH_C_A(new ValuePoint("S112_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_A(new ValuePoint("S112_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_B(new ValuePoint("S112_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_C(new ValuePoint("S112_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		W(new ValuePoint("S112_W", "Watts", //
 				"AC Power", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.WATT)), //
 		HZ(new ValuePoint("S112_HZ", "Hz", //
 				"Line Frequency", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.HERTZ)), //
 		VA(new ValuePoint("S112_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE)), //
 		V_AR(new ValuePoint("S112_V_AR", "VAr", //
 				"AC Reactive Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
 		PF(new ValuePoint("S112_PF", "PF", //
 				"AC Power Factor", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		WH(new ValuePoint("S112_WH", "WattHours", //
 				"AC Energy", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
 		DCA(new ValuePoint("S112_DCA", "DC Amps", //
 				"DC Current", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		DCV(new ValuePoint("S112_DCV", "DC Voltage", //
 				"DC Voltage", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		DCW(new ValuePoint("S112_DCW", "DC Watts", //
 				"DC Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.WATT)), //
 		TMP_CAB(new ValuePoint("S112_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet Temperature", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_SNK(new ValuePoint("S112_TMP_SNK", "Heat Sink Temperature", //
 				"Heat Sink Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_TRNS(new ValuePoint("S112_TMP_TRNS", "Transformer Temperature", //
 				"Transformer Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_OT(new ValuePoint("S112_TMP_OT", "Other Temperature", //
 				"Other Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		ST(new EnumPoint("S112_ST", "Operating State", //
 				"Enumerated value.  Operating state", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S112_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S112_St.values())), //
 		ST_VND(new EnumPoint("S112_ST_VND", "Vendor Operating State", //
 				"Vendor specific operating state code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT1(new BitFieldPoint("S112_EVT1", "Event1", //
 				"Bitmask value. Event fields", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S112_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S112_Evt1.values())), //
 		EVT2(new BitFieldPoint("S112_EVT2", "Event Bitfield 2", //
 				"Reserved for future use", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S112_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S112_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND3(new BitFieldPoint("S112_EVT_VND3", "Vendor Event Bitfield 3", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND4(new BitFieldPoint("S112_EVT_VND4", "Vendor Event Bitfield 4", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
 
 		private final Point point;
 
@@ -1320,97 +1342,97 @@ public BitPoint get() {
 	public static enum S113 implements SunSpecPoint {
 		A(new ValuePoint("S113_A", "Amps", //
 				"AC Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_A(new ValuePoint("S113_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_B(new ValuePoint("S113_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		APH_C(new ValuePoint("S113_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		P_P_VPH_A_B(new ValuePoint("S113_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		P_P_VPH_B_C(new ValuePoint("S113_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		P_P_VPH_C_A(new ValuePoint("S113_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_A(new ValuePoint("S113_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_B(new ValuePoint("S113_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		PH_VPH_C(new ValuePoint("S113_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		W(new ValuePoint("S113_W", "Watts", //
 				"AC Power", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.WATT)), //
 		HZ(new ValuePoint("S113_HZ", "Hz", //
 				"Line Frequency", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.HERTZ)), //
 		VA(new ValuePoint("S113_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE)), //
 		V_AR(new ValuePoint("S113_V_AR", "VAr", //
 				"AC Reactive Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
 		PF(new ValuePoint("S113_PF", "PF", //
 				"AC Power Factor", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		WH(new ValuePoint("S113_WH", "WattHours", //
 				"AC Energy", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
 		DCA(new ValuePoint("S113_DCA", "DC Amps", //
 				"DC Current", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
 		DCV(new ValuePoint("S113_DCV", "DC Voltage", //
 				"DC Voltage", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
 		DCW(new ValuePoint("S113_DCW", "DC Watts", //
 				"DC Power", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.WATT)), //
 		TMP_CAB(new ValuePoint("S113_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet Temperature", //
-				ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_SNK(new ValuePoint("S113_TMP_SNK", "Heat Sink Temperature", //
 				"Heat Sink Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_TRNS(new ValuePoint("S113_TMP_TRNS", "Transformer Temperature", //
 				"Transformer Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		TMP_OT(new ValuePoint("S113_TMP_OT", "Other Temperature", //
 				"Other Temperature", //
-				ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+				FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
 		ST(new EnumPoint("S113_ST", "Operating State", //
 				"Enumerated value.  Operating state", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S113_St.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S113_St.values())), //
 		ST_VND(new EnumPoint("S113_ST_VND", "Vendor Operating State", //
 				"Vendor specific operating state code", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		EVT1(new BitFieldPoint("S113_EVT1", "Event1", //
 				"Bitmask value. Event fields", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S113_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S113_Evt1.values())), //
 		EVT2(new BitFieldPoint("S113_EVT2", "Event Bitfield 2", //
 				"Reserved for future use", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S113_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S113_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND3(new BitFieldPoint("S113_EVT_VND3", "Vendor Event Bitfield 3", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND4(new BitFieldPoint("S113_EVT_VND4", "Vendor Event Bitfield 4", //
 				"Vendor defined events", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
 
 		private final Point point;
 
@@ -1492,73 +1514,73 @@ public BitPoint get() {
 	public static enum S120 implements SunSpecPoint {
 		D_E_R_TYP(new EnumPoint("S120_D_E_R_TYP", "DERTyp", //
 				"Type of DER device. Default value is 4 to indicate PV device.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S120_DERTyp.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S120_DERTyp.values())), //
 		W_RTG(new ScaledValuePoint("S120_W_RTG", "WRtg", //
 				"Continuous power output capability of the inverter.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "WRtg_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "WRtg_SF")), //
 		W_RTG_S_F(new ScaleFactorPoint("S120_W_RTG_S_F", "WRtg_SF", //
 				"Scale factor")), //
 		V_A_RTG(new ScaledValuePoint("S120_V_A_RTG", "VARtg", //
 				"Continuous Volt-Ampere capability of the inverter.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VARtg_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VARtg_SF")), //
 		V_A_RTG_S_F(new ScaleFactorPoint("S120_V_A_RTG_S_F", "VARtg_SF", //
 				"Scale factor")), //
 		V_AR_RTG_Q1(new ScaledValuePoint("S120_V_AR_RTG_Q1", "VArRtgQ1", //
 				"Continuous VAR capability of the inverter in quadrant 1.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
 		V_AR_RTG_Q2(new ScaledValuePoint("S120_V_AR_RTG_Q2", "VArRtgQ2", //
 				"Continuous VAR capability of the inverter in quadrant 2.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
 		V_AR_RTG_Q3(new ScaledValuePoint("S120_V_AR_RTG_Q3", "VArRtgQ3", //
 				"Continuous VAR capability of the inverter in quadrant 3.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
 		V_AR_RTG_Q4(new ScaledValuePoint("S120_V_AR_RTG_Q4", "VArRtgQ4", //
 				"Continuous VAR capability of the inverter in quadrant 4.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
 		V_AR_RTG_S_F(new ScaleFactorPoint("S120_V_AR_RTG_S_F", "VArRtg_SF", //
 				"Scale factor")), //
 		A_RTG(new ScaledValuePoint("S120_A_RTG", "ARtg", //
 				"Maximum RMS AC current level capability of the inverter.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "ARtg_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "ARtg_SF")), //
 		A_RTG_S_F(new ScaleFactorPoint("S120_A_RTG_S_F", "ARtg_SF", //
 				"Scale factor")), //
 		P_F_RTG_Q1(new ScaledValuePoint("S120_P_F_RTG_Q1", "PFRtgQ1", //
 				"Minimum power factor capability of the inverter in quadrant 1.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
 		P_F_RTG_Q2(new ScaledValuePoint("S120_P_F_RTG_Q2", "PFRtgQ2", //
 				"Minimum power factor capability of the inverter in quadrant 2.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
 		P_F_RTG_Q3(new ScaledValuePoint("S120_P_F_RTG_Q3", "PFRtgQ3", //
 				"Minimum power factor capability of the inverter in quadrant 3.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
 		P_F_RTG_Q4(new ScaledValuePoint("S120_P_F_RTG_Q4", "PFRtgQ4", //
 				"Minimum power factor capability of the inverter in quadrant 4.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
 		P_F_RTG_S_F(new ScaleFactorPoint("S120_P_F_RTG_S_F", "PFRtg_SF", //
 				"Scale factor")), //
 		W_H_RTG(new ScaledValuePoint("S120_W_H_RTG", "WHRtg", //
 				"Nominal energy rating of storage device.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
 		W_H_RTG_S_F(new ScaleFactorPoint("S120_W_H_RTG_S_F", "WHRtg_SF", //
 				"Scale factor")), //
 		AHR_RTG(new ScaledValuePoint("S120_AHR_RTG", "AhrRtg", //
 				"The usable capacity of the battery.  Maximum charge minus minimum charge from a technology capability perspective (Amp-hour capacity rating).", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "AhrRtg_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "AhrRtg_SF")), //
 		AHR_RTG_S_F(new ScaleFactorPoint("S120_AHR_RTG_S_F", "AhrRtg_SF", //
 				"Scale factor for amp-hour rating.")), //
 		MAX_CHA_RTE(new ScaledValuePoint("S120_MAX_CHA_RTE", "MaxChaRte", //
 				"Maximum rate of energy transfer into the storage device.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "MaxChaRte_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "MaxChaRte_SF")), //
 		MAX_CHA_RTE_S_F(new ScaleFactorPoint("S120_MAX_CHA_RTE_S_F", "MaxChaRte_SF", //
 				"Scale factor")), //
 		MAX_DIS_CHA_RTE(new ScaledValuePoint("S120_MAX_DIS_CHA_RTE", "MaxDisChaRte", //
 				"Maximum rate of energy transfer out of the storage device.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "MaxDisChaRte_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "MaxDisChaRte_SF")), //
 		MAX_DIS_CHA_RTE_S_F(new ScaleFactorPoint("S120_MAX_DIS_CHA_RTE_S_F", "MaxDisChaRte_SF", //
 				"Scale factor")), //
 		PAD(new ValuePoint("S120_PAD", "Pad", //
 				"Pad register.", //
-				ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -1604,64 +1626,64 @@ public OptionsEnum getUndefined() {
 	public static enum S121 implements SunSpecPoint {
 		W_MAX(new ScaledValuePoint("S121_W_MAX", "WMax", //
 				"Setting for maximum power output. Default to WRtg.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WMax_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.WATT, "WMax_SF")), //
 		V_REF(new ScaledValuePoint("S121_V_REF", "VRef", //
 				"Voltage at the PCC.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VRef_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.VOLT, "VRef_SF")), //
 		V_REF_OFS(new ScaledValuePoint("S121_V_REF_OFS", "VRefOfs", //
 				"Offset  from PCC to inverter.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VRefOfs_SF")), //
+				INT16, true /* mandatory? */, READ_WRITE, Unit.VOLT, "VRefOfs_SF")), //
 		V_MAX(new ScaledValuePoint("S121_V_MAX", "VMax", //
 				"Setpoint for maximum voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
 		V_MIN(new ScaledValuePoint("S121_V_MIN", "VMin", //
 				"Setpoint for minimum voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
 		V_A_MAX(new ScaledValuePoint("S121_V_A_MAX", "VAMax", //
 				"Setpoint for maximum apparent power. Default to VARtg.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VAMax_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VAMax_SF")), //
 		V_AR_MAX_Q1(new ScaledValuePoint("S121_V_AR_MAX_Q1", "VArMaxQ1", //
 				"Setting for maximum reactive power in quadrant 1. Default to VArRtgQ1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
 		V_AR_MAX_Q2(new ScaledValuePoint("S121_V_AR_MAX_Q2", "VArMaxQ2", //
 				"Setting for maximum reactive power in quadrant 2. Default to VArRtgQ2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
 		V_AR_MAX_Q3(new ScaledValuePoint("S121_V_AR_MAX_Q3", "VArMaxQ3", //
 				"Setting for maximum reactive power in quadrant 3. Default to VArRtgQ3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
 		V_AR_MAX_Q4(new ScaledValuePoint("S121_V_AR_MAX_Q4", "VArMaxQ4", //
 				"Setting for maximum reactive power in quadrant 4. Default to VArRtgQ4.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
 		W_GRA(new ScaledValuePoint("S121_W_GRA", "WGra", //
 				"Default ramp rate of change of active power due to command or internal action.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WGra_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "WGra_SF")), //
 		P_F_MIN_Q1(new ScaledValuePoint("S121_P_F_MIN_Q1", "PFMinQ1", //
 				"Setpoint for minimum power factor value in quadrant 1. Default to PFRtgQ1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
 		P_F_MIN_Q2(new ScaledValuePoint("S121_P_F_MIN_Q2", "PFMinQ2", //
 				"Setpoint for minimum power factor value in quadrant 2. Default to PFRtgQ2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
 		P_F_MIN_Q3(new ScaledValuePoint("S121_P_F_MIN_Q3", "PFMinQ3", //
 				"Setpoint for minimum power factor value in quadrant 3. Default to PFRtgQ3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
 		P_F_MIN_Q4(new ScaledValuePoint("S121_P_F_MIN_Q4", "PFMinQ4", //
 				"Setpoint for minimum power factor value in quadrant 4. Default to PFRtgQ4.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
 		V_AR_ACT(new EnumPoint("S121_V_AR_ACT", "VArAct", //
 				"VAR action on change between charging and discharging: 1=switch 2=maintain VAR characterization.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S121_VArAct.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S121_VArAct.values())), //
 		CLC_TOT_V_A(new EnumPoint("S121_CLC_TOT_V_A", "ClcTotVA", //
 				"Calculation method for total apparent power. 1=vector 2=arithmetic.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S121_ClcTotVA.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S121_ClcTotVA.values())), //
 		MAX_RMP_RTE(new ScaledValuePoint("S121_MAX_RMP_RTE", "MaxRmpRte", //
 				"Setpoint for maximum ramp rate as percentage of nominal maximum ramp rate. This setting will limit the rate that watts delivery to the grid can increase or decrease in response to intermittent PV generation.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "MaxRmpRte_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "MaxRmpRte_SF")), //
 		E_C_P_NOM_HZ(new ScaledValuePoint("S121_E_C_P_NOM_HZ", "ECPNomHz", //
 				"Setpoint for nominal frequency at the ECP.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "ECPNomHz_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.HERTZ, "ECPNomHz_SF")), //
 		CONN_PH(new EnumPoint("S121_CONN_PH", "ConnPh", //
 				"Identity of connected phase for single phase inverters. A=1 B=2 C=3.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S121_ConnPh.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S121_ConnPh.values())), //
 		W_MAX_S_F(new ScaleFactorPoint("S121_W_MAX_S_F", "WMax_SF", //
 				"Scale factor for real power.")), //
 		V_REF_S_F(new ScaleFactorPoint("S121_V_REF_S_F", "VRef_SF", //
@@ -1786,59 +1808,59 @@ public OptionsEnum getUndefined() {
 	public static enum S122 implements SunSpecPoint {
 		P_V_CONN(new BitFieldPoint("S122_P_V_CONN", "PVConn", //
 				"PV inverter present/available status. Enumerated value.", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_PVConn.values())), //
+				BITFIELD16, true /* mandatory? */, READ_ONLY, S122_PVConn.values())), //
 		STOR_CONN(new BitFieldPoint("S122_STOR_CONN", "StorConn", //
 				"Storage inverter present/available status. Enumerated value.", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_StorConn.values())), //
+				BITFIELD16, true /* mandatory? */, READ_ONLY, S122_StorConn.values())), //
 		E_C_P_CONN(new BitFieldPoint("S122_E_C_P_CONN", "ECPConn", //
 				"ECP connection status: disconnected=0  connected=1.", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_ECPConn.values())), //
+				BITFIELD16, true /* mandatory? */, READ_ONLY, S122_ECPConn.values())), //
 		ACT_WH(new ValuePoint("S122_ACT_WH", "ActWh", //
 				"AC lifetime active (real) energy output.", //
-				ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+				ACC64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
 		ACT_V_AH(new ValuePoint("S122_ACT_V_AH", "ActVAh", //
 				"AC lifetime apparent energy output.", //
-				ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS)), //
+				ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS)), //
 		ACT_V_ARH_Q1(new ValuePoint("S122_ACT_V_ARH_Q1", "ActVArhQ1", //
 				"AC lifetime reactive energy output in quadrant 1.", //
-				ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+				ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
 		ACT_V_ARH_Q2(new ValuePoint("S122_ACT_V_ARH_Q2", "ActVArhQ2", //
 				"AC lifetime reactive energy output in quadrant 2.", //
-				ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+				ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
 		ACT_V_ARH_Q3(new ValuePoint("S122_ACT_V_ARH_Q3", "ActVArhQ3", //
 				"AC lifetime negative energy output  in quadrant 3.", //
-				ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+				ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
 		ACT_V_ARH_Q4(new ValuePoint("S122_ACT_V_ARH_Q4", "ActVArhQ4", //
 				"AC lifetime reactive energy output  in quadrant 4.", //
-				ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+				ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
 		V_AR_AVAL(new ScaledValuePoint("S122_V_AR_AVAL", "VArAval", //
 				"Amount of VARs available without impacting watts output.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArAval_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArAval_SF")), //
 		V_AR_AVAL_S_F(new ScaleFactorPoint("S122_V_AR_AVAL_S_F", "VArAval_SF", //
 				"Scale factor for available VARs.")), //
 		W_AVAL(new ScaledValuePoint("S122_W_AVAL", "WAval", //
 				"Amount of Watts available.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "WAval_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "WAval_SF")), //
 		W_AVAL_S_F(new ScaleFactorPoint("S122_W_AVAL_S_F", "WAval_SF", //
 				"Scale factor for available Watts.")), //
 		ST_SET_LIM_MSK(new BitFieldPoint("S122_ST_SET_LIM_MSK", "StSetLimMsk", //
 				"Bit Mask indicating setpoint limit(s) reached.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S122_StSetLimMsk.values())), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, S122_StSetLimMsk.values())), //
 		ST_ACT_CTL(new BitFieldPoint("S122_ST_ACT_CTL", "StActCtl", //
 				"Bit Mask indicating which inverter controls are currently active.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S122_StActCtl.values())), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, S122_StActCtl.values())), //
 		TM_SRC(new ValuePoint("S122_TM_SRC", "TmSrc", //
 				"Source of time synchronization.", //
-				ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING4, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		TMS(new ValuePoint("S122_TMS", "Tms", //
 				"Seconds since 01-01-2000 00:00 UTC", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		RT_ST(new BitFieldPoint("S122_RT_ST", "RtSt", //
 				"Bit Mask indicating active ride-through status.", //
-				BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, S122_RtSt.values())), //
+				BITFIELD16, false /* mandatory? */, READ_ONLY, S122_RtSt.values())), //
 		RIS(new ScaledValuePoint("S122_RIS", "Ris", //
 				"Isolation resistance.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Ris_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "Ris_SF")), //
 		RIS_S_F(new ScaleFactorPoint("S122_RIS_S_F", "Ris_SF", //
 				"Scale factor for isolation resistance."));
 
@@ -1979,67 +2001,67 @@ public BitPoint get() {
 	public static enum S123 implements SunSpecPoint {
 		CONN_WIN_TMS(new ValuePoint("S123_CONN_WIN_TMS", "Conn_WinTms", //
 				"Time window for connect/disconnect.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		CONN_RVRT_TMS(new ValuePoint("S123_CONN_RVRT_TMS", "Conn_RvrtTms", //
 				"Timeout period for connect/disconnect.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		CONN(new EnumPoint("S123_CONN", "Conn", //
 				"Enumerated valued.  Connection control.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_Conn.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S123_Conn.values())), //
 		W_MAX_LIM_PCT(new ScaledValuePoint("S123_W_MAX_LIM_PCT", "WMaxLimPct", //
 				"Set power output to specified level.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WMaxLimPct_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WMaxLimPct_SF")), //
 		W_MAX_LIM_PCT_WIN_TMS(new ValuePoint("S123_W_MAX_LIM_PCT_WIN_TMS", "WMaxLimPct_WinTms", //
 				"Time window for power limit change.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		W_MAX_LIM_PCT_RVRT_TMS(new ValuePoint("S123_W_MAX_LIM_PCT_RVRT_TMS", "WMaxLimPct_RvrtTms", //
 				"Timeout period for power limit.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		W_MAX_LIM_PCT_RMP_TMS(new ValuePoint("S123_W_MAX_LIM_PCT_RMP_TMS", "WMaxLimPct_RmpTms", //
 				"Ramp time for moving from current setpoint to new setpoint.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		W_MAX_LIM_ENA(new EnumPoint("S123_W_MAX_LIM_ENA", "WMaxLim_Ena", //
 				"Enumerated valued.  Throttle enable/disable control.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_WMaxLim_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S123_WMaxLim_Ena.values())), //
 		OUT_P_F_SET(new ScaledValuePoint("S123_OUT_P_F_SET", "OutPFSet", //
 				"Set power factor to specific value - cosine of angle.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "OutPFSet_SF")), //
+				INT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "OutPFSet_SF")), //
 		OUT_P_F_SET_WIN_TMS(new ValuePoint("S123_OUT_P_F_SET_WIN_TMS", "OutPFSet_WinTms", //
 				"Time window for power factor change.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		OUT_P_F_SET_RVRT_TMS(new ValuePoint("S123_OUT_P_F_SET_RVRT_TMS", "OutPFSet_RvrtTms", //
 				"Timeout period for power factor.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		OUT_P_F_SET_RMP_TMS(new ValuePoint("S123_OUT_P_F_SET_RMP_TMS", "OutPFSet_RmpTms", //
 				"Ramp time for moving from current setpoint to new setpoint.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		OUT_P_F_SET_ENA(new EnumPoint("S123_OUT_P_F_SET_ENA", "OutPFSet_Ena", //
 				"Enumerated valued.  Fixed power factor enable/disable control.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_OutPFSet_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S123_OutPFSet_Ena.values())), //
 		V_AR_W_MAX_PCT(new ScaledValuePoint("S123_V_AR_W_MAX_PCT", "VArWMaxPct", //
 				"Reactive power in percent of WMax.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
 		V_AR_MAX_PCT(new ScaledValuePoint("S123_V_AR_MAX_PCT", "VArMaxPct", //
 				"Reactive power in percent of VArMax.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
 		V_AR_AVAL_PCT(new ScaledValuePoint("S123_V_AR_AVAL_PCT", "VArAvalPct", //
 				"Reactive power in percent of VArAval.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
 		V_AR_PCT_WIN_TMS(new ValuePoint("S123_V_AR_PCT_WIN_TMS", "VArPct_WinTms", //
 				"Time window for VAR limit change.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		V_AR_PCT_RVRT_TMS(new ValuePoint("S123_V_AR_PCT_RVRT_TMS", "VArPct_RvrtTms", //
 				"Timeout period for VAR limit.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		V_AR_PCT_RMP_TMS(new ValuePoint("S123_V_AR_PCT_RMP_TMS", "VArPct_RmpTms", //
 				"Ramp time for moving from current setpoint to new setpoint.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		V_AR_PCT_MOD(new EnumPoint("S123_V_AR_PCT_MOD", "VArPct_Mod", //
 				"Enumerated value. VAR percent limit mode.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S123_VArPct_Mod.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S123_VArPct_Mod.values())), //
 		V_AR_PCT_ENA(new EnumPoint("S123_V_AR_PCT_ENA", "VArPct_Ena", //
 				"Enumerated valued.  Percent limit VAr enable/disable control.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_VArPct_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S123_VArPct_Ena.values())), //
 		W_MAX_LIM_PCT_S_F(new ScaleFactorPoint("S123_W_MAX_LIM_PCT_S_F", "WMaxLimPct_SF", //
 				"Scale factor for power output percent.")), //
 		OUT_P_F_SET_S_F(new ScaleFactorPoint("S123_OUT_P_F_SET_S_F", "OutPFSet_SF", //
@@ -2209,51 +2231,51 @@ public OptionsEnum getUndefined() {
 	public static enum S124 implements SunSpecPoint {
 		W_CHA_MAX(new ScaledValuePoint("S124_W_CHA_MAX", "WChaMax", //
 				"Setpoint for maximum charge.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WChaMax_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.WATT, "WChaMax_SF")), //
 		W_CHA_GRA(new ScaledValuePoint("S124_W_CHA_GRA", "WChaGra", //
 				"Setpoint for maximum charging rate. Default is MaxChaRte.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
 		W_DIS_CHA_GRA(new ScaledValuePoint("S124_W_DIS_CHA_GRA", "WDisChaGra", //
 				"Setpoint for maximum discharge rate. Default is MaxDisChaRte.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
 		STOR_CTL_MOD(new BitFieldPoint("S124_STOR_CTL_MOD", "StorCtl_Mod", //
 				"Activate hold/discharge/charge storage control mode. Bitfield value.", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S124_StorCtl_Mod.values())), //
+				BITFIELD16, true /* mandatory? */, READ_WRITE, S124_StorCtl_Mod.values())), //
 		V_A_CHA_MAX(new ScaledValuePoint("S124_V_A_CHA_MAX", "VAChaMax", //
 				"Setpoint for maximum charging VA.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VAChaMax_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VAChaMax_SF")), //
 		MIN_RSV_PCT(new ScaledValuePoint("S124_MIN_RSV_PCT", "MinRsvPct", //
 				"Setpoint for minimum reserve for storage as a percentage of the nominal maximum storage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "MinRsvPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "MinRsvPct_SF")), //
 		CHA_STATE(new ScaledValuePoint("S124_CHA_STATE", "ChaState", //
 				"Currently available energy as a percent of the capacity rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "ChaState_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "ChaState_SF")), //
 		STOR_AVAL(new ScaledValuePoint("S124_STOR_AVAL", "StorAval", //
 				"State of charge (ChaState) minus storage reserve (MinRsvPct) times capacity rating (AhrRtg).", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "StorAval_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "StorAval_SF")), //
 		IN_BAT_V(new ScaledValuePoint("S124_IN_BAT_V", "InBatV", //
 				"Internal battery voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "InBatV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "InBatV_SF")), //
 		CHA_ST(new EnumPoint("S124_CHA_ST", "ChaSt", //
 				"Charge status of storage device. Enumerated value.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S124_ChaSt.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S124_ChaSt.values())), //
 		OUT_W_RTE(new ScaledValuePoint("S124_OUT_W_RTE", "OutWRte", //
 				"Percent of max discharge rate.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
 		IN_W_RTE(new ScaledValuePoint("S124_IN_W_RTE", "InWRte", //
 				"Percent of max charging rate.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
 		IN_OUT_W_RTE_WIN_TMS(new ValuePoint("S124_IN_OUT_W_RTE_WIN_TMS", "InOutWRte_WinTms", //
 				"Time window for charge/discharge rate change.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		IN_OUT_W_RTE_RVRT_TMS(new ValuePoint("S124_IN_OUT_W_RTE_RVRT_TMS", "InOutWRte_RvrtTms", //
 				"Timeout period for charge/discharge rate.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		IN_OUT_W_RTE_RMP_TMS(new ValuePoint("S124_IN_OUT_W_RTE_RMP_TMS", "InOutWRte_RmpTms", //
 				"Ramp time for moving from current setpoint to new setpoint.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		CHA_GRI_SET(new EnumPoint("S124_CHA_GRI_SET", "", "", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S124_ChaGriSet.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S124_ChaGriSet.values())), //
 		W_CHA_MAX_S_F(new ScaleFactorPoint("S124_W_CHA_MAX_S_F", "WChaMax_SF", //
 				"Scale factor for maximum charge.")), //
 		W_CHA_DIS_CHA_GRA_S_F(new ScaleFactorPoint("S124_W_CHA_DIS_CHA_GRA_S_F", "WChaDisChaGra_SF", //
@@ -2365,26 +2387,26 @@ public OptionsEnum getUndefined() {
 	public static enum S125 implements SunSpecPoint {
 		MOD_ENA(new BitFieldPoint("S125_MOD_ENA", "ModEna", //
 				"Is price-based charge/discharge mode active?", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S125_ModEna.values())), //
+				BITFIELD16, true /* mandatory? */, READ_WRITE, S125_ModEna.values())), //
 		SIG_TYPE(new EnumPoint("S125_SIG_TYPE", "SigType", //
 				"Meaning of the pricing signal. When a Price schedule is used, type must match the schedule range variable description.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S125_SigType.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S125_SigType.values())), //
 		SIG(new ScaledValuePoint("S125_SIG", "Sig", //
 				"Utility/ESP specific pricing signal. Content depends on pricing signal type. When H/M/L type is specified. Low=0; Med=1; High=2.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Sig_SF")), //
+				INT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "Sig_SF")), //
 		WIN_TMS(new ValuePoint("S125_WIN_TMS", "WinTms", //
 				"Time window for charge/discharge pricing change.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		RVT_TMS(new ValuePoint("S125_RVT_TMS", "RvtTms", //
 				"Timeout period for charge/discharge pricing change.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		RMP_TMS(new ValuePoint("S125_RMP_TMS", "RmpTms", //
 				"Ramp time for moving from current charge or discharge level to new level.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		SIG_S_F(new ScaleFactorPoint("S125_SIG_S_F", "Sig_SF", //
 				"Pricing signal scale factor.")), //
 		PAD(new ValuePoint("S125_PAD", "", "", //
-				ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -2448,22 +2470,22 @@ public OptionsEnum getUndefined() {
 	public static enum S127 implements SunSpecPoint {
 		W_GRA(new ScaledValuePoint("S127_W_GRA", "WGra", //
 				"The slope of the reduction in the maximum allowed watts output as a function of frequency.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WGra_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WGra_SF")), //
 		HZ_STR(new ScaledValuePoint("S127_HZ_STR", "HzStr", //
 				"The frequency deviation from nominal frequency (ECPNomHz) at which a snapshot of the instantaneous power output is taken to act as the CAPPED power level (PM) and above which reduction in power output occurs.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
+				INT16, true /* mandatory? */, READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
 		HZ_STOP(new ScaledValuePoint("S127_HZ_STOP", "HzStop", //
 				"The frequency deviation from nominal frequency (ECPNomHz) at which curtailed power output may return to normal and the cap on the power level value is removed.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
+				INT16, true /* mandatory? */, READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
 		HYS_ENA(new BitFieldPoint("S127_HYS_ENA", "HysEna", //
 				"Enable hysteresis", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S127_HysEna.values())), //
+				BITFIELD16, true /* mandatory? */, READ_WRITE, S127_HysEna.values())), //
 		MOD_ENA(new BitFieldPoint("S127_MOD_ENA", "ModEna", //
 				"Is Parameterized Frequency-Watt control active.", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S127_ModEna.values())), //
+				BITFIELD16, true /* mandatory? */, READ_WRITE, S127_ModEna.values())), //
 		HZ_STOP_W_GRA(new ScaledValuePoint("S127_HZ_STOP_W_GRA", "HzStopWGra", //
 				"The maximum time-based rate of change at which power output returns to normal after having been capped by an over frequency event.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "RmpIncDec_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "RmpIncDec_SF")), //
 		W_GRA_S_F(new ScaleFactorPoint("S127_W_GRA_S_F", "WGra_SF", //
 				"Scale factor for output gradient.")), //
 		HZ_STR_STOP_S_F(new ScaleFactorPoint("S127_HZ_STR_STOP_S_F", "HzStrStop_SF", //
@@ -2471,7 +2493,7 @@ public static enum S127 implements SunSpecPoint {
 		RMP_INC_DEC_S_F(new ScaleFactorPoint("S127_RMP_INC_DEC_S_F", "RmpIncDec_SF", //
 				"Scale factor for increment and decrement ramps.")), //
 		PAD(new ValuePoint("S127_PAD", "", "", //
-				ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -2518,43 +2540,43 @@ public BitPoint get() {
 	public static enum S128 implements SunSpecPoint {
 		AR_GRA_MOD(new EnumPoint("S128_AR_GRA_MOD", "ArGraMod", //
 				"Indicates if gradients trend toward zero at the edges of the deadband or trend toward zero at the center of the deadband.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S128_ArGraMod.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S128_ArGraMod.values())), //
 		AR_GRA_SAG(new ScaledValuePoint("S128_AR_GRA_SAG", "ArGraSag", //
 				"The gradient used to increase capacitive dynamic current. A value of 0 indicates no additional reactive current support.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "ArGra_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "ArGra_SF")), //
 		AR_GRA_SWELL(new ScaledValuePoint("S128_AR_GRA_SWELL", "ArGraSwell", //
 				"The gradient used to increase inductive dynamic current.  A value of 0 indicates no additional reactive current support.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "ArGra_SF")), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "ArGra_SF")), //
 		MOD_ENA(new BitFieldPoint("S128_MOD_ENA", "ModEna", //
 				"Activate dynamic reactive current model", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S128_ModEna.values())), //
+				BITFIELD16, true /* mandatory? */, READ_WRITE, S128_ModEna.values())), //
 		FIL_TMS(new ValuePoint("S128_FIL_TMS", "FilTms", //
 				"The time window used to calculate the moving average voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		DB_V_MIN(new ScaledValuePoint("S128_DB_V_MIN", "DbVMin", //
 				"The lower delta voltage limit for which negative voltage deviations less than this value no dynamic vars are produced.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
 		DB_V_MAX(new ScaledValuePoint("S128_DB_V_MAX", "DbVMax", //
 				"The upper delta voltage limit for which positive voltage deviations less than this value no dynamic current produced.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
 		BLK_ZN_V(new ScaledValuePoint("S128_BLK_ZN_V", "BlkZnV", //
 				"Block zone voltage which defines a lower voltage boundary below which no dynamic current is produced.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
 		HYS_BLK_ZN_V(new ScaledValuePoint("S128_HYS_BLK_ZN_V", "HysBlkZnV", //
 				"Hysteresis voltage used with BlkZnV.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
 		BLK_ZN_TMMS(new ValuePoint("S128_BLK_ZN_TMMS", "BlkZnTmms", //
 				"Block zone time the time before which reactive current support remains active regardless of how low the voltage drops.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.MILLISECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.MILLISECONDS)), //
 		HOLD_TMMS(new ValuePoint("S128_HOLD_TMMS", "HoldTmms", //
 				"Hold time during which reactive current support continues after the average voltage has entered the dead zone.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.MILLISECONDS)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.MILLISECONDS)), //
 		AR_GRA_S_F(new ScaleFactorPoint("S128_AR_GRA_S_F", "ArGra_SF", //
 				"Scale factor for the gradients.")), //
 		V_REF_PCT_S_F(new ScaleFactorPoint("S128_V_REF_PCT_S_F", "VRefPct_SF", //
 				"Scale factor for the voltage zone and limit settings.")), //
 		PAD(new ValuePoint("S128_PAD", "", "", //
-				ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -2615,25 +2637,25 @@ public BitPoint get() {
 	public static enum S145 implements SunSpecPoint {
 		NOM_RMP_UP_RTE(new ScaledValuePoint("S145_NOM_RMP_UP_RTE", "Ramp Up Rate", //
 				"Ramp up rate as a percentage of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		NOM_RMP_DN_RTE(new ScaledValuePoint("S145_NOM_RMP_DN_RTE", "NomRmpDnRte", //
 				"Ramp down rate as a percentage of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		EMG_RMP_UP_RTE(new ScaledValuePoint("S145_EMG_RMP_UP_RTE", "Emergency Ramp Up Rate", //
 				"Emergency ramp up rate as a percentage of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		EMG_RMP_DN_RTE(new ScaledValuePoint("S145_EMG_RMP_DN_RTE", "Emergency Ramp Down Rate", //
 				"Emergency ramp down rate as a percentage of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		CONN_RMP_UP_RTE(new ScaledValuePoint("S145_CONN_RMP_UP_RTE", "Connect Ramp Up Rate", //
 				"Connect ramp up rate as a percentage of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		CONN_RMP_DN_RTE(new ScaledValuePoint("S145_CONN_RMP_DN_RTE", "Connect Ramp Down Rate", //
 				"Connect ramp down rate as a percentage of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		A_GRA(new ScaledValuePoint("S145_A_GRA", "Default Ramp Rate", //
 				"Ramp rate specified in percent of max current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
 		RMP_S_F(new ScaleFactorPoint("S145_RMP_S_F", "Ramp Rate Scale Factor", //
 				"Ramp Rate Scale Factor"));
 
@@ -2652,174 +2674,186 @@ public Point get() {
 	public static enum S201 implements SunSpecPoint {
 		A(new ScaledValuePoint("S201_A", "Amps", //
 				"Total AC Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S201_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S201_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S201_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S201_A_SF", "", //
 				"Current scale factor")), //
 		PH_V(new ScaledValuePoint("S201_PH_V", "Voltage LN", //
 				"Line to Neutral AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S201_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S201_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S201_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PPV(new ScaledValuePoint("S201_PPV", "Voltage LL", //
 				"Line to Line AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_A_B(new ScaledValuePoint("S201_P_P_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_B_C(new ScaledValuePoint("S201_P_P_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		P_P_VPH_C_A(new ScaledValuePoint("S201_P_P_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S201_V_SF", "", //
 				"Voltage scale factor")), //
 		HZ(new ScaledValuePoint("S201_HZ", "Hz", //
 				"Frequency", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S201_HZ_S_F", "", //
 				"Frequency scale factor")), //
 		W(new ScaledValuePoint("S201_W", "Watts", //
 				"Total Real Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_A(new ScaledValuePoint("S201_WPH_A", "Watts phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_B(new ScaledValuePoint("S201_WPH_B", "Watts phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_C(new ScaledValuePoint("S201_WPH_C", "Watts phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S201_W_SF", "", //
 				"Real Power scale factor")), //
 		VA(new ScaledValuePoint("S201_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_A(new ScaledValuePoint("S201_V_APH_A", "VA phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_B(new ScaledValuePoint("S201_V_APH_B", "VA phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_C(new ScaledValuePoint("S201_V_APH_C", "VA phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S201_VA_SF", "", //
 				"Apparent Power scale factor")), //
 		VAR(new ScaledValuePoint("S201_VAR", "VAR", //
 				"Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_A(new ScaledValuePoint("S201_V_A_RPH_A", "VAR phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_B(new ScaledValuePoint("S201_V_A_RPH_B", "VAR phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_C(new ScaledValuePoint("S201_V_A_RPH_C", "VAR phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		VAR_SF(new ScaleFactorPoint("S201_VAR_SF", "", //
 				"Reactive Power scale factor")), //
 		PF(new ScaledValuePoint("S201_PF", "PF", //
 				"Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_A(new ScaledValuePoint("S201_P_FPH_A", "PF phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_B(new ScaledValuePoint("S201_P_FPH_B", "PF phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_C(new ScaledValuePoint("S201_P_FPH_C", "PF phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S201_PF_SF", "", //
 				"Power Factor scale factor")), //
 		TOT_WH_EXP(new ScaledValuePoint("S201_TOT_WH_EXP", "Total Watt-hours Exported", //
 				"Total Real Energy Exported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_A(new ScaledValuePoint("S201_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_B(new ScaledValuePoint("S201_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_C(new ScaledValuePoint("S201_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP(new ScaledValuePoint("S201_TOT_WH_IMP", "Total Watt-hours Imported", //
 				"Total Real Energy Imported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_A(new ScaledValuePoint("S201_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_B(new ScaledValuePoint("S201_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_C(new ScaledValuePoint("S201_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_S_F(new ScaleFactorPoint("S201_TOT_WH_S_F", "", //
 				"Real Energy scale factor")), //
 		TOT_V_AH_EXP(new ScaledValuePoint("S201_TOT_V_AH_EXP", "Total VA-hours Exported", //
 				"Total Apparent Energy Exported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S201_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S201_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S201_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP(new ScaledValuePoint("S201_TOT_V_AH_IMP", "Total VA-hours Imported", //
 				"Total Apparent Energy Imported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S201_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S201_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S201_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_S_F(new ScaleFactorPoint("S201_TOT_V_AH_S_F", "", //
 				"Apparent Energy scale factor")), //
 		TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
 				"Total Reactive Energy Imported Quadrant 1", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_A(
+				new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_B(
+				new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_C(
+				new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
 				"Total Reactive Power Imported Quadrant 2", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_A(
+				new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_B(
+				new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_C(
+				new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
 				"Total Reactive Power Exported Quadrant 3", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_A(
+				new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_B(
+				new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_C(
+				new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
 				"Total Reactive Power Exported Quadrant 4", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_A(
+				new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_B(
+				new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_C(
+				new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_S_F(new ScaleFactorPoint("S201_TOT_V_ARH_S_F", "", //
 				"Reactive Energy scale factor")), //
 		EVT(new BitFieldPoint("S201_EVT", "Events", //
 				"Meter Event Flags", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S201_Evt.values()));
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S201_Evt.values()));
 
 		private final Point point;
 
@@ -2871,174 +2905,186 @@ public BitPoint get() {
 	public static enum S202 implements SunSpecPoint {
 		A(new ScaledValuePoint("S202_A", "Amps", //
 				"Total AC Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S202_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S202_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S202_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S202_A_SF", "", //
 				"Current scale factor")), //
 		PH_V(new ScaledValuePoint("S202_PH_V", "Voltage LN", //
 				"Line to Neutral AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S202_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S202_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S202_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PPV(new ScaledValuePoint("S202_PPV", "Voltage LL", //
 				"Line to Line AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A_B(new ScaledValuePoint("S202_PH_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B_C(new ScaledValuePoint("S202_PH_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C_A(new ScaledValuePoint("S202_PH_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S202_V_SF", "", //
 				"Voltage scale factor")), //
 		HZ(new ScaledValuePoint("S202_HZ", "Hz", //
 				"Frequency", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S202_HZ_S_F", "", //
 				"Frequency scale factor")), //
 		W(new ScaledValuePoint("S202_W", "Watts", //
 				"Total Real Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_A(new ScaledValuePoint("S202_WPH_A", "Watts phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_B(new ScaledValuePoint("S202_WPH_B", "Watts phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_C(new ScaledValuePoint("S202_WPH_C", "Watts phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S202_W_SF", "", //
 				"Real Power scale factor")), //
 		VA(new ScaledValuePoint("S202_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_A(new ScaledValuePoint("S202_V_APH_A", "VA phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_B(new ScaledValuePoint("S202_V_APH_B", "VA phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_C(new ScaledValuePoint("S202_V_APH_C", "VA phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S202_VA_SF", "", //
 				"Apparent Power scale factor")), //
 		VAR(new ScaledValuePoint("S202_VAR", "VAR", //
 				"Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_A(new ScaledValuePoint("S202_V_A_RPH_A", "VAR phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_B(new ScaledValuePoint("S202_V_A_RPH_B", "VAR phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_C(new ScaledValuePoint("S202_V_A_RPH_C", "VAR phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		VAR_SF(new ScaleFactorPoint("S202_VAR_SF", "", //
 				"Reactive Power scale factor")), //
 		PF(new ScaledValuePoint("S202_PF", "PF", //
 				"Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_A(new ScaledValuePoint("S202_P_FPH_A", "PF phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_B(new ScaledValuePoint("S202_P_FPH_B", "PF phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_C(new ScaledValuePoint("S202_P_FPH_C", "PF phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S202_PF_SF", "", //
 				"Power Factor scale factor")), //
 		TOT_WH_EXP(new ScaledValuePoint("S202_TOT_WH_EXP", "Total Watt-hours Exported", //
 				"Total Real Energy Exported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_A(new ScaledValuePoint("S202_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_B(new ScaledValuePoint("S202_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_C(new ScaledValuePoint("S202_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP(new ScaledValuePoint("S202_TOT_WH_IMP", "Total Watt-hours Imported", //
 				"Total Real Energy Imported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_A(new ScaledValuePoint("S202_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_B(new ScaledValuePoint("S202_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_C(new ScaledValuePoint("S202_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_S_F(new ScaleFactorPoint("S202_TOT_WH_S_F", "", //
 				"Real Energy scale factor")), //
 		TOT_V_AH_EXP(new ScaledValuePoint("S202_TOT_V_AH_EXP", "Total VA-hours Exported", //
 				"Total Apparent Energy Exported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S202_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S202_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S202_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP(new ScaledValuePoint("S202_TOT_V_AH_IMP", "Total VA-hours Imported", //
 				"Total Apparent Energy Imported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S202_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S202_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S202_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_S_F(new ScaleFactorPoint("S202_TOT_V_AH_S_F", "", //
 				"Apparent Energy scale factor")), //
 		TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
 				"Total Reactive Energy Imported Quadrant 1", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_A(
+				new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_B(
+				new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_C(
+				new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
 				"Total Reactive Power Imported Quadrant 2", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_A(
+				new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_B(
+				new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_C(
+				new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
 				"Total Reactive Power Exported Quadrant 3", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_A(
+				new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_B(
+				new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_C(
+				new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
 				"Total Reactive Power Exported Quadrant 4", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_A(
+				new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_B(
+				new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_C(
+				new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_S_F(new ScaleFactorPoint("S202_TOT_V_ARH_S_F", "", //
 				"Reactive Energy scale factor")), //
 		EVT(new BitFieldPoint("S202_EVT", "Events", //
 				"Meter Event Flags", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S202_Evt.values()));
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S202_Evt.values()));
 
 		private final Point point;
 
@@ -3098,174 +3144,186 @@ public BitPoint get() {
 	public static enum S203 implements SunSpecPoint {
 		A(new ScaledValuePoint("S203_A", "Amps", //
 				"Total AC Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S203_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S203_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S203_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S203_A_SF", "", //
 				"Current scale factor")), //
 		PH_V(new ScaledValuePoint("S203_PH_V", "Voltage LN", //
 				"Line to Neutral AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S203_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S203_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S203_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PPV(new ScaledValuePoint("S203_PPV", "Voltage LL", //
 				"Line to Line AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A_B(new ScaledValuePoint("S203_PH_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B_C(new ScaledValuePoint("S203_PH_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C_A(new ScaledValuePoint("S203_PH_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S203_V_SF", "", //
 				"Voltage scale factor")), //
 		HZ(new ScaledValuePoint("S203_HZ", "Hz", //
 				"Frequency", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S203_HZ_S_F", "", //
 				"Frequency scale factor")), //
 		W(new ScaledValuePoint("S203_W", "Watts", //
 				"Total Real Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_A(new ScaledValuePoint("S203_WPH_A", "Watts phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_B(new ScaledValuePoint("S203_WPH_B", "Watts phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_C(new ScaledValuePoint("S203_WPH_C", "Watts phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S203_W_SF", "", //
 				"Real Power scale factor")), //
 		VA(new ScaledValuePoint("S203_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_A(new ScaledValuePoint("S203_V_APH_A", "VA phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_B(new ScaledValuePoint("S203_V_APH_B", "VA phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_C(new ScaledValuePoint("S203_V_APH_C", "VA phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S203_VA_SF", "", //
 				"Apparent Power scale factor")), //
 		VAR(new ScaledValuePoint("S203_VAR", "VAR", //
 				"Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_A(new ScaledValuePoint("S203_V_A_RPH_A", "VAR phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_B(new ScaledValuePoint("S203_V_A_RPH_B", "VAR phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_C(new ScaledValuePoint("S203_V_A_RPH_C", "VAR phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		VAR_SF(new ScaleFactorPoint("S203_VAR_SF", "", //
 				"Reactive Power scale factor")), //
 		PF(new ScaledValuePoint("S203_PF", "PF", //
 				"Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_A(new ScaledValuePoint("S203_P_FPH_A", "PF phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_B(new ScaledValuePoint("S203_P_FPH_B", "PF phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_C(new ScaledValuePoint("S203_P_FPH_C", "PF phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S203_PF_SF", "", //
 				"Power Factor scale factor")), //
 		TOT_WH_EXP(new ScaledValuePoint("S203_TOT_WH_EXP", "Total Watt-hours Exported", //
 				"Total Real Energy Exported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_A(new ScaledValuePoint("S203_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_B(new ScaledValuePoint("S203_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_C(new ScaledValuePoint("S203_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP(new ScaledValuePoint("S203_TOT_WH_IMP", "Total Watt-hours Imported", //
 				"Total Real Energy Imported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_A(new ScaledValuePoint("S203_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_B(new ScaledValuePoint("S203_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_C(new ScaledValuePoint("S203_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_S_F(new ScaleFactorPoint("S203_TOT_WH_S_F", "", //
 				"Real Energy scale factor")), //
 		TOT_V_AH_EXP(new ScaledValuePoint("S203_TOT_V_AH_EXP", "Total VA-hours Exported", //
 				"Total Apparent Energy Exported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S203_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S203_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S203_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP(new ScaledValuePoint("S203_TOT_V_AH_IMP", "Total VA-hours Imported", //
 				"Total Apparent Energy Imported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S203_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S203_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S203_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_S_F(new ScaleFactorPoint("S203_TOT_V_AH_S_F", "", //
 				"Apparent Energy scale factor")), //
 		TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
 				"Total Reactive Energy Imported Quadrant 1", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_A(
+				new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_B(
+				new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_C(
+				new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
 				"Total Reactive Power Imported Quadrant 2", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_A(
+				new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_B(
+				new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_C(
+				new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
 				"Total Reactive Power Exported Quadrant 3", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_A(
+				new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_B(
+				new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_C(
+				new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
 				"Total Reactive Power Exported Quadrant 4", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_A(
+				new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_B(
+				new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_C(
+				new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_S_F(new ScaleFactorPoint("S203_TOT_V_ARH_S_F", "", //
 				"Reactive Energy scale factor")), //
 		EVT(new BitFieldPoint("S203_EVT", "Events", //
 				"Meter Event Flags", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S203_Evt.values()));
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S203_Evt.values()));
 
 		private final Point point;
 
@@ -3325,174 +3383,186 @@ public BitPoint get() {
 	public static enum S204 implements SunSpecPoint {
 		A(new ScaledValuePoint("S204_A", "Amps", //
 				"Total AC Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_A(new ScaledValuePoint("S204_APH_A", "Amps PhaseA", //
 				"Phase A Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_B(new ScaledValuePoint("S204_APH_B", "Amps PhaseB", //
 				"Phase B Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		APH_C(new ScaledValuePoint("S204_APH_C", "Amps PhaseC", //
 				"Phase C Current", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_SF(new ScaleFactorPoint("S204_A_SF", "", //
 				"Current scale factor")), //
 		PH_V(new ScaledValuePoint("S204_PH_V", "Voltage LN", //
 				"Line to Neutral AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A(new ScaledValuePoint("S204_PH_VPH_A", "Phase Voltage AN", //
 				"Phase Voltage AN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B(new ScaledValuePoint("S204_PH_VPH_B", "Phase Voltage BN", //
 				"Phase Voltage BN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C(new ScaledValuePoint("S204_PH_VPH_C", "Phase Voltage CN", //
 				"Phase Voltage CN", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PPV(new ScaledValuePoint("S204_PPV", "Voltage LL", //
 				"Line to Line AC Voltage (average of active phases)", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_A_B(new ScaledValuePoint("S204_PH_VPH_A_B", "Phase Voltage AB", //
 				"Phase Voltage AB", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_B_C(new ScaledValuePoint("S204_PH_VPH_B_C", "Phase Voltage BC", //
 				"Phase Voltage BC", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		PH_VPH_C_A(new ScaledValuePoint("S204_PH_VPH_C_A", "Phase Voltage CA", //
 				"Phase Voltage CA", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_SF(new ScaleFactorPoint("S204_V_SF", "", //
 				"Voltage scale factor")), //
 		HZ(new ScaledValuePoint("S204_HZ", "Hz", //
 				"Frequency", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		HZ_S_F(new ScaleFactorPoint("S204_HZ_S_F", "", //
 				"Frequency scale factor")), //
 		W(new ScaledValuePoint("S204_W", "Watts", //
 				"Total Real Power", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_A(new ScaledValuePoint("S204_WPH_A", "Watts phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_B(new ScaledValuePoint("S204_WPH_B", "Watts phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		WPH_C(new ScaledValuePoint("S204_WPH_C", "Watts phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_SF(new ScaleFactorPoint("S204_W_SF", "", //
 				"Real Power scale factor")), //
 		VA(new ScaledValuePoint("S204_VA", "VA", //
 				"AC Apparent Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_A(new ScaledValuePoint("S204_V_APH_A", "VA phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_B(new ScaledValuePoint("S204_V_APH_B", "VA phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_APH_C(new ScaledValuePoint("S204_V_APH_C", "VA phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VA_SF(new ScaleFactorPoint("S204_VA_SF", "", //
 				"Apparent Power scale factor")), //
 		VAR(new ScaledValuePoint("S204_VAR", "VAR", //
 				"Reactive Power", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_A(new ScaledValuePoint("S204_V_A_RPH_A", "VAR phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_B(new ScaledValuePoint("S204_V_A_RPH_B", "VAR phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		V_A_RPH_C(new ScaledValuePoint("S204_V_A_RPH_C", "VAR phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
 		VAR_SF(new ScaleFactorPoint("S204_VAR_SF", "", //
 				"Reactive Power scale factor")), //
 		PF(new ScaledValuePoint("S204_PF", "PF", //
 				"Power Factor", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_A(new ScaledValuePoint("S204_P_FPH_A", "PF phase A", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_B(new ScaledValuePoint("S204_P_FPH_B", "PF phase B", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_FPH_C(new ScaledValuePoint("S204_P_FPH_C", "PF phase C", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		PF_SF(new ScaleFactorPoint("S204_PF_SF", "", //
 				"Power Factor scale factor")), //
 		TOT_WH_EXP(new ScaledValuePoint("S204_TOT_WH_EXP", "Total Watt-hours Exported", //
 				"Total Real Energy Exported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_A(new ScaledValuePoint("S204_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_B(new ScaledValuePoint("S204_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_EXP_PH_C(new ScaledValuePoint("S204_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP(new ScaledValuePoint("S204_TOT_WH_IMP", "Total Watt-hours Imported", //
 				"Total Real Energy Imported", //
-				ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_A(new ScaledValuePoint("S204_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_B(new ScaledValuePoint("S204_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_IMP_PH_C(new ScaledValuePoint("S204_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_S_F(new ScaleFactorPoint("S204_TOT_WH_S_F", "", //
 				"Real Energy scale factor")), //
 		TOT_V_AH_EXP(new ScaledValuePoint("S204_TOT_V_AH_EXP", "Total VA-hours Exported", //
 				"Total Apparent Energy Exported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S204_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S204_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S204_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP(new ScaledValuePoint("S204_TOT_V_AH_IMP", "Total VA-hours Imported", //
 				"Total Apparent Energy Imported", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S204_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S204_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S204_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
 		TOT_V_AH_S_F(new ScaleFactorPoint("S204_TOT_V_AH_S_F", "", //
 				"Apparent Energy scale factor")), //
 		TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
 				"Total Reactive Energy Imported Quadrant 1", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_A(
+				new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_B(
+				new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q1_PH_C(
+				new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
 				"Total Reactive Power Imported Quadrant 2", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_A(
+				new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_B(
+				new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_IMP_Q2_PH_C(
+				new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
 				"Total Reactive Power Exported Quadrant 3", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_A(
+				new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_B(
+				new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q3_PH_C(
+				new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
 				"Total Reactive Power Exported Quadrant 4", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
-		TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
-				ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+				ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_A(
+				new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_B(
+				new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+		TOT_V_ARH_EXP_Q4_PH_C(
+				new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+						ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
 		TOT_V_ARH_S_F(new ScaleFactorPoint("S204_TOT_V_ARH_S_F", "", //
 				"Reactive Energy scale factor")), //
 		EVT(new BitFieldPoint("S204_EVT", "Events", //
 				"Meter Event Flags", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S204_Evt.values()));
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S204_Evt.values()));
 
 		private final Point point;
 
@@ -3552,22 +3622,22 @@ public BitPoint get() {
 	public static enum S305 implements SunSpecPoint {
 		TM(new ValuePoint("S305_TM", "Tm", //
 				"UTC 24 hour time stamp to millisecond hhmmss.sssZ format", //
-				ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING6, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		DATE(new ValuePoint("S305_DATE", "Date", //
 				"UTC Date string YYYYMMDD format", //
-				ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING4, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		LOC(new ValuePoint("S305_LOC", "Location", //
 				"Location string (40 chars max)", //
-				ValuePoint.Type.STRING20, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING20, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		LAT(new ScaledValuePoint("S305_LAT", "Lat", //
 				"Latitude with seven degrees of precision", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "-7")), //
+				INT32, false /* mandatory? */, READ_ONLY, Unit.NONE, "-7")), //
 		LONG(new ScaledValuePoint("S305_LONG", "Long", //
 				"Longitude with seven degrees of precision", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "-7")), //
+				INT32, false /* mandatory? */, READ_ONLY, Unit.NONE, "-7")), //
 		ALT(new ValuePoint("S305_ALT", "Altitude", //
 				"Altitude measurement in meters", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				INT32, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -3584,16 +3654,16 @@ public Point get() {
 	public static enum S306 implements SunSpecPoint {
 		GHI(new ValuePoint("S306_GHI", "GHI", //
 				"Global Horizontal Irradiance", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		A(new ValuePoint("S306_A", "Amps", //
 				"Current measurement at reference point", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		V(new ValuePoint("S306_V", "Voltage", //
 				"Voltage  measurement at reference point", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		TMP(new ValuePoint("S306_TMP", "Temperature", //
 				"Temperature measurement at reference point", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -3609,28 +3679,28 @@ public Point get() {
 
 	public static enum S307 implements SunSpecPoint {
 		TMP_AMB(new ScaledValuePoint("S307_TMP_AMB", "Ambient Temperature", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
 		RH(new ValuePoint("S307_RH", "Relative Humidity", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		PRES(new ValuePoint("S307_PRES", "Barometric Pressure", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		WND_SPD(new ValuePoint("S307_WND_SPD", "Wind Speed", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		WND_DIR(new ValuePoint("S307_WND_DIR", "Wind Direction", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		RAIN(new ValuePoint("S307_RAIN", "Rainfall", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		SNW(new ValuePoint("S307_SNW", "Snow Depth", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		PPT(new ValuePoint("S307_PPT", "Precipitation Type", //
 				"Precipitation Type (WMO 4680 SYNOP code reference)", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELEC_FLD(new ValuePoint("S307_ELEC_FLD", "Electric Field", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		SUR_WET(new ValuePoint("S307_SUR_WET", "Surface Wetness", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		SOIL_WET(new ValuePoint("S307_SOIL_WET", "Soil Wetness", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -3647,14 +3717,14 @@ public Point get() {
 	public static enum S308 implements SunSpecPoint {
 		GHI(new ValuePoint("S308_GHI", "GHI", //
 				"Global Horizontal Irradiance", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		TMP_B_O_M(new ScaledValuePoint("S308_TMP_B_O_M", "Temp", //
 				"Back of module temperature measurement", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
 		TMP_AMB(new ScaledValuePoint("S308_TMP_AMB", "Ambient Temperature", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
 		WND_SPD(new ValuePoint("S308_WND_SPD", "Wind Speed", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -3671,181 +3741,181 @@ public Point get() {
 	public static enum S701 implements SunSpecPoint {
 		A_C_TYPE(new EnumPoint("S701_A_C_TYPE", "AC Wiring Type", //
 				"AC wiring type.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S701_ACType.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S701_ACType.values())), //
 		ST(new EnumPoint("S701_ST", "Operating State", //
 				"Operating state of the DER.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_St.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S701_St.values())), //
 		INV_ST(new EnumPoint("S701_INV_ST", "Inverter State", //
 				"Enumerated value.  Inverter state.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_InvSt.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S701_InvSt.values())), //
 		CONN_ST(new EnumPoint("S701_CONN_ST", "Grid Connection State", //
 				"Grid connection state of the DER.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_ConnSt.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S701_ConnSt.values())), //
 		ALRM(new BitFieldPoint("S701_ALRM", "Alarm Bitfield", //
 				"Active alarms for the DER.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S701_Alrm.values())), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, S701_Alrm.values())), //
 		D_E_R_MODE(new BitFieldPoint("S701_D_E_R_MODE", "DER Operational Characteristics", //
 				"Current operational characteristics of the DER.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S701_DERMode.values())), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, S701_DERMode.values())), //
 		W(new ScaledValuePoint("S701_W", "Active Power", //
 				"Total active power. Active power is positive for DER generation and negative for absorption.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		VA(new ScaledValuePoint("S701_VA", "Apparent Power", //
 				"Total apparent power.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VAR(new ScaledValuePoint("S701_VAR", "Reactive Power", //
 				"Total reactive power.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		PF(new ScaledValuePoint("S701_PF", "Power Factor", //
 				"Power factor. The sign of power factor should be the sign of active power.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		A(new ScaledValuePoint("S701_A", "Total AC Current", //
 				"Total AC current.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		LLV(new ScaledValuePoint("S701_LLV", "Voltage LL", //
 				"Line to line AC voltage as an average of active phases.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		LNV(new ScaledValuePoint("S701_LNV", "Voltage LN", //
 				"Line to neutral AC voltage as an average of active phases.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		HZ(new ScaledValuePoint("S701_HZ", "Frequency", //
 				"AC frequency.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
 		TOT_WH_INJ(new ScaledValuePoint("S701_TOT_WH_INJ", "Total Energy Injected", //
 				"Total active energy injected (Quadrants 1 & 4).", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_ABS(new ScaledValuePoint("S701_TOT_WH_ABS", "Total Energy Absorbed", //
 				"Total active energy absorbed (Quadrants 2 & 3).", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_VARH_INJ(new ScaledValuePoint("S701_TOT_VARH_INJ", "Total Reactive Energy Inj", //
 				"Total reactive energy injected (Quadrants 1 & 2).", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		TOT_VARH_ABS(new ScaledValuePoint("S701_TOT_VARH_ABS", "Total Reactive Energy Abs", //
 				"Total reactive energy absorbed (Quadrants 3 & 4).", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		TMP_AMB(new ScaledValuePoint("S701_TMP_AMB", "Ambient Temperature", //
 				"Ambient temperature.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_CAB(new ScaledValuePoint("S701_TMP_CAB", "Cabinet Temperature", //
 				"Cabinet temperature.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_SNK(new ScaledValuePoint("S701_TMP_SNK", "Heat Sink Temperature", //
 				"Heat sink temperature.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_TRNS(new ScaledValuePoint("S701_TMP_TRNS", "Transformer Temperature", //
 				"Transformer temperature.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_SW(new ScaledValuePoint("S701_TMP_SW", "IGBT/MOSFET Temperature", //
 				"IGBT/MOSFET temperature.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		TMP_OT(new ScaledValuePoint("S701_TMP_OT", "Other Temperature", //
 				"Other temperature.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
 		WL1(new ScaledValuePoint("S701_WL1", "Watts L1", //
 				"Active power L1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		VAL1(new ScaledValuePoint("S701_VAL1", "VA L1", //
 				"Apparent power L1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VAR_L1(new ScaledValuePoint("S701_VAR_L1", "Var L1", //
 				"Reactive power L1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		PFL1(new ScaledValuePoint("S701_PFL1", "PF L1", //
 				"Power factor phase L1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		AL1(new ScaledValuePoint("S701_AL1", "Amps L1", //
 				"Current phase L1.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		VL1L2(new ScaledValuePoint("S701_VL1L2", "Phase Voltage L1-L2", //
 				"Phase voltage L1-L2.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		VL1(new ScaledValuePoint("S701_VL1", "Phase Voltage L1-N", //
 				"Phase voltage L1-N.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		TOT_WH_INJ_L1(new ScaledValuePoint("S701_TOT_WH_INJ_L1", "Total Watt-Hours Inj L1", //
 				"Total active energy injected L1.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_ABS_L1(new ScaledValuePoint("S701_TOT_WH_ABS_L1", "Total Watt-Hours Abs L1", //
 				"Total active energy absorbed L1.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_VARH_INJ_L1(new ScaledValuePoint("S701_TOT_VARH_INJ_L1", "Total Var-Hours Inj L1", //
 				"Total reactive energy injected L1.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		TOT_VARH_ABS_L1(new ScaledValuePoint("S701_TOT_VARH_ABS_L1", "Total Var-Hours Abs L1", //
 				"Total reactive energy absorbed L1.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		WL2(new ScaledValuePoint("S701_WL2", "Watts L2", //
 				"Active power L2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		VAL2(new ScaledValuePoint("S701_VAL2", "VA L2", //
 				"Apparent power L2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VAR_L2(new ScaledValuePoint("S701_VAR_L2", "Var L2", //
 				"Reactive power L2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		PFL2(new ScaledValuePoint("S701_PFL2", "PF L2", //
 				"Power factor L2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		AL2(new ScaledValuePoint("S701_AL2", "Amps L2", //
 				"Current L2.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		VL2L3(new ScaledValuePoint("S701_VL2L3", "Phase Voltage L2-L3", //
 				"Phase voltage L2-L3.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		VL2(new ScaledValuePoint("S701_VL2", "Phase Voltage L2-N", //
 				"Phase voltage L2-N.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		TOT_WH_INJ_L2(new ScaledValuePoint("S701_TOT_WH_INJ_L2", "Total Watt-Hours Inj L2", //
 				"Total active energy injected L2.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_ABS_L2(new ScaledValuePoint("S701_TOT_WH_ABS_L2", "Total Watt-Hours Abs L2", //
 				"Total active energy absorbed L2.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_VARH_INJ_L2(new ScaledValuePoint("S701_TOT_VARH_INJ_L2", "Total Var-Hours Inj L2", //
 				"Total reactive energy injected L2.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		TOT_VARH_ABS_L2(new ScaledValuePoint("S701_TOT_VARH_ABS_L2", "Total Var-Hours Abs L2", //
 				"Total reactive energy absorbed L2.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		WL3(new ScaledValuePoint("S701_WL3", "Watts L3", //
 				"Active power L3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		VAL3(new ScaledValuePoint("S701_VAL3", "VA L3", //
 				"Apparent power L3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VAR_L3(new ScaledValuePoint("S701_VAR_L3", "Var L3", //
 				"Reactive power L3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		PFL3(new ScaledValuePoint("S701_PFL3", "PF L3", //
 				"Power factor L3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		AL3(new ScaledValuePoint("S701_AL3", "Amps L3", //
 				"Current L3.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		VL3L1(new ScaledValuePoint("S701_VL3L1", "Phase Voltage L3-L1", //
 				"Phase voltage L3-L1.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		VL3(new ScaledValuePoint("S701_VL3", "Phase Voltage L3-N", //
 				"Phase voltage L3-N.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		TOT_WH_INJ_L3(new ScaledValuePoint("S701_TOT_WH_INJ_L3", "Total Watt-Hours Inj L3", //
 				"Total active energy injected L3.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_WH_ABS_L3(new ScaledValuePoint("S701_TOT_WH_ABS_L3", "Total Watt-Hours Abs L3", //
 				"Total active energy absorbed L3.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
 		TOT_VARH_INJ_L3(new ScaledValuePoint("S701_TOT_VARH_INJ_L3", "Total Var-Hours Inj L3", //
 				"Total reactive energy injected L3.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		TOT_VARH_ABS_L3(new ScaledValuePoint("S701_TOT_VARH_ABS_L3", "Total Var-Hours Abs L3", //
 				"Total reactive energy absorbed L3.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
 		THROT_PCT(new ValuePoint("S701_THROT_PCT", "Throttling In Pct", //
 				"Throttling in pct of maximum active power.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		THROT_SRC(new BitFieldPoint("S701_THROT_SRC", "Throttle Source Information", //
 				"Active throttling source.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S701_ThrotSrc.values())), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, S701_ThrotSrc.values())), //
 		A_SF(new ScaleFactorPoint("S701_A_SF", "Current Scale Factor", //
 				"Current scale factor.")), //
 		V_SF(new ScaleFactorPoint("S701_V_SF", "Voltage Scale Factor", //
@@ -3868,7 +3938,7 @@ public static enum S701 implements SunSpecPoint {
 				"Temperature scale factor.")), //
 		MN_ALRM_INFO(new ValuePoint("S701_MN_ALRM_INFO", "Manufacturer Alarm Info", //
 				"Manufacturer alarm information. Valid if MANUFACTURER_ALRM indication is active.", //
-				ValuePoint.Type.STRING32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				STRING32, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -4085,130 +4155,130 @@ public BitPoint get() {
 	public static enum S702 implements SunSpecPoint {
 		W_MAX_RTG(new ScaledValuePoint("S702_W_MAX_RTG", "Active Power Max Rating", //
 				"Maximum active power rating at unity power factor in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_OVR_EXT_RTG(new ScaledValuePoint("S702_W_OVR_EXT_RTG", "Active Power (Over-Excited) Rating", //
 				"Active power rating at specified over-excited power factor in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_OVR_EXT_RTG_P_F(new ScaledValuePoint("S702_W_OVR_EXT_RTG_P_F", "Specified Over-Excited PF", //
 				"Specified over-excited power factor.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		W_UND_EXT_RTG(new ScaledValuePoint("S702_W_UND_EXT_RTG", "Active Power (Under-Excited) Rating", //
 				"Active power rating at specified under-excited power factor in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_UND_EXT_RTG_P_F(new ScaledValuePoint("S702_W_UND_EXT_RTG_P_F", "Specified Under-Excited PF", //
 				"Specified under-excited power factor.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		V_A_MAX_RTG(new ScaledValuePoint("S702_V_A_MAX_RTG", "Apparent Power Max Rating", //
 				"Maximum apparent power rating in voltamperes.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		VAR_MAX_INJ_RTG(new ScaledValuePoint("S702_VAR_MAX_INJ_RTG", "Reactive Power Injected Rating", //
 				"Maximum injected reactive power rating in vars.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		VAR_MAX_ABS_RTG(new ScaledValuePoint("S702_VAR_MAX_ABS_RTG", "Reactive Power Absorbed Rating", //
 				"Maximum absorbed reactive power rating in vars.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		W_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_W_CHA_RTE_MAX_RTG", "Charge Rate Max Rating", //
 				"Maximum active power charge rate in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		W_DIS_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_W_DIS_CHA_RTE_MAX_RTG", "Discharge Rate Max Rating", //
 				"Maximum active power discharge rate in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		V_A_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_V_A_CHA_RTE_MAX_RTG", "Charge Rate Max VA Rating", //
 				"Maximum apparent power charge rate in voltamperes.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_A_DIS_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_V_A_DIS_CHA_RTE_MAX_RTG", "Discharge Rate Max VA Rating", //
 				"Maximum apparent power discharge rate in voltamperes.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_NOM_RTG(new ScaledValuePoint("S702_V_NOM_RTG", "AC Voltage Nominal Rating", //
 				"AC voltage nominal rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_MAX_RTG(new ScaledValuePoint("S702_V_MAX_RTG", "AC Voltage Max Rating", //
 				"AC voltage maximum rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_MIN_RTG(new ScaledValuePoint("S702_V_MIN_RTG", "AC Voltage Min Rating", //
 				"AC voltage minimum rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		A_MAX_RTG(new ScaledValuePoint("S702_A_MAX_RTG", "AC Current Max Rating", //
 				"AC current maximum rating in amps.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		P_F_OVR_EXT_RTG(new ScaledValuePoint("S702_P_F_OVR_EXT_RTG", "PF Over-Excited Rating", //
 				"Power factor over-excited rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		P_F_UND_EXT_RTG(new ScaledValuePoint("S702_P_F_UND_EXT_RTG", "PF Under-Excited Rating", //
 				"Power factor under-excited rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
 		REACT_SUSCEPT_RTG(new ScaledValuePoint("S702_REACT_SUSCEPT_RTG", "Reactive Susceptance", //
 				"Reactive susceptance that remains connected to the Area EPS in the cease to energize and trip state.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "S_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "S_SF")), //
 		NOR_OP_CAT_RTG(new EnumPoint("S702_NOR_OP_CAT_RTG", "Normal Operating Category", //
 				"Normal operating performance category as specified in IEEE 1547-2018.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S702_NorOpCatRtg.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S702_NorOpCatRtg.values())), //
 		ABN_OP_CAT_RTG(new EnumPoint("S702_ABN_OP_CAT_RTG", "Abnormal Operating Category", //
 				"Abnormal operating performance category as specified in IEEE 1547-2018.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S702_AbnOpCatRtg.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S702_AbnOpCatRtg.values())), //
 		CTRL_MODES(new BitFieldPoint("S702_CTRL_MODES", "Supported Control Modes", //
 				"Supported control mode functions.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S702_CtrlModes.values())), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, S702_CtrlModes.values())), //
 		INT_ISLAND_CAT_RTG(new BitFieldPoint("S702_INT_ISLAND_CAT_RTG", "Intentional Island Categories", //
 				"Intentional island categories.", //
-				BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, S702_IntIslandCatRtg.values())), //
+				BITFIELD16, false /* mandatory? */, READ_ONLY, S702_IntIslandCatRtg.values())), //
 		W_MAX(new ScaledValuePoint("S702_W_MAX", "Active Power Max Setting", //
 				"Maximum active power setting used to adjust maximum active power setting.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
 		W_MAX_OVR_EXT(new ScaledValuePoint("S702_W_MAX_OVR_EXT", "Active Power (Over-Excited) Setting", //
 				"Active power setting at specified over-excited power factor in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
 		W_OVR_EXT_P_F(new ScaledValuePoint("S702_W_OVR_EXT_P_F", "Specified Over-Excited PF", //
 				"Specified over-excited power factor.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
 		W_MAX_UND_EXT(new ScaledValuePoint("S702_W_MAX_UND_EXT", "Active Power (Under-Excited) Setting", //
 				"Active power setting at specified under-excited power factor in watts.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
 		W_UND_EXT_P_F(new ScaledValuePoint("S702_W_UND_EXT_P_F", "Specified Under-Excited PF", //
 				"Specified under-excited power factor.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
 		V_A_MAX(new ScaledValuePoint("S702_V_A_MAX", "Apparent Power Max Setting", //
 				"Maximum apparent power setting used to adjust maximum apparent power rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
 		VAR_MAX_INJ(new ScaledValuePoint("S702_VAR_MAX_INJ", "Reactive Power Injected Setting", //
 				"Maximum injected reactive power setting used to adjust maximum injected reactive power rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		VAR_MAX_ABS(new ScaledValuePoint("S702_VAR_MAX_ABS", "Reactive Power Absorbed Setting", //
 				"Maximum absorbed reactive power setting used to adjust maximum absorbed reactive power rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
 		W_CHA_RTE_MAX(new ScaledValuePoint("S702_W_CHA_RTE_MAX", "Charge Rate Max Setting", //
 				"Maximum active power charge rate setting used to adjust maximum active power charge rate rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
 		W_DIS_CHA_RTE_MAX(new ScaledValuePoint("S702_W_DIS_CHA_RTE_MAX", "Discharge Rate Max Setting", //
 				"Maximum active power discharge rate setting used to adjust maximum active power discharge rate rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
 		V_A_CHA_RTE_MAX(new ScaledValuePoint("S702_V_A_CHA_RTE_MAX", "Charge Rate Max VA Setting", //
 				"Maximum apparent power charge rate setting used to adjust maximum apparent power charge rate rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_A_DIS_CHA_RTE_MAX(new ScaledValuePoint("S702_V_A_DIS_CHA_RTE_MAX", "Discharge Rate Max VA Setting", //
 				"Maximum apparent power discharge rate setting used to adjust maximum apparent power discharge rate rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
 		V_NOM(new ScaledValuePoint("S702_V_NOM", "Nominal AC Voltage Setting", //
 				"Nominal AC voltage setting.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "V_SF")), //
 		V_MAX(new ScaledValuePoint("S702_V_MAX", "AC Voltage Max Setting", //
 				"AC voltage maximum setting used to adjust AC voltage maximum rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "V_SF")), //
 		V_MIN(new ScaledValuePoint("S702_V_MIN", "AC Voltage Min Setting", //
 				"AC voltage minimum setting used to adjust AC voltage minimum rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "V_SF")), //
 		A_MAX(new ScaledValuePoint("S702_A_MAX", "AC Current Max Setting", //
 				"Maximum AC current setting used to adjust maximum AC current rating.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.AMPERE, "A_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.AMPERE, "A_SF")), //
 		P_F_OVR_EXT(new ScaledValuePoint("S702_P_F_OVR_EXT", "PF Over-Excited Setting", //
 				"Power factor over-excited setting.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
 		P_F_UND_EXT(new ScaledValuePoint("S702_P_F_UND_EXT", "PF Under-Excited Setting", //
 				"Power factor under-excited setting.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
 		INT_ISLAND_CAT(new BitFieldPoint("S702_INT_ISLAND_CAT", "Intentional Island Categories", //
 				"Intentional island categories.", //
-				BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_WRITE, S702_IntIslandCat.values())), //
+				BITFIELD16, false /* mandatory? */, READ_WRITE, S702_IntIslandCat.values())), //
 		W_SF(new ScaleFactorPoint("S702_W_SF", "Active Power Scale Factor", //
 				"Active power scale factor.")), //
 		PF_SF(new ScaleFactorPoint("S702_PF_SF", "Power Factor Scale Factor", //
@@ -4362,31 +4432,31 @@ public BitPoint get() {
 	public static enum S703 implements SunSpecPoint {
 		ES(new EnumPoint("S703_ES", "Permit Enter Service", //
 				"Permit enter service.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S703_ES.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S703_ES.values())), //
 		E_S_V_HI(new ScaledValuePoint("S703_E_S_V_HI", "Enter Service Voltage High", //
 				"Enter service voltage high threshold as percent of normal voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "V_SF")), //
 		E_S_V_LO(new ScaledValuePoint("S703_E_S_V_LO", "Enter Service Voltage Low", //
 				"Enter service voltage low threshold as percent of normal voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "V_SF")), //
 		E_S_HZ_HI(new ScaledValuePoint("S703_E_S_HZ_HI", "Enter Service Frequency High", //
 				"Enter service frequency high threshold.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "Hz_SF")), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.HERTZ, "Hz_SF")), //
 		E_S_HZ_LO(new ScaledValuePoint("S703_E_S_HZ_LO", "Enter Service Frequency Low", //
 				"Enter service frequency low threshold.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "Hz_SF")), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.HERTZ, "Hz_SF")), //
 		E_S_DLY_TMS(new ValuePoint("S703_E_S_DLY_TMS", "Enter Service Delay Time", //
 				"Enter service delay time in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		E_S_RND_TMS(new ValuePoint("S703_E_S_RND_TMS", "Enter Service Random Delay", //
 				"Enter service random delay in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		E_S_RMP_TMS(new ValuePoint("S703_E_S_RMP_TMS", "Enter Service Ramp Time", //
 				"Enter service ramp time in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		E_S_DLY_REM_TMS(new ValuePoint("S703_E_S_DLY_REM_TMS", "Enter Service Delay Remaining", //
 				"Enter service delay time remaining in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		V_SF(new ScaleFactorPoint("S703_V_SF", "Voltage Scale Factor", //
 				"Voltage percentage scale factor.")), //
 		HZ_S_F(new ScaleFactorPoint("S703_HZ_S_F", "Frequency Scale Factor", //
@@ -4436,115 +4506,115 @@ public OptionsEnum getUndefined() {
 	public static enum S704 implements SunSpecPoint {
 		P_F_W_INJ_ENA(new EnumPoint("S704_P_F_W_INJ_ENA", "Power Factor Enable (W Inj) Enable", //
 				"Power factor enable when injecting active power.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWInjEna.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWInjEna.values())), //
 		P_F_W_INJ_ENA_RVRT(new EnumPoint("S704_P_F_W_INJ_ENA_RVRT", "Power Factor Reversion Enable (W Inj)", //
 				"Power factor reversion timer when injecting active power enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWInjEnaRvrt.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWInjEnaRvrt.values())), //
 		P_F_W_INJ_RVRT_TMS(new ValuePoint("S704_P_F_W_INJ_RVRT_TMS", "PF Reversion Time (W Inj)", //
 				"Power factor reversion timer when injecting active power.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		P_F_W_INJ_RVRT_REM(new ValuePoint("S704_P_F_W_INJ_RVRT_REM", "PF Reversion Time Rem (W Inj)", //
 				"Power factor reversion time remaining when injecting active power.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		P_F_W_ABS_ENA(new EnumPoint("S704_P_F_W_ABS_ENA", "Power Factor Enable (W Abs) Enable", //
 				"Power factor enable when absorbing active power.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWAbsEna.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWAbsEna.values())), //
 		P_F_W_ABS_ENA_RVRT(new EnumPoint("S704_P_F_W_ABS_ENA_RVRT", "Power Factor Reversion Enable (W Abs)", //
 				"Power factor reversion timer when absorbing active power enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWAbsEnaRvrt.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWAbsEnaRvrt.values())), //
 		P_F_W_ABS_RVRT_TMS(new ValuePoint("S704_P_F_W_ABS_RVRT_TMS", "PF Reversion Time (W Abs)", //
 				"Power factor reversion timer when absorbing active power.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		P_F_W_ABS_RVRT_REM(new ValuePoint("S704_P_F_W_ABS_RVRT_REM", "PF Reversion Time Rem (W Abs)", //
 				"Power factor reversion time remaining when absorbing active power.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		W_MAX_LIM_PCT_ENA(new EnumPoint("S704_W_MAX_LIM_PCT_ENA", "Limit Max Power Pct Enable", //
 				"Limit maximum active power percent enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WMaxLimPctEna.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_WMaxLimPctEna.values())), //
 		W_MAX_LIM_PCT(new ScaledValuePoint("S704_W_MAX_LIM_PCT", "Limit Max Power Pct Setpoint", //
 				"Limit maximum active power percent value.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
 		W_MAX_LIM_PCT_RVRT(new ScaledValuePoint("S704_W_MAX_LIM_PCT_RVRT", "Reversion Limit Max Power Pct", //
 				"Reversion limit maximum active power percent value.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
 		W_MAX_LIM_PCT_ENA_RVRT(new EnumPoint("S704_W_MAX_LIM_PCT_ENA_RVRT", "Reversion Limit Max Power Pct Enable", //
 				"Reversion limit maximum active power percent value enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WMaxLimPctEnaRvrt.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_WMaxLimPctEnaRvrt.values())), //
 		W_MAX_LIM_PCT_RVRT_TMS(new ValuePoint("S704_W_MAX_LIM_PCT_RVRT_TMS", "Limit Max Power Pct Reversion Time", //
 				"Limit maximum active power percent reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		W_MAX_LIM_PCT_RVRT_REM(new ValuePoint("S704_W_MAX_LIM_PCT_RVRT_REM", "Limit Max Power Pct Rev Time Rem", //
 				"Limit maximum active power percent reversion time remaining.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		W_SET_ENA(new EnumPoint("S704_W_SET_ENA", "Set Active Power Enable", //
 				"Set active power enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetEna.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_WSetEna.values())), //
 		W_SET_MOD(new EnumPoint("S704_W_SET_MOD", "Set Active Power Mode", //
 				"Set active power mode.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetMod.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_WSetMod.values())), //
 		W_SET(new ScaledValuePoint("S704_W_SET", "Active Power Setpoint (W)", //
 				"Active power setting value in watts.", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WSet_SF")), //
+				INT32, false /* mandatory? */, READ_WRITE, Unit.WATT, "WSet_SF")), //
 		W_SET_RVRT(new ScaledValuePoint("S704_W_SET_RVRT", "Reversion Active Power (W)", //
 				"Reversion active power setting value in watts.", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WSet_SF")), //
+				INT32, false /* mandatory? */, READ_WRITE, Unit.WATT, "WSet_SF")), //
 		W_SET_PCT(new ScaledValuePoint("S704_W_SET_PCT", "Active Power Setpoint (Pct)", //
 				"Active power setting value as percent.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WSetPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WSetPct_SF")), //
 		W_SET_PCT_RVRT(new ScaledValuePoint("S704_W_SET_PCT_RVRT", "Reversion Active Power (Pct)", //
 				"Reversion active power setting value as percent.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WSetPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WSetPct_SF")), //
 		W_SET_ENA_RVRT(new EnumPoint("S704_W_SET_ENA_RVRT", "Reversion Active Power Enable", //
 				"Reversion active power function enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetEnaRvrt.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_WSetEnaRvrt.values())), //
 		W_SET_RVRT_TMS(new ValuePoint("S704_W_SET_RVRT_TMS", "Active Power Reversion Time", //
 				"Set active power reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		W_SET_RVRT_REM(new ValuePoint("S704_W_SET_RVRT_REM", "Active Power Rev Time Rem", //
 				"Set active power reversion time remaining.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		VAR_SET_ENA(new EnumPoint("S704_VAR_SET_ENA", "Set Reactive Power Enable", //
 				"Set reactive power enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetEna.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetEna.values())), //
 		VAR_SET_MOD(new EnumPoint("S704_VAR_SET_MOD", "Set Reactive Power Mode", //
 				"Set reactive power mode.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetMod.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetMod.values())), //
 		VAR_SET_PRI(new EnumPoint("S704_VAR_SET_PRI", "Reactive Power Priority", //
 				"Reactive power priority.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetPri.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetPri.values())), //
 		VAR_SET(new ScaledValuePoint("S704_VAR_SET", "Reactive Power Setpoint (Vars)", //
 				"Reactive power setting value in vars.", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
+				INT32, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
 		VAR_SET_RVRT(new ScaledValuePoint("S704_VAR_SET_RVRT", "Reversion Reactive Power (Vars)", //
 				"Reversion reactive power setting value in vars.", //
-				ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
+				INT32, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
 		VAR_SET_PCT(new ScaledValuePoint("S704_VAR_SET_PCT", "Reactive Power Setpoint (Pct)", //
 				"Reactive power setting value as percent.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
 		VAR_SET_PCT_RVRT(new ScaledValuePoint("S704_VAR_SET_PCT_RVRT", "Reversion Reactive Power (Pct)", //
 				"Reversion reactive power setting value as percent.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
+				INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
 		VAR_SET_ENA_RVRT(new EnumPoint("S704_VAR_SET_ENA_RVRT", "Reversion Reactive Power Enable", //
 				"Reversion reactive power function enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetEnaRvrt.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetEnaRvrt.values())), //
 		VAR_SET_RVRT_TMS(new ValuePoint("S704_VAR_SET_RVRT_TMS", "Reactive Power Reversion Time", //
 				"Set reactive power reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		VAR_SET_RVRT_REM(new ValuePoint("S704_VAR_SET_RVRT_REM", "Reactive Power Rev Time Rem", //
 				"Set reactive power reversion time remaining.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		W_RMP(new ValuePoint("S704_W_RMP", "Normal Ramp Rate", //
 				"Ramp rate for increases in active power during normal generation.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		W_RMP_REF(new EnumPoint("S704_W_RMP_REF", "Normal Ramp Rate Reference", //
 				"Ramp rate reference unit for increases in active power or current during normal generation.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WRmpRef.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_WRmpRef.values())), //
 		VAR_RMP(new ValuePoint("S704_VAR_RMP", "Reactive Power Ramp Rate", //
 				"Ramp rate based on max reactive power per second.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ANTI_ISL_ENA(new EnumPoint("S704_ANTI_ISL_ENA", "Anti-Islanding Enable", //
 				"Anti-islanding enable.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_AntiIslEna.values())), //
+				ENUM16, false /* mandatory? */, READ_WRITE, S704_AntiIslEna.values())), //
 		PF_SF(new ScaleFactorPoint("S704_PF_SF", "Power Factor Scale Factor", //
 				"Power factor scale factor.")), //
 		W_MAX_LIM_PCT_S_F(new ScaleFactorPoint("S704_W_MAX_LIM_PCT_S_F", "Limit Max Power Scale Factor", //
@@ -5012,28 +5082,28 @@ public OptionsEnum getUndefined() {
 	public static enum S705 implements SunSpecPoint {
 		ENA(new EnumPoint("S705_ENA", "DER Volt-Var Module Enable", //
 				"Volt-Var control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S705_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S705_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S705_ADPT_CRV_REQ", "Adopt Curve Request", //
 				"Index of curve points to adopt. First curve index is 1.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S705_ADPT_CRV_RSLT", "Adopt Curve Result", //
 				"Result of last adopt curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S705_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S705_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S705_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV(new ValuePoint("S705_N_CRV", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		RVRT_TMS(new ValuePoint("S705_RVRT_TMS", "Reversion Timeout", //
 				"Reversion time in seconds.  0 = No reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		RVRT_REM(new ValuePoint("S705_RVRT_REM", "Reversion Time Remaining", //
 				"Reversion time remaining in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		RVRT_CRV(new ValuePoint("S705_RVRT_CRV", "Reversion Curve", //
 				"Default curve after reversion timeout.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		V_SF(new ScaleFactorPoint("S705_V_SF", "Voltage Scale Factor", //
 				"Scale factor for curve voltage points.")), //
 		DEPT_REF_S_F(new ScaleFactorPoint("S705_DEPT_REF_S_F", "Var Scale Factor", //
@@ -5115,28 +5185,28 @@ public OptionsEnum getUndefined() {
 	public static enum S706 implements SunSpecPoint {
 		ENA(new EnumPoint("S706_ENA", "DER Volt-Watt Module Enable", //
 				"Volt-Watt control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S706_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S706_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S706_ADPT_CRV_REQ", "Adopt Curve Request", //
 				"Index of curve points to adopt. First curve index is 1.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S706_ADPT_CRV_RSLT", "Adopt Curve Result", //
 				"Result of last adopt curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S706_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S706_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S706_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV(new ValuePoint("S706_N_CRV", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		RVRT_TMS(new ValuePoint("S706_RVRT_TMS", "Reversion Timeout", //
 				"Reversion time in seconds.  0 = No reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		RVRT_REM(new ValuePoint("S706_RVRT_REM", "Reversion Time Remaining", //
 				"Reversion time remaining in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		RVRT_CRV(new ValuePoint("S706_RVRT_CRV", "Reversion Curve", //
 				"Default curve after reversion timeout.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		V_SF(new ScaleFactorPoint("S706_V_SF", "Voltage Scale Factor", //
 				"Scale factor for curve voltage points.")), //
 		DEPT_REF_S_F(new ScaleFactorPoint("S706_DEPT_REF_S_F", "Watt Scale Factor", //
@@ -5218,19 +5288,19 @@ public OptionsEnum getUndefined() {
 	public static enum S707 implements SunSpecPoint {
 		ENA(new EnumPoint("S707_ENA", "DER Trip LV Module Enable", //
 				"DER low voltage trip control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S707_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S707_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S707_ADPT_CRV_REQ", "Adopt Curve Request", //
 				"Index of curve points to adopt. First curve index is 1.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S707_ADPT_CRV_RSLT", "Adopt Curve Result", //
 				"Result of last adopt curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S707_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S707_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S707_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV_SET(new ValuePoint("S707_N_CRV_SET", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		V_SF(new ScaleFactorPoint("S707_V_SF", "Voltage Scale Factor", //
 				"Scale factor for curve voltage points.")), //
 		TMS_S_F(new ScaleFactorPoint("S707_TMS_S_F", "Time Point Scale Factor", //
@@ -5310,19 +5380,19 @@ public OptionsEnum getUndefined() {
 	public static enum S708 implements SunSpecPoint {
 		ENA(new EnumPoint("S708_ENA", "DER Trip HV Module Enable", //
 				"DER high voltage trip control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S708_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S708_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S708_ADPT_CRV_REQ", "Adopt Curve Request", //
 				"Index of curve points to adopt. First curve index is 1.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S708_ADPT_CRV_RSLT", "Adopt Curve Result", //
 				"Result of last adopt curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S708_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S708_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S708_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV_SET(new ValuePoint("S708_N_CRV_SET", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		V_SF(new ScaleFactorPoint("S708_V_SF", "Voltage Scale Factor", //
 				"Scale factor for curve voltage points.")), //
 		TMS_S_F(new ScaleFactorPoint("S708_TMS_S_F", "Time Point Scale Factor", //
@@ -5402,19 +5472,19 @@ public OptionsEnum getUndefined() {
 	public static enum S709 implements SunSpecPoint {
 		ENA(new EnumPoint("S709_ENA", "DER Trip LF Module Enable", //
 				"DER low frequency trip control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S709_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S709_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S709_ADPT_CRV_REQ", "Adopt Curve Request", //
 				"Index of curve points to adopt. First curve index is 1.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S709_ADPT_CRV_RSLT", "Adopt Curve Result", //
 				"Result of last adopt curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S709_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S709_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S709_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV_SET(new ValuePoint("S709_N_CRV_SET", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		HZ_S_F(new ScaleFactorPoint("S709_HZ_S_F", "Frequency Scale Factor", //
 				"Scale factor for curve frequency points.")), //
 		TMS_S_F(new ScaleFactorPoint("S709_TMS_S_F", "Time Point Scale Factor", //
@@ -5494,19 +5564,19 @@ public OptionsEnum getUndefined() {
 	public static enum S710 implements SunSpecPoint {
 		ENA(new EnumPoint("S710_ENA", "DER Trip HF Module Enable", //
 				"DER high frequency trip control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S710_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S710_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S710_ADPT_CRV_REQ", "Adopt Curve Request", //
 				"Index of curve points to adopt. First curve index is 1.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S710_ADPT_CRV_RSLT", "Adopt Curve Result", //
 				"Result of last adopt curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S710_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S710_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S710_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV_SET(new ValuePoint("S710_N_CRV_SET", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		HZ_S_F(new ScaleFactorPoint("S710_HZ_S_F", "Frequency Scale Factor", //
 				"Scale factor for curve frequency points.")), //
 		TMS_S_F(new ScaleFactorPoint("S710_TMS_S_F", "Time Point Scale Factor", //
@@ -5586,25 +5656,25 @@ public OptionsEnum getUndefined() {
 	public static enum S711 implements SunSpecPoint {
 		ENA(new EnumPoint("S711_ENA", "DER Frequency Droop Module Enable", //
 				"DER Frequency-Watt (Frequency-Droop) control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S711_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S711_Ena.values())), //
 		ADPT_CTL_REQ(new ValuePoint("S711_ADPT_CTL_REQ", "Set Active Control Request", //
 				"Set active control. 0 = No active control.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CTL_RSLT(new EnumPoint("S711_ADPT_CTL_RSLT", "Set Active Control Result", //
 				"Result of last set active control operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S711_AdptCtlRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S711_AdptCtlRslt.values())), //
 		N_CTL(new ValuePoint("S711_N_CTL", "Stored Control Count", //
 				"Number of stored controls supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		RVRT_TMS(new ValuePoint("S711_RVRT_TMS", "Reversion Timeout", //
 				"Reversion time in seconds.  0 = No reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		RVRT_REM(new ValuePoint("S711_RVRT_REM", "Reversion Time Left", //
 				"Reversion time remaining in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		RVRT_CTL(new ValuePoint("S711_RVRT_CTL", "Reversion Control", //
 				"Default control after reversion timeout.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		DB_S_F(new ScaleFactorPoint("S711_DB_S_F", "Deadband Scale Factor", //
 				"Deadband scale factor.")), //
 		K_SF(new ScaleFactorPoint("S711_K_SF", "Frequency Change Scale Factor", //
@@ -5686,28 +5756,28 @@ public OptionsEnum getUndefined() {
 	public static enum S712 implements SunSpecPoint {
 		ENA(new EnumPoint("S712_ENA", "DER Watt-Var Module Enable", //
 				"DER Watt-Var control enable.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S712_Ena.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S712_Ena.values())), //
 		ADPT_CRV_REQ(new ValuePoint("S712_ADPT_CRV_REQ", "Set Active Curve Request", //
 				"Set active curve. 0 = No active curve.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ADPT_CRV_RSLT(new EnumPoint("S712_ADPT_CRV_RSLT", "Set Active Curve Result", //
 				"Result of last set active curve operation.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S712_AdptCrvRslt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S712_AdptCrvRslt.values())), //
 		N_PT(new ValuePoint("S712_N_PT", "Number Of Points", //
 				"Number of curve points supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		N_CRV(new ValuePoint("S712_N_CRV", "Stored Curve Count", //
 				"Number of stored curves supported.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		RVRT_TMS(new ValuePoint("S712_RVRT_TMS", "Reversion Timeout", //
 				"Reversion time in seconds.  0 = No reversion time.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
 		RVRT_REM(new ValuePoint("S712_RVRT_REM", "Reversion Time Left", //
 				"Reversion time remaining in seconds.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
 		RVRT_CRV(new ValuePoint("S712_RVRT_CRV", "Reversion Curve", //
 				"Default curve after reversion timeout.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		W_SF(new ScaleFactorPoint("S712_W_SF", "Active Power Scale Factor", //
 				"Scale factor for curve active power points.")), //
 		DEPT_REF_S_F(new ScaleFactorPoint("S712_DEPT_REF_S_F", "Var Scale Factor", //
@@ -5787,19 +5857,19 @@ public OptionsEnum getUndefined() {
 	public static enum S713 implements SunSpecPoint {
 		W_H_RTG(new ScaledValuePoint("S713_W_H_RTG", "Energy Rating", //
 				"Energy rating of the DER storage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
 		W_H_AVAIL(new ScaledValuePoint("S713_W_H_AVAIL", "Energy Available", //
 				"Energy available of the DER storage (WHAvail = WHRtg * SoC * SoH)", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
 		SO_C(new ScaledValuePoint("S713_SO_C", "State of Charge", //
 				"State of charge of the DER storage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Pct_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "Pct_SF")), //
 		SO_H(new ScaledValuePoint("S713_SO_H", "State of Health", //
 				"State of health of the DER storage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Pct_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "Pct_SF")), //
 		STA(new EnumPoint("S713_STA", "Status", //
 				"Storage status.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S713_Sta.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S713_Sta.values())), //
 		WH_SF(new ScaleFactorPoint("S713_WH_SF", "Energy Scale Factor", //
 				"Scale factor for energy capacity.")), //
 		PCT_S_F(new ScaleFactorPoint("S713_PCT_S_F", "Percent Scale Factor", //
@@ -5850,22 +5920,22 @@ public OptionsEnum getUndefined() {
 	public static enum S714 implements SunSpecPoint {
 		PRT_ALRMS(new BitFieldPoint("S714_PRT_ALRMS", "Port Alarms", //
 				"Bitfield of ports with active alarms. Bit is 1 if port has an active alarm. Bit 0 is first port.", //
-				BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		N_PRT(new ValuePoint("S714_N_PRT", "Number Of Ports", //
 				"Number of DC ports.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		DCA(new ScaledValuePoint("S714_DCA", "DC Current", //
 				"Total DC current for all ports.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
 		DCW(new ScaledValuePoint("S714_DCW", "DC Power", //
 				"Total DC power for all ports.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
 		D_C_WH_INJ(new ScaledValuePoint("S714_D_C_WH_INJ", "DC Energy Injected", //
 				"Total cumulative DC energy injected for all ports.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
 		D_C_WH_ABS(new ScaledValuePoint("S714_D_C_WH_ABS", "DC Energy Absorbed", //
 				"Total cumulative DC energy absorbed for all ports.", //
-				ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
+				UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
 		DCA_SF(new ScaleFactorPoint("S714_DCA_SF", "DC Current Scale Factor", //
 				"DC current scale factor.")), //
 		DCV_SF(new ScaleFactorPoint("S714_DCV_SF", "DC Voltage Scale Factor", //
@@ -5892,19 +5962,19 @@ public Point get() {
 	public static enum S715 implements SunSpecPoint {
 		LOC_REM_CTL(new EnumPoint("S715_LOC_REM_CTL", "Control Mode", //
 				"DER control mode. Enumeration.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S715_LocRemCtl.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S715_LocRemCtl.values())), //
 		D_E_R_HB(new ValuePoint("S715_D_E_R_HB", "DER Heartbeat", //
 				"Value is incremented every second by the DER with periodic resets to zero.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CONTROLLER_HB(new ValuePoint("S715_CONTROLLER_HB", "Controller Heartbeat", //
 				"Value is incremented every second by the controller with periodic resets to zero.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT32, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ALARM_RESET(new ValuePoint("S715_ALARM_RESET", "Alarm Reset", //
 				"Used to reset any latched alarms. 1 = Reset.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		OP_CTL(new EnumPoint("S715_OP_CTL", "Set Operation", //
 				"Commands to PCS. Enumerated value.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S715_OpCtl.values()));
+				ENUM16, false /* mandatory? */, READ_WRITE, S715_OpCtl.values()));
 
 		private final Point point;
 
@@ -5981,7 +6051,7 @@ public OptionsEnum getUndefined() {
 	public static enum S801 implements SunSpecPoint {
 		DEPRECATED(new EnumPoint("S801_DEPRECATED", "Deprecated Model", //
 				"This model has been deprecated.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0]));
+				ENUM16, true /* mandatory? */, READ_ONLY, new OptionsEnum[0]));
 
 		private final Point point;
 
@@ -5998,136 +6068,136 @@ public Point get() {
 	public static enum S802 implements SunSpecPoint {
 		A_H_RTG(new ScaledValuePoint("S802_A_H_RTG", "Nameplate Charge Capacity", //
 				"Nameplate charge capacity in amp-hours.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "AHRtg_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "AHRtg_SF")), //
 		W_H_RTG(new ScaledValuePoint("S802_W_H_RTG", "Nameplate Energy Capacity", //
 				"Nameplate energy capacity in DC watt-hours.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
 		W_CHA_RTE_MAX(new ScaledValuePoint("S802_W_CHA_RTE_MAX", "Nameplate Max Charge Rate", //
 				"Maximum rate of energy transfer into the storage device in DC watts.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
 		W_DIS_CHA_RTE_MAX(new ScaledValuePoint("S802_W_DIS_CHA_RTE_MAX", "Nameplate Max Discharge Rate", //
 				"Maximum rate of energy transfer out of the storage device in DC watts.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
 		DIS_CHA_RTE(new ScaledValuePoint("S802_DIS_CHA_RTE", "Self Discharge Rate", //
 				"Self discharge rate.  Percentage of capacity (WHRtg) discharged per day.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "DisChaRte_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "DisChaRte_SF")), //
 		SO_C_MAX(new ScaledValuePoint("S802_SO_C_MAX", "Nameplate Max SoC", //
 				"Manufacturer maximum state of charge, expressed as a percentage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoC_SF")), //
 		SO_C_MIN(new ScaledValuePoint("S802_SO_C_MIN", "Nameplate Min SoC", //
 				"Manufacturer minimum state of charge, expressed as a percentage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoC_SF")), //
 		SOC_RSV_MAX(new ScaledValuePoint("S802_SOC_RSV_MAX", "Max Reserve Percent", //
 				"Setpoint for maximum reserve for storage as a percentage of the nominal maximum storage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "SoC_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "SoC_SF")), //
 		SO_C_RSV_MIN(new ScaledValuePoint("S802_SO_C_RSV_MIN", "Min Reserve Percent", //
 				"Setpoint for minimum reserve for storage as a percentage of the nominal maximum storage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "SoC_SF")), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "SoC_SF")), //
 		SO_C(new ScaledValuePoint("S802_SO_C", "State of Charge", //
 				"State of charge, expressed as a percentage.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoC_SF")), //
 		DO_D(new ScaledValuePoint("S802_DO_D", "Depth of Discharge", //
 				"Depth of discharge, expressed as a percentage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "DoD_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "DoD_SF")), //
 		SO_H(new ScaledValuePoint("S802_SO_H", "State of Health", //
 				"Percentage of battery life remaining.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoH_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoH_SF")), //
 		N_CYC(new ValuePoint("S802_N_CYC", "Cycle Count", //
 				"Number of cycles executed in the battery.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CHA_ST(new EnumPoint("S802_CHA_ST", "Charge Status", //
 				"Charge status of storage device. Enumeration.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S802_ChaSt.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S802_ChaSt.values())), //
 		LOC_REM_CTL(new EnumPoint("S802_LOC_REM_CTL", "Control Mode", //
 				"Battery control mode. Enumeration.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_LocRemCtl.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S802_LocRemCtl.values())), //
 		HB(new ValuePoint("S802_HB", "Battery Heartbeat", //
 				"Value is incremented every second with periodic resets to zero.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CTRL_HB(new ValuePoint("S802_CTRL_HB", "Controller Heartbeat", //
 				"Value is incremented every second with periodic resets to zero.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		ALM_RST(new ValuePoint("S802_ALM_RST", "Alarm Reset", //
 				"Used to reset any latched alarms.  1 = Reset.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
 		TYP(new EnumPoint("S802_TYP", "Battery Type", //
 				"Type of battery. Enumeration.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_Typ.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S802_Typ.values())), //
 		STATE(new EnumPoint("S802_STATE", "State of the Battery Bank", //
 				"State of the battery bank.  Enumeration.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_State.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S802_State.values())), //
 		STATE_VND(new EnumPoint("S802_STATE_VND", "Vendor Battery Bank State", //
 				"Vendor specific battery bank state.  Enumeration.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		WARR_DT(new ValuePoint("S802_WARR_DT", "Warranty Date", //
 				"Date the device warranty expires.", //
-				ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		EVT1(new BitFieldPoint("S802_EVT1", "Battery Event 1 Bitfield", //
 				"Alarms and warnings.  Bit flags.", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S802_Evt1.values())), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, S802_Evt1.values())), //
 		EVT2(new BitFieldPoint("S802_EVT2", "Battery Event 2 Bitfield", //
 				"Alarms and warnings.  Bit flags.", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND1(new BitFieldPoint("S802_EVT_VND1", "Vendor Event Bitfield 1", //
 				"Vendor defined events.", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		EVT_VND2(new BitFieldPoint("S802_EVT_VND2", "Vendor Event Bitfield 2", //
 				"Vendor defined events.", //
-				BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		V(new ScaledValuePoint("S802_V", "External Battery Voltage", //
 				"DC Bus Voltage.", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_MAX(new ScaledValuePoint("S802_V_MAX", "Max Battery Voltage", //
 				"Instantaneous maximum battery voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		V_MIN(new ScaledValuePoint("S802_V_MIN", "Min Battery Voltage", //
 				"Instantaneous minimum battery voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		CELL_V_MAX(new ScaledValuePoint("S802_CELL_V_MAX", "Max Cell Voltage", //
 				"Maximum voltage for all cells in the bank.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "CellV_SF")), //
 		CELL_V_MAX_STR(new ValuePoint("S802_CELL_V_MAX_STR", "Max Cell Voltage String", //
 				"String containing the cell with maximum voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CELL_V_MAX_MOD(new ValuePoint("S802_CELL_V_MAX_MOD", "Max Cell Voltage Module", //
 				"Module containing the cell with maximum voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CELL_V_MIN(new ScaledValuePoint("S802_CELL_V_MIN", "Min Cell Voltage", //
 				"Minimum voltage for all cells in the bank.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "CellV_SF")), //
 		CELL_V_MIN_STR(new ValuePoint("S802_CELL_V_MIN_STR", "Min Cell Voltage String", //
 				"String containing the cell with minimum voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CELL_V_MIN_MOD(new ValuePoint("S802_CELL_V_MIN_MOD", "Min Cell Voltage Module", //
 				"Module containing the cell with minimum voltage.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		CELL_V_AVG(new ScaledValuePoint("S802_CELL_V_AVG", "Average Cell Voltage", //
 				"Average cell voltage for all cells in the bank.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "CellV_SF")), //
 		A(new ScaledValuePoint("S802_A", "Total DC Current", //
 				"Total DC current flowing to/from the battery bank.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		A_CHA_MAX(new ScaledValuePoint("S802_A_CHA_MAX", "Max Charge Current", //
 				"Instantaneous maximum DC charge current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "AMax_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "AMax_SF")), //
 		A_DIS_CHA_MAX(new ScaledValuePoint("S802_A_DIS_CHA_MAX", "Max Discharge Current", //
 				"Instantaneous maximum DC discharge current.", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "AMax_SF")), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "AMax_SF")), //
 		W(new ScaledValuePoint("S802_W", "Total Power", //
 				"Total power flowing to/from the battery bank.", //
-				ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		REQ_INV_STATE(new EnumPoint("S802_REQ_INV_STATE", "Inverter State Request", //
 				"Request from battery to start or stop the inverter.  Enumeration.", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S802_ReqInvState.values())), //
+				ENUM16, false /* mandatory? */, READ_ONLY, S802_ReqInvState.values())), //
 		REQ_W(new ScaledValuePoint("S802_REQ_W", "Battery Power Request", //
 				"AC Power requested by battery.", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+				INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
 		SET_OP(new EnumPoint("S802_SET_OP", "Set Operation", //
 				"Instruct the battery bank to perform an operation such as connecting.  Enumeration.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S802_SetOp.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S802_SetOp.values())), //
 		SET_INV_STATE(new EnumPoint("S802_SET_INV_STATE", "Set Inverter State", //
 				"Set the current state of the inverter.", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S802_SetInvState.values())), //
+				ENUM16, true /* mandatory? */, READ_WRITE, S802_SetInvState.values())), //
 		A_H_RTG_S_F(new ScaleFactorPoint("S802_A_H_RTG_S_F", "", //
 				"Scale factor for charge capacity.")), //
 		W_H_RTG_S_F(new ScaleFactorPoint("S802_W_H_RTG_S_F", "", //
@@ -6308,9 +6378,12 @@ public static enum S802_Evt1 implements SunSpecBitPoint {
 		UNDER_TEMP_ALARM(new BitPoint(3, "S802_EVT1_UNDER_TEMP_ALARM", "Under Temp Alarm")), //
 		UNDER_TEMP_WARNING(new BitPoint(4, "S802_EVT1_UNDER_TEMP_WARNING", "Under Temp Warning")), //
 		OVER_CHARGE_CURRENT_ALARM(new BitPoint(5, "S802_EVT1_OVER_CHARGE_CURRENT_ALARM", "Over Charge Current Alarm")), //
-		OVER_CHARGE_CURRENT_WARNING(new BitPoint(6, "S802_EVT1_OVER_CHARGE_CURRENT_WARNING", "Over Charge Current Warning")), //
-		OVER_DISCHARGE_CURRENT_ALARM(new BitPoint(7, "S802_EVT1_OVER_DISCHARGE_CURRENT_ALARM", "Over Discharge Current Alarm")), //
-		OVER_DISCHARGE_CURRENT_WARNING(new BitPoint(8, "S802_EVT1_OVER_DISCHARGE_CURRENT_WARNING", "Over Discharge Current Warning")), //
+		OVER_CHARGE_CURRENT_WARNING(
+				new BitPoint(6, "S802_EVT1_OVER_CHARGE_CURRENT_WARNING", "Over Charge Current Warning")), //
+		OVER_DISCHARGE_CURRENT_ALARM(
+				new BitPoint(7, "S802_EVT1_OVER_DISCHARGE_CURRENT_ALARM", "Over Discharge Current Alarm")), //
+		OVER_DISCHARGE_CURRENT_WARNING(
+				new BitPoint(8, "S802_EVT1_OVER_DISCHARGE_CURRENT_WARNING", "Over Discharge Current Warning")), //
 		OVER_VOLT_ALARM(new BitPoint(9, "S802_EVT1_OVER_VOLT_ALARM", "Over Volt Alarm")), //
 		OVER_VOLT_WARNING(new BitPoint(10, "S802_EVT1_OVER_VOLT_WARNING", "Over Volt Warning")), //
 		UNDER_VOLT_ALARM(new BitPoint(11, "S802_EVT1_UNDER_VOLT_ALARM", "Under Volt Alarm")), //
@@ -6320,8 +6393,10 @@ public static enum S802_Evt1 implements SunSpecBitPoint {
 		OVER_SOC_MAX_ALARM(new BitPoint(15, "S802_EVT1_OVER_SOC_MAX_ALARM", "Over Soc Max Alarm")), //
 		OVER_SOC_MAX_WARNING(new BitPoint(16, "S802_EVT1_OVER_SOC_MAX_WARNING", "Over Soc Max Warning")), //
 		VOLTAGE_IMBALANCE_WARNING(new BitPoint(17, "S802_EVT1_VOLTAGE_IMBALANCE_WARNING", "Voltage Imbalance Warning")), //
-		TEMPERATURE_IMBALANCE_ALARM(new BitPoint(18, "S802_EVT1_TEMPERATURE_IMBALANCE_ALARM", "Temperature Imbalance Alarm")), //
-		TEMPERATURE_IMBALANCE_WARNING(new BitPoint(19, "S802_EVT1_TEMPERATURE_IMBALANCE_WARNING", "Temperature Imbalance Warning")), //
+		TEMPERATURE_IMBALANCE_ALARM(
+				new BitPoint(18, "S802_EVT1_TEMPERATURE_IMBALANCE_ALARM", "Temperature Imbalance Alarm")), //
+		TEMPERATURE_IMBALANCE_WARNING(
+				new BitPoint(19, "S802_EVT1_TEMPERATURE_IMBALANCE_WARNING", "Temperature Imbalance Warning")), //
 		CONTACTOR_ERROR(new BitPoint(20, "S802_EVT1_CONTACTOR_ERROR", "Contactor Error")), //
 		FAN_ERROR(new BitPoint(21, "S802_EVT1_FAN_ERROR", "Fan Error")), //
 		GROUND_FAULT(new BitPoint(22, "S802_EVT1_GROUND_FAULT", "Ground Fault")), //
@@ -6436,75 +6511,75 @@ public OptionsEnum getUndefined() {
 
 	public static enum S64001 implements SunSpecPoint {
 		CMD(new EnumPoint("S64001_CMD", "Command Code", "", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_WRITE, new OptionsEnum[0])), //
 		H_W_REV(new ValuePoint("S64001_H_W_REV", "Hardware Revision", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		R_S_F_W_REV(new ValuePoint("S64001_R_S_F_W_REV", "RS FW Revision", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		O_S_F_W_REV(new ValuePoint("S64001_O_S_F_W_REV", "OS FW Revision", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		PROD_REV(new ValuePoint("S64001_PROD_REV", "Product Revision", "", //
-				ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		BOOTS(new ValuePoint("S64001_BOOTS", "Boot Count", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		SWITCH(new BitFieldPoint("S64001_SWITCH", "DIP Switches", "", //
-				BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD16, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		SENSORS(new ValuePoint("S64001_SENSORS", "Num Detected Sensors", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		TALKING(new ValuePoint("S64001_TALKING", "Num Communicating Sensors", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		STATUS(new BitFieldPoint("S64001_STATUS", "System Status", "", //
-				BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD16, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		CONFIG(new BitFieldPoint("S64001_CONFIG", "System Configuration", "", //
-				BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD16, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		L_E_DBLINK(new ValuePoint("S64001_L_E_DBLINK", "LED Blink Threshold", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		L_E_DON(new ValuePoint("S64001_L_E_DON", "LED On Threshold", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		RESERVED(new ValuePoint("S64001_RESERVED", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		LOC(new ValuePoint("S64001_LOC", "Location String", "", //
-				ValuePoint.Type.STRING16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S1ID(new EnumPoint("S64001_S1ID", "Sensor 1 Unit ID", "", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		S1_ADDR(new ValuePoint("S64001_S1_ADDR", "Sensor 1 Address", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S1_O_S_VER(new ValuePoint("S64001_S1_O_S_VER", "Sensor 1 OS Version", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S1_VER(new ValuePoint("S64001_S1_VER", "Sensor 1 Product Version", "", //
-				ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S1_SERIAL(new ValuePoint("S64001_S1_SERIAL", "Sensor 1 Serial Num", "", //
-				ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S2ID(new EnumPoint("S64001_S2ID", "Sensor 2 Unit ID", "", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		S2_ADDR(new ValuePoint("S64001_S2_ADDR", "Sensor 2 Address", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S2_O_S_VER(new ValuePoint("S64001_S2_O_S_VER", "Sensor 2 OS Version", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S2_VER(new ValuePoint("S64001_S2_VER", "Sensor 2 Product Version", "", //
-				ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S2_SERIAL(new ValuePoint("S64001_S2_SERIAL", "Sensor 2 Serial Num", "", //
-				ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S3ID(new EnumPoint("S64001_S3ID", "Sensor 3 Unit ID", "", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		S3_ADDR(new ValuePoint("S64001_S3_ADDR", "Sensor 3 Address", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S3_O_S_VER(new ValuePoint("S64001_S3_O_S_VER", "Sensor 3 OS Version", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S3_VER(new ValuePoint("S64001_S3_VER", "Sensor 3 Product Version", "", //
-				ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S3_SERIAL(new ValuePoint("S64001_S3_SERIAL", "Sensor 3 Serial Num", "", //
-				ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S4ID(new EnumPoint("S64001_S4ID", "Sensor 4 Unit ID", "", //
-				EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+				ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
 		S4_ADDR(new ValuePoint("S64001_S4_ADDR", "Sensor 4 Address", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S4_O_S_VER(new ValuePoint("S64001_S4_O_S_VER", "Sensor 4 OS Version", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S4_VER(new ValuePoint("S64001_S4_VER", "Sensor 4 Product Version", "", //
-				ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		S4_SERIAL(new ValuePoint("S64001_S4_SERIAL", "Sensor 4 Serial Num", "", //
-				ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -6520,19 +6595,19 @@ public Point get() {
 
 	public static enum S64101 implements SunSpecPoint {
 		ELTEK_COUNTRY_CODE(new ValuePoint("S64101_ELTEK_COUNTRY_CODE", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELTEK_FEEDING_PHASE(new ValuePoint("S64101_ELTEK_FEEDING_PHASE", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELTEK_A_P_D_METHOD(new ValuePoint("S64101_ELTEK_A_P_D_METHOD", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELTEK_A_P_D_POWER_REF(new ValuePoint("S64101_ELTEK_A_P_D_POWER_REF", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELTEK_R_P_S_METHOD(new ValuePoint("S64101_ELTEK_R_P_S_METHOD", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELTEK_R_P_S_Q_REF(new ValuePoint("S64101_ELTEK_R_P_S_Q_REF", "", "", //
-				ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		ELTEK_R_P_S_COS_PHI_REF(new ValuePoint("S64101_ELTEK_R_P_S_COS_PHI_REF", "", "", //
-				ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				INT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
@@ -6548,46 +6623,46 @@ public Point get() {
 
 	public static enum S64111 implements SunSpecPoint {
 		PORT(new ValuePoint("S64111_PORT", "Port Number", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		V_SF(new ScaleFactorPoint("S64111_V_SF", "", "")), //
 		A_SF(new ScaleFactorPoint("S64111_A_SF", "", "")), //
 		P_SF(new ScaleFactorPoint("S64111_P_SF", "", "")), //
 		AH_SF(new ScaleFactorPoint("S64111_AH_SF", "", "")), //
 		KWH_SF(new ScaleFactorPoint("S64111_KWH_SF", "", "")), //
 		BATT_V(new ScaledValuePoint("S64111_BATT_V", "Battery Voltage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		ARRAY_V(new ScaledValuePoint("S64111_ARRAY_V", "Array Voltage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		OUTPUT_A(new ScaledValuePoint("S64111_OUTPUT_A", "Output Current", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
 		INPUT_A(new ScaledValuePoint("S64111_INPUT_A", "Array Current", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "P_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "P_SF")), //
 		CHARGER_ST(new EnumPoint("S64111_CHARGER_ST", "Operating State", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64111_ChargerSt.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64111_ChargerSt.values())), //
 		OUTPUT_W(new ScaledValuePoint("S64111_OUTPUT_W", "Output Wattage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "P_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "P_SF")), //
 		TODAY_MIN_BAT_V(new ScaledValuePoint("S64111_TODAY_MIN_BAT_V", "Today's Minimum Battery Voltage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		TODAY_MAX_BAT_V(new ScaledValuePoint("S64111_TODAY_MAX_BAT_V", "Today's Maximum Battery Voltage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		VOCV(new ScaledValuePoint("S64111_VOCV", "VOC", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		TODAY_MAX_V_O_C(new ScaledValuePoint("S64111_TODAY_MAX_V_O_C", "Today's Maximum VOC", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		TODAYK_WH_OUTPUT(new ScaledValuePoint("S64111_TODAYK_WH_OUTPUT", "Today's kWh", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
 		TODAY_A_H_OUTPUT(new ScaledValuePoint("S64111_TODAY_A_H_OUTPUT", "Today's AH", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "AH_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "AH_SF")), //
 		LIFE_TIME_K_W_H_OUT(new ScaledValuePoint("S64111_LIFE_TIME_K_W_H_OUT", "Lifetime kWh", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOWATT_HOURS, "P_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOWATT_HOURS, "P_SF")), //
 		LIFE_TIME_A_H_OUT(new ScaledValuePoint("S64111_LIFE_TIME_A_H_OUT", "Lifetime kAH", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOAMPERE_HOURS, "KWH_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOAMPERE_HOURS, "KWH_SF")), //
 		LIFE_TIME_MAX_OUT(new ScaledValuePoint("S64111_LIFE_TIME_MAX_OUT", "Lifetime Maximum Output Wattage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "P_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "P_SF")), //
 		LIFE_TIME_MAX_BATT(new ScaledValuePoint("S64111_LIFE_TIME_MAX_BATT", "Lifetime Maximum Battery Voltage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		LIFE_TIME_MAX_V_O_C(new ScaledValuePoint("S64111_LIFE_TIME_MAX_V_O_C", "Lifetime Maximum VOC Voltage", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF"));
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF"));
 
 		private final Point point;
 
@@ -6635,7 +6710,7 @@ public OptionsEnum getUndefined() {
 
 	public static enum S64112 implements SunSpecPoint {
 		PORT(new ValuePoint("S64112_PORT", "Port Number", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		V_SF(new ScaleFactorPoint("S64112_V_SF", "", "")), //
 		C_SF(new ScaleFactorPoint("S64112_C_SF", "", "")), //
 		H_SF(new ScaleFactorPoint("S64112_H_SF", "", "")), //
@@ -6643,119 +6718,147 @@ public static enum S64112 implements SunSpecPoint {
 		AH_SF(new ScaleFactorPoint("S64112_AH_SF", "", "")), //
 		KWH_SF(new ScaleFactorPoint("S64112_KWH_SF", "", "")), //
 		C_C_CONFIG_FAULT(new BitFieldPoint("S64112_C_C_CONFIG_FAULT", "Faults", "", //
-				BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+				BITFIELD16, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
 		C_C_CONFIG_ABSORB_V(new ScaledValuePoint("S64112_C_C_CONFIG_ABSORB_V", "Absorb", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_ABSORB_HR(new ScaledValuePoint("S64112_C_C_CONFIG_ABSORB_HR", "Absorb Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "H_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "H_SF")), //
 		C_C_CONFIG_ABSORB_END_A(new ScaledValuePoint("S64112_C_C_CONFIG_ABSORB_END_A", "Absorb End", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
 		C_C_CONFIG_REBULK_V(new ScaledValuePoint("S64112_C_C_CONFIG_REBULK_V", "Rebulk", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_FLOAT_V(new ScaledValuePoint("S64112_C_C_CONFIG_FLOAT_V", "Float", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_MAX_CHG_A(new ScaledValuePoint("S64112_C_C_CONFIG_MAX_CHG_A", "Maximum Charge", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
 		C_C_CONFIG_EQUALIZE_V(new ScaledValuePoint("S64112_C_C_CONFIG_EQUALIZE_V", "Equalize", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_EQUALIZE_HR(new ValuePoint("S64112_C_C_CONFIG_EQUALIZE_HR", "Equalize Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_AUTO_EQUALIZE(new ValuePoint("S64112_C_C_CONFIG_AUTO_EQUALIZE", "Auto Equalize Interval", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_M_P_P_T_MODE(new EnumPoint("S64112_C_C_CONFIG_M_P_P_T_MODE", "MPPT mode", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_MPPT_mode.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_MPPT_mode.values())), //
 		C_C_CONFIG_SWEEP_WIDTH(new EnumPoint("S64112_C_C_CONFIG_SWEEP_WIDTH", "Sweep Width", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_sweep_width.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_sweep_width.values())), //
 		C_C_CONFIG_SWEEP_MAX(new EnumPoint("S64112_C_C_CONFIG_SWEEP_MAX", "Sweep Maximum", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_sweep_max.values())), //
-		C_C_CONFIG_U_PICK_DUTY_CYC(new ScaledValuePoint("S64112_C_C_CONFIG_U_PICK_DUTY_CYC", "U-Pick PWM Duty Cycle", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "V_SF")), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_sweep_max.values())), //
+		C_C_CONFIG_U_PICK_DUTY_CYC(
+				new ScaledValuePoint("S64112_C_C_CONFIG_U_PICK_DUTY_CYC", "U-Pick PWM Duty Cycle", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "V_SF")), //
 		C_C_CONFIG_GRID_TIE(new EnumPoint("S64112_C_C_CONFIG_GRID_TIE", "Grid Tie Mode", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_grid_tie.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_grid_tie.values())), //
 		C_C_CONFIG_TEMP_COMP(new EnumPoint("S64112_C_C_CONFIG_TEMP_COMP", "Temp Comp Mode", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_temp_comp.values())), //
-		C_C_CONFIG_TEMP_COMP_LLIMT(new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_LLIMT", "Temp Comp Lower Limit", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_TEMP_COMP_HLIMT(new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_HLIMT", "Temp Comp Upper Limit", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_temp_comp.values())), //
+		C_C_CONFIG_TEMP_COMP_LLIMT(
+				new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_LLIMT", "Temp Comp Lower Limit", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_TEMP_COMP_HLIMT(
+				new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_HLIMT", "Temp Comp Upper Limit", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_AUTO_RESTART(new EnumPoint("S64112_C_C_CONFIG_AUTO_RESTART", "Auto Restart Mode", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_auto_restart.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_auto_restart.values())), //
 		C_C_CONFIG_WAKEUP_V_O_C(new ScaledValuePoint("S64112_C_C_CONFIG_WAKEUP_V_O_C", "Wakeup VOC Change", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_SNOOZE_MODE_A(new ScaledValuePoint("S64112_C_C_CONFIG_SNOOZE_MODE_A", "Snooze Mode", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
 		C_C_CONFIG_WAKEUP_INTERVAL(new ValuePoint("S64112_C_C_CONFIG_WAKEUP_INTERVAL", "Wakeup Interval", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_A_U_X_MODE(new EnumPoint("S64112_C_C_CONFIG_A_U_X_MODE", "AUX Output Mode", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_mode.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_mode.values())), //
 		C_C_CONFIG_A_U_X_CONTROL(new EnumPoint("S64112_C_C_CONFIG_A_U_X_CONTROL", "AUX Output Control", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_control.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_control.values())), //
 		C_C_CONFIG_A_U_X_STATE(new EnumPoint("S64112_C_C_CONFIG_A_U_X_STATE", "AUX Output State", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_state.values())), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_state.values())), //
 		C_C_CONFIG_A_U_X_POLARITY(new EnumPoint("S64112_C_C_CONFIG_A_U_X_POLARITY", "AUX Output Polarity", "", //
-				EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_polarity.values())), //
-		C_C_CONFIG_A_U_X_L_BATT_DISC(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DISC", "AUX Low Battery Disconnect", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_L_BATT_RCON(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_RCON", "AUX Low Battery Reconnect", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_L_BATT_DLY(new ValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DLY", "AUX Low Battery Disconnect Delay", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_polarity.values())), //
+		C_C_CONFIG_A_U_X_L_BATT_DISC(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DISC", "AUX Low Battery Disconnect", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_L_BATT_RCON(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_RCON", "AUX Low Battery Reconnect", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_L_BATT_DLY(
+				new ValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DLY", "AUX Low Battery Disconnect Delay", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_A_U_X_VENT_FAN_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_VENT_FAN_V", "AUX Vent Fan", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_P_V_TRIGGER_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRIGGER_V", "AUX PV Trigger", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_P_V_TRG_H_TM(new ValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRG_H_TM", "AUX PV Trigger Hold Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_A_U_X_NLITE_THRS_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_THRS_V", "AUX Night Light Threshold", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_NLITE_ON_TM(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_TM", "AUX Night Light On Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "H_SF")), //
-		C_C_CONFIG_A_U_X_NLITE_ON_HIST(new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_HIST", "AUX Night Light On Hysteresis", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_A_U_X_NLITE_OFF_HIST(new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_OFF_HIST", "AUX Night Light Off Hysteresis", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_A_U_X_ERROR_BATT_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_ERROR_BATT_V", "AUX Error Output Low Battery", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_DIVERT_H_TIME(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_H_TIME", "AUX Divert Hold Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "V_SF")), //
-		C_C_CONFIG_A_U_X_DIVERT_DLY_TIME(new ValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_DLY_TIME", "AUX Divert Delay Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_A_U_X_DIVERT_REL_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_REL_V", "AUX Divert Relative", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_A_U_X_DIVERT_HYST_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_HYST_V", "AUX Divert Hysteresis", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_P_V_TRIGGER_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRIGGER_V", "AUX PV Trigger", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_P_V_TRG_H_TM(
+				new ValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRG_H_TM", "AUX PV Trigger Hold Time", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_A_U_X_NLITE_THRS_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_THRS_V", "AUX Night Light Threshold", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_NLITE_ON_TM(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_TM", "AUX Night Light On Time", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "H_SF")), //
+		C_C_CONFIG_A_U_X_NLITE_ON_HIST(
+				new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_HIST", "AUX Night Light On Hysteresis", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_A_U_X_NLITE_OFF_HIST(
+				new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_OFF_HIST", "AUX Night Light Off Hysteresis", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_A_U_X_ERROR_BATT_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_ERROR_BATT_V", "AUX Error Output Low Battery", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_DIVERT_H_TIME(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_H_TIME", "AUX Divert Hold Time", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "V_SF")), //
+		C_C_CONFIG_A_U_X_DIVERT_DLY_TIME(
+				new ValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_DLY_TIME", "AUX Divert Delay Time", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_A_U_X_DIVERT_REL_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_REL_V", "AUX Divert Relative", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_A_U_X_DIVERT_HYST_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_HYST_V", "AUX Divert Hysteresis", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_MAJOR_F_W_REV(new ValuePoint("S64112_C_C_CONFIG_MAJOR_F_W_REV", "FM CC Major Firmware Number", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_MID_F_W_REV(new ValuePoint("S64112_C_C_CONFIG_MID_F_W_REV", "FM CC Mid Firmware Number", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_MINOR_F_W_REV(new ValuePoint("S64112_C_C_CONFIG_MINOR_F_W_REV", "FM CC Minor Firmware Number", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_DATA_LOG_DAY_OFFSET(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAY_OFFSET", "Set Data Log Day Offset", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_DATA_LOG_CUR_DAY_OFF(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CUR_DAY_OFF", "Current Data Log Day Offset", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_DATA_LOG_DAY_OFFSET(
+				new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAY_OFFSET", "Set Data Log Day Offset", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_DATA_LOG_CUR_DAY_OFF(
+				new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CUR_DAY_OFF", "Current Data Log Day Offset", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
 		C_C_CONFIG_DATA_LOG_DAILY_A_H(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAILY_A_H", "Data Log Daily (Ah)", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS)), //
-		C_C_CONFIG_DATA_LOG_DAILY_K_W_H(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAILY_K_W_H", "Data Log Daily (kWh)", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
-		C_C_CONFIG_DATA_LOG_MAX_OUT_A(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_A", "Data Log Daily Maximum Output (A)", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
-		C_C_CONFIG_DATA_LOG_MAX_OUT_W(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_W", "Data Log Daily Maximum Output (W)", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "V_SF")), //
-		C_C_CONFIG_DATA_LOG_ABSORB_T(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_ABSORB_T", "Data Log Daily Absorb Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_DATA_LOG_FLOAT_T(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_FLOAT_T", "Data Log Daily Float Time", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_DATA_LOG_MIN_BATT_V(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MIN_BATT_V", "Data Log Daily Minimum Battery", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_DATA_LOG_MAX_BATT_V(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_BATT_V", "Data Log Daily Maximum Battery", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
-		C_C_CONFIG_DATA_LOG_MAX_INPUT_V(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_INPUT_V", "Data Log Daily Maximum Input", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS)), //
+		C_C_CONFIG_DATA_LOG_DAILY_K_W_H(
+				new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAILY_K_W_H", "Data Log Daily (kWh)", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
+		C_C_CONFIG_DATA_LOG_MAX_OUT_A(
+				new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_A", "Data Log Daily Maximum Output (A)", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
+		C_C_CONFIG_DATA_LOG_MAX_OUT_W(
+				new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_W", "Data Log Daily Maximum Output (W)", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "V_SF")), //
+		C_C_CONFIG_DATA_LOG_ABSORB_T(
+				new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_ABSORB_T", "Data Log Daily Absorb Time", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_DATA_LOG_FLOAT_T(
+				new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_FLOAT_T", "Data Log Daily Float Time", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_DATA_LOG_MIN_BATT_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MIN_BATT_V", "Data Log Daily Minimum Battery", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_DATA_LOG_MAX_BATT_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_BATT_V", "Data Log Daily Maximum Battery", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+		C_C_CONFIG_DATA_LOG_MAX_INPUT_V(
+				new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_INPUT_V", "Data Log Daily Maximum Input", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
 		C_C_CONFIG_DATA_LOG_CLEAR(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CLEAR", "Data Log Clear", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
-		C_C_CONFIG_DATA_LOG_CLR_COMP(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CLR_COMP", "Data Log Clear Complement", "", //
-				ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+				UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+		C_C_CONFIG_DATA_LOG_CLR_COMP(
+				new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CLR_COMP", "Data Log Clear Complement", "", //
+						UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE));
 
 		private final Point point;
 
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
index 33c3496c644..cfcf6d532c0 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.bridge.modbus;
 
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
 import static io.openems.edge.bridge.modbus.api.ModbusComponent.ChannelId.MODBUS_COMMUNICATION_FAILED;
 
 import org.junit.Test;
@@ -22,7 +23,6 @@
 import io.openems.edge.common.taskmanager.Priority;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
-import io.openems.edge.common.test.TestUtils;
 
 public class BridgeModbusTcpImplTest {
 
@@ -33,7 +33,7 @@ public class BridgeModbusTcpImplTest {
 	public void test() throws Exception {
 		final ThrowingRunnable<Exception> sleep = () -> Thread.sleep(CYCLE_TIME);
 
-		var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+		var port = findRandomOpenPortOnAllLocalInterfaces();
 		ModbusSlave slave = null;
 		try {
 			/*
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
index ce0b9f97068..fe8246dfb2f 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
@@ -1,7 +1,7 @@
 package io.openems.edge.bridge.modbus.api.worker.internal;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.bridge.modbus.api.worker.internal.CycleTasksManagerTest.LOG_HANDLER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
index 77e3d8b8f3f..46b13094b91 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
@@ -1,7 +1,7 @@
 package io.openems.edge.bridge.modbus.api.worker.internal;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.bridge.modbus.api.worker.internal.CycleTasksManagerTest.LOG_HANDLER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java
index 2e877e2cb42..d55f8c1b395 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.bridge.modbus.sunspec;
 
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
 import static io.openems.edge.bridge.modbus.sunspec.AbstractOpenemsSunSpecComponent.preprocessModbusElements;
 import static java.util.stream.IntStream.range;
 import static org.junit.Assert.assertEquals;
@@ -37,7 +38,6 @@
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TestUtils;
 
 public class AbstractOpenemsSunSpecComponentTest {
 
@@ -163,7 +163,7 @@ private static ImmutableSortedMap.Builder<Integer, Integer> generateSunSpec() {
 	@Ignore
 	@Test
 	public void test() throws Exception {
-		var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+		var port = findRandomOpenPortOnAllLocalInterfaces();
 		ModbusSlave slave = null;
 		try {
 			/*
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
index ed93664f6c5..381ae0db30c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
@@ -148,9 +148,9 @@ class UAdapterState {
 
 	/**
 	 * This is the current 'real' speed that the OneWire is operating at. This is
-	 * used to represent the actual mode that the DS2480 is operating in. For example
-	 * the logical speed might be USPEED_REGULAR but for RF emission reasons we may
-	 * put the actual DS2480 in SPEED_FLEX.
+	 * used to represent the actual mode that the DS2480 is operating in. For
+	 * example the logical speed might be USPEED_REGULAR but for RF emission reasons
+	 * we may put the actual DS2480 in SPEED_FLEX.
 	 * <p>
 	 * The valid values for this are:
 	 * <ul>
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
index b03ef071bd0..d1f60ff3073 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
@@ -82,7 +82,8 @@ protected void logError(Logger log, String message) {
 
 	@Override
 	public void buildJsonApiRoutes(JsonApiBuilder builder) {
-		builder.handleRequest(GetDevicesRequest.METHOD, call -> this.taskWorker.handleGetDevicesRequest(call.getRequest()));
+		builder.handleRequest(GetDevicesRequest.METHOD,
+				call -> this.taskWorker.handleGetDevicesRequest(call.getRequest()));
 	}
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java b/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java
index 52337d0c78f..d1750f819fe 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java
@@ -44,5 +44,4 @@ public static Currency fromCurrencyConfig(CurrencyConfig config) {
 		case CHF -> Currency.CHF;
 		};
 	}
-	
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/host/Host.java b/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
index 3048111f0ad..304fc98d217 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
@@ -106,7 +106,7 @@ public default void _setHostname(String value) {
 	 * @throws OpenemsNamedException exception
 	 */
 	public List<Inet4Address> getSystemIPs() throws OpenemsNamedException;
-	
+
 	/**
 	 * Gets the Channel for {@link ChannelId#OS_VERSION}.
 	 *
diff --git a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java
index f051eaa18eb..369064bc85e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java
@@ -19,8 +19,8 @@ public class MultipleJsonApiBinder {
 	 * logs a warning.
 	 * 
 	 * <p>
-	 * Commonly used like this with OSGi injection to bind all {@link JsonApi}
-	 * which target the specific {@code ENTRY_POINT}:<br>
+	 * Commonly used like this with OSGi injection to bind all {@link JsonApi} which
+	 * target the specific {@code ENTRY_POINT}:<br>
 	 * 
 	 * <pre>
 	 * {@code @Reference}(//
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
index db5ebb96825..fe893c48292 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
@@ -1,12 +1,12 @@
 package io.openems.edge.common.test;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
+import static java.util.Collections.unmodifiableList;
 
 import java.io.IOException;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
 
@@ -58,12 +58,12 @@ public DummyComponentManager(Clock clock) {
 
 	@Override
 	public List<OpenemsComponent> getEnabledComponents() {
-		return Collections.unmodifiableList(this.components);
+		return unmodifiableList(this.components);
 	}
 
 	@Override
 	public List<OpenemsComponent> getAllComponents() {
-		return Collections.unmodifiableList(this.components);
+		return unmodifiableList(this.components);
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java b/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
index 4cb54a3f37e..5f99649086e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
@@ -1,12 +1,8 @@
 package io.openems.edge.common.test;
 
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.time.Instant;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import io.openems.common.test.TimeLeapClock;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.ChannelId;
 import io.openems.edge.common.channel.value.Value;
@@ -15,31 +11,6 @@
 public class TestUtils {
 
 	private TestUtils() {
-
-	}
-
-	/**
-	 * Creates a {@link TimeLeapClock} for 1st January 2000 00:00.
-	 * 
-	 * @return the {@link TimeLeapClock}
-	 */
-	public static TimeLeapClock createDummyClock() {
-		return new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */);
-	}
-
-	/**
-	 * Finds and returns an open port.
-	 *
-	 * <p>
-	 * Source https://stackoverflow.com/a/26644672
-	 *
-	 * @return an open port
-	 * @throws IOException on error
-	 */
-	public static int findRandomOpenPortOnAllLocalInterfaces() throws IOException {
-		try (var socket = new ServerSocket(0);) {
-			return socket.getLocalPort();
-		}
 	}
 
 	/**
diff --git a/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java b/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java
index 56a1820b518..3b3b4125502 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java
@@ -43,7 +43,7 @@ public void testMapRequest() {
 		class DummyRequestClass {
 
 		}
-		
+
 		final var dummyRequest = new DummyRequestClass();
 		final var newCall = call.mapRequest(dummyRequest);
 
@@ -58,7 +58,7 @@ public void testMapResponse() {
 		class DummyResponseClass {
 
 		}
-		
+
 		final var mappedCall = call.<DummyResponseClass>mapResponse();
 
 		final var originalResponse = new GenericJsonrpcResponseSuccess(call.getRequest().getId());
diff --git a/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java b/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java
index b418b9bb1a9..56e5cf9032d 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.common.type;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -11,8 +12,6 @@
 
 import com.google.common.collect.ImmutableSortedMap;
 
-import io.openems.edge.common.test.TestUtils;
-
 public class QuarterlyValuesTest {
 
 	private static class MyQuarterlyValues extends QuarterlyValues<Double> {
@@ -32,14 +31,14 @@ protected Double[] asArray() {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testExpectError() {
-		var time = ZonedDateTime.now(TestUtils.createDummyClock());
+		var time = ZonedDateTime.now(createDummyClock());
 		new MyQuarterlyValues(ImmutableSortedMap.of(//
 				time.plusMinutes(1), 0.1));
 	}
 
 	@Test
 	public void testEmpty() {
-		var time = ZonedDateTime.now(TestUtils.createDummyClock());
+		var time = ZonedDateTime.now(createDummyClock());
 		var sut = new MyQuarterlyValues(time);
 		assertTrue(sut.isEmpty());
 		assertNull(sut.getFirst());
@@ -53,7 +52,7 @@ public void testEmpty() {
 
 	@Test
 	public void test() {
-		var time = ZonedDateTime.now(TestUtils.createDummyClock());
+		var time = ZonedDateTime.now(createDummyClock());
 		var sut = new MyQuarterlyValues(ImmutableSortedMap.of(//
 				time, 0.1, //
 				time.plusMinutes(15), 0.2, //
@@ -71,7 +70,7 @@ public void test() {
 
 	@Test
 	public void test2() {
-		var time = ZonedDateTime.now(TestUtils.createDummyClock());
+		var time = ZonedDateTime.now(createDummyClock());
 		var sut = new MyQuarterlyValues(time, 0.1, 0.2, null, 0.3);
 		assertEquals(3, sut.asArray().length);
 		assertEquals(4, sut.toMapWithAllQuarters().size());
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
index 94289206d45..95a01a9e335 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
@@ -172,7 +172,7 @@ private TreeBasedTable<Long, String, JsonElement> collectAggregatedData(ZonedDat
 			List<OpenemsComponent> enabledComponents) {
 		final var endTime = now.truncatedTo(DurationUnit.ofMinutes(AGGREGATION_MINUTES));
 		final var startTime = endTime.minusMinutes(AGGREGATION_MINUTES);
-		
+
 		final var timestamp = startTime.toInstant();
 		if (this.lastSendAggregatedDataTimestamp == null) {
 			this.lastSendAggregatedDataTimestamp = timestamp;
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java
index 14c18bde3e8..27edce1e31c 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java
@@ -3,14 +3,10 @@
 import io.openems.common.types.OptionsEnum;
 
 public enum Status implements OptionsEnum {
-
 	ACTIVE(0, "Active"), //
-
 	INACTIVE(1, "Inactive"), //
-	
 	ERROR(2, "Error"); //
 
-
 	private final int value;
 	private final String name;
 
@@ -33,5 +29,4 @@ public String getName() {
 	public OptionsEnum getUndefined() {
 		return INACTIVE;
 	}
-	
 }
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
index 02c4533867d..1b5b4b9fcd3 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
@@ -118,7 +118,7 @@ public void notifyTimeout() {
 	 * @return the value as String
 	 */
 	public abstract String valueToString();
-	
+
 	/**
 	 * Gets the value of the current object.
 	 *
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java
index 64496f773cc..a21ac88bb8b 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java
@@ -1,7 +1,8 @@
 package io.openems.edge.controller.api.common.handler;
 
+import static java.time.temporal.ChronoUnit.MINUTES;
+
 import java.io.IOException;
-import java.time.temporal.ChronoUnit;
 import java.util.Collections;
 import java.util.TreeSet;
 
@@ -86,8 +87,8 @@ private QueryHistoricTimeseriesExportXlsxResponse handleQueryHistoricTimeseriesE
 		final var channelsByType = detailData.getChannelsBySaveType();
 		powerChannels.addAll(channelsByType.getOrDefault(HistoricTimedataSaveType.POWER, Collections.emptyList()));
 		energyChannels.addAll(channelsByType.getOrDefault(HistoricTimedataSaveType.ENERGY, Collections.emptyList()));
-		var powerData = this.timedata.queryHistoricData(null, request.getFromDate(), request.getToDate(),
-				powerChannels, new Resolution(15, ChronoUnit.MINUTES));
+		var powerData = this.timedata.queryHistoricData(null, request.getFromDate(), request.getToDate(), powerChannels,
+				new Resolution(15, MINUTES));
 
 		var energyData = this.timedata.queryHistoricEnergy(null, request.getFromDate(), request.getToDate(),
 				energyChannels);
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
index 01c6e47638a..6f7e36683f8 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
@@ -66,8 +66,8 @@ public ControllerApiModbusTcpReadOnlyImpl() {
 	@Activate
 	private void activate(ComponentContext context, Config config) throws ModbusException, OpenemsException {
 		super.activate(context, this.cm,
-				new ConfigRecord(config.id(), config.alias(), config.enabled(),this.metaComponent, config.component_ids(), 0 /* no timeout */, config.port(),
-						config.maxConcurrentConnections()));
+				new ConfigRecord(config.id(), config.alias(), config.enabled(), this.metaComponent,
+						config.component_ids(), 0 /* no timeout */, config.port(), config.maxConcurrentConnections()));
 	}
 
 	@Override
@@ -83,7 +83,8 @@ protected AccessMode getAccessMode() {
 
 	@Override
 	protected Consumer<Entry<WriteChannel<?>, WriteObject>> handleWrites() {
-		return entry -> { };
+		return entry -> {
+		};
 	}
 
 	@Override
@@ -92,6 +93,7 @@ protected void setOverrideStatus(Status status) {
 
 	@Override
 	protected Runnable handleTimeouts() {
-		return () -> { };
+		return () -> {
+		};
 	}
 }
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
index 0614487de2f..9edd49da1bd 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
@@ -27,7 +27,7 @@
 
 	// TODO: Currently unused
 	@AttributeDefinition(name = "Read Channel-IDs", description = "Contains the channelnames of all read channels.")
-	String[] readChannels() default {  };
+	String[] readChannels() default {};
 
 	@AttributeDefinition(name = "Write Channel-IDs", description = "Contains the channelnames of all overridden channels.")
 	String[] writeChannels();
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
index 8a18a1aada2..f39092ee732 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
@@ -16,18 +16,18 @@
 public interface ControllerApiModbusTcpReadWrite extends OpenemsComponent {
 
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
-		
+
 		OVERRIDE_STATUS(Doc.of(Status.values()) //
 				.persistencePriority(PersistencePriority.HIGH)), //
-		
+
 		CUMULATED_ACTIVE_TIME(Doc.of(LONG)//
 				.unit(CUMULATED_SECONDS) //
 				.persistencePriority(HIGH)), //
-		
+
 		CUMULATED_INACTIVE_TIME(Doc.of(LONG)//
 				.unit(CUMULATED_SECONDS) //
 				.persistencePriority(HIGH)), //
-		
+
 		API_WORKER_LOG(Doc.of(OpenemsType.STRING) //
 				.text("Logs Write-Commands via ApiWorker")); //
 
@@ -71,7 +71,8 @@ public default Status getOverrideStatus() {
 	}
 
 	/**
-	 * Internal method to set the 'nextValue' on {@link ChannelId#OVERRIDE_STATUS} Channel.
+	 * Internal method to set the 'nextValue' on {@link ChannelId#OVERRIDE_STATUS}
+	 * Channel.
 	 *
 	 * @param value the next value
 	 */
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
index dfbd3ea52b8..1b761e3d72a 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
@@ -18,12 +18,12 @@ protected static class Builder {
 
 		private Builder() {
 		}
-		
+
 		public Builder setWriteChannels(String... writeChannels) {
 			this.writeChannels = writeChannels;
 			return this;
 		}
-		
+
 		public Builder setReadChannels(String... readChannels) {
 			this.readChannels = readChannels;
 			return this;
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java
index 04c9d124dd6..6c93e76983e 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java
@@ -1,11 +1,12 @@
 package io.openems.edge.controller.api.rest.readonly;
 
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
+
 import org.junit.Test;
 
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyUserService;
-import io.openems.edge.common.test.TestUtils;
 import io.openems.edge.controller.api.rest.DummyJsonRpcRestHandlerFactory;
 import io.openems.edge.controller.api.rest.JsonRpcRestHandler;
 import io.openems.edge.controller.test.ControllerTest;
@@ -14,7 +15,7 @@ public class ControllerApiRestReadOnlyImplTest {
 
 	@Test
 	public void test() throws OpenemsException, Exception {
-		final var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+		final var port = findRandomOpenPortOnAllLocalInterfaces();
 
 		new ControllerTest(new ControllerApiRestReadOnlyImpl()) //
 				.addReference("componentManager", new DummyComponentManager()) //
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
index eaaf3fae866..29c3f530886 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.controller.api.rest.readwrite;
 
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
 import static io.openems.edge.common.test.DummyUser.DUMMY_ADMIN;
 import static io.openems.edge.common.test.DummyUser.DUMMY_GUEST;
@@ -54,7 +55,7 @@ public class ControllerApiRestReadWriteImplTest {
 
 	@Test
 	public void test() throws OpenemsException, Exception {
-		final var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+		final var port = findRandomOpenPortOnAllLocalInterfaces();
 
 		final var componentManager = new DummyComponentManager();
 
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java
index 45234bfaa4f..d47cecfd29b 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java
@@ -31,7 +31,8 @@ public void buildJsonApiRoutes(JsonApiBuilder builder) {
 			return new GetEdgeResponse(call.getRequest().getId(), Utils.getEdgeMetadata(user.getGlobalRole()));
 		});
 
-		builder.handleRequest(SubscribeEdgesRequest.METHOD, call -> new GenericJsonrpcResponseSuccess(call.getRequest().getId()));
+		builder.handleRequest(SubscribeEdgesRequest.METHOD,
+				call -> new GenericJsonrpcResponseSuccess(call.getRequest().getId()));
 	}
 
 }
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
index 290e1fb1c47..ad0286d4054 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
@@ -92,20 +92,13 @@ public StateMachine(State initialState) {
 	@Override
 	public StateHandler<StateMachine.State, Context> getStateHandler(State state) {
 		return switch (state) {
-		case NO_LIMIT ->
-			new NoLimitHandler();
-		case ABOVE_RESERVE_SOC -> 
-			new AboveReserveSocHandler();
-		case AT_RESERVE_SOC ->
-			new AtReserveSocHandler();
-		case BELOW_RESERVE_SOC ->
-			new BelowReserveSocHandler();
-		case FORCE_CHARGE_PV ->
-			new ForceChargePvHandler();
-		case FORCE_CHARGE_GRID ->
-			new ForceChargeGridHandler();
-		case UNDEFINED ->
-			new UndefinedHandler();
+		case NO_LIMIT -> new NoLimitHandler();
+		case ABOVE_RESERVE_SOC -> new AboveReserveSocHandler();
+		case AT_RESERVE_SOC -> new AtReserveSocHandler();
+		case BELOW_RESERVE_SOC -> new BelowReserveSocHandler();
+		case FORCE_CHARGE_PV -> new ForceChargePvHandler();
+		case FORCE_CHARGE_GRID -> new ForceChargeGridHandler();
+		case UNDEFINED -> new UndefinedHandler();
 		};
 	}
 
diff --git a/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java b/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java
index aa01cbddbbb..98dd659b20c 100644
--- a/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java
+++ b/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java
@@ -10,7 +10,7 @@
 
 public class DeactivationTimeHandler extends StateHandler<State, Context> {
 
-	private static final int ZERO_WATT_POWER = 0; //[0 W]
+	private static final int ZERO_WATT_POWER = 0; // [0 W]
 	protected Instant deactivationStateStartTime;
 
 	private static enum SubState {
diff --git a/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java b/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java
index e704c552b50..ac8b9abaa2e 100644
--- a/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java
+++ b/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.controller.ess.fastfrequencyreserve;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.controller.ess.fastfrequencyreserve.ControllerFastFrequencyReserve.ChannelId.STATE_MACHINE;
 import static io.openems.edge.controller.ess.fastfrequencyreserve.enums.ActivationTime.LONG_ACTIVATION_RUN;
 import static io.openems.edge.controller.ess.fastfrequencyreserve.enums.SupportDuration.LONG_SUPPORT_DURATION;
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java
index 94d0e84fbb1..edb1435b1e8 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java
@@ -38,7 +38,7 @@ public void test() throws Exception {
 		test.next(new TestCase() //
 				.output(SURPLUS_FEED_TO_GRID_IS_LIMITED, true) //
 				.output("ess0", SET_ACTIVE_POWER_GREATER_OR_EQUALS, 2000)) //
-		
+
 				.deactivate();
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java b/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java
index 69f598db15b..c2768e430d8 100644
--- a/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java
+++ b/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java
@@ -16,7 +16,7 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "Ess-ID", description = "ID of Ess.")
 	String ess_id() default "ess0";
 
diff --git a/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java b/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java
index c0c2a3ddab8..028564e3ea1 100644
--- a/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java
+++ b/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java
@@ -12,7 +12,7 @@ protected static class Builder {
 
 		private Builder() {
 		}
-		
+
 		public Builder setInputChannelAddress(String inputChannelAddress) {
 			this.inputChannelAddress = inputChannelAddress;
 			return this;
@@ -22,7 +22,7 @@ public Builder setId(String id) {
 			this.id = id;
 			return this;
 		}
-		
+
 		public Builder setEssId(String id) {
 			this.essId = id;
 			return this;
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
index f240abc3ed9..acc57399ef6 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.controller.ess.limittotaldischarge;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.controller.ess.limittotaldischarge.ControllerEssLimitTotalDischarge.ChannelId.AWAITING_HYSTERESIS;
 import static io.openems.edge.ess.api.ManagedSymmetricEss.ChannelId.SET_ACTIVE_POWER_LESS_OR_EQUALS;
 import static io.openems.edge.ess.api.SymmetricEss.ChannelId.SOC;
diff --git a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
index 442be9ddfa2..0278054c009 100644
--- a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
+++ b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
@@ -1,8 +1,8 @@
 package io.openems.edge.controller.ess.reactivepowervoltagecharacteristic;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.common.utils.JsonUtils.buildJsonArray;
 import static io.openems.common.utils.JsonUtils.buildJsonObject;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.ess.api.ManagedSymmetricEss.ChannelId.SET_REACTIVE_POWER_EQUALS;
 import static io.openems.edge.ess.api.SymmetricEss.ChannelId.MAX_APPARENT_POWER;
 import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.VOLTAGE;
diff --git a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java
index 941aaaf78f0..469536f9d5a 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.controller.ess.timeofusetariff;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.controller.ess.timeofusetariff.ControlMode.CHARGE_CONSUMPTION;
 import static io.openems.edge.controller.ess.timeofusetariff.Mode.AUTOMATIC;
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
index a426a0f3186..6b185129d8b 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
@@ -18,7 +18,8 @@
 import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.controller.evcs.JSCalendar.Task;
+import io.openems.common.jscalendar.JSCalendar;
+import io.openems.common.jscalendar.JSCalendar.Task;
 import io.openems.edge.controller.evcs.Utils.EshContext.EshManualContext;
 import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
index 2adacb94a33..3a9bb67ad68 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
@@ -1,9 +1,9 @@
 package io.openems.edge.controller.evcs;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.sum.Sum.ChannelId.ESS_DISCHARGE_POWER;
 import static io.openems.edge.common.sum.Sum.ChannelId.ESS_SOC;
 import static io.openems.edge.common.sum.Sum.ChannelId.GRID_ACTIVE_POWER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.controller.evcs.ControllerEvcs.ChannelId.AWAITING_HYSTERESIS;
 import static io.openems.edge.controller.evcs.Priority.CAR;
 import static io.openems.edge.evcs.api.ChargeMode.EXCESS_POWER;
diff --git a/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java b/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
index e2ce7b1917c..3fc3bd26560 100644
--- a/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
+++ b/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.controller.io.analog;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 
 import java.time.temporal.ChronoUnit;
 
diff --git a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImplTest4.java b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImplTest4.java
index 6e5db300d23..76db186ac35 100644
--- a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImplTest4.java
+++ b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImplTest4.java
@@ -1,5 +1,6 @@
 package io.openems.edge.controller.io.heatingelement;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.sum.Sum.ChannelId.ESS_DISCHARGE_POWER;
 import static io.openems.edge.common.sum.Sum.ChannelId.GRID_ACTIVE_POWER;
 import static io.openems.edge.controller.io.heatingelement.ControllerIoHeatingElement.ChannelId.LEVEL;
@@ -12,7 +13,6 @@
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TestUtils;
 import io.openems.edge.controller.io.heatingelement.enums.Level;
 import io.openems.edge.controller.io.heatingelement.enums.Mode;
 import io.openems.edge.controller.io.heatingelement.enums.WorkMode;
@@ -21,12 +21,11 @@
 
 public class ControllerHeatingElementImplTest4 {
 
-	private static TimeLeapClock clock;
+	private static final TimeLeapClock CLOCK = createDummyClock();
 
 	private static ControllerTest prepareTest(Mode mode, Level level) throws OpenemsNamedException, Exception {
-		clock = TestUtils.createDummyClock();
 		return new ControllerTest(new ControllerIoHeatingElementImpl()) //
-				.addReference("componentManager", new DummyComponentManager(clock)) //
+				.addReference("componentManager", new DummyComponentManager(CLOCK)) //
 				.addReference("sum", new DummySum()) //
 				.addComponent(new DummyInputOutput("io0")) //
 				.activate(MyConfig.create() //
@@ -51,16 +50,16 @@ public void testDischargeTakeIntoAccount() throws OpenemsNamedException, Excepti
 						.input(GRID_ACTIVE_POWER, -2500)//
 						.output(LEVEL, Level.LEVEL_1)) //
 				.next(new TestCase() //
-						.timeleap(clock, 181, SECONDS)//
+						.timeleap(CLOCK, 181, SECONDS)//
 						.input(GRID_ACTIVE_POWER, -2500)//
 						.output(LEVEL, Level.LEVEL_2))//
 				// Grid power reducing because of 2kW heating power
 				.next(new TestCase()//
-						.timeleap(clock, 181, SECONDS)//
+						.timeleap(CLOCK, 181, SECONDS)//
 						.input(GRID_ACTIVE_POWER, -500) //
 						.output(LEVEL, Level.LEVEL_2)) //
 				.next(new TestCase() //
-						.timeleap(clock, 181, SECONDS)//
+						.timeleap(CLOCK, 181, SECONDS)//
 						.input(GRID_ACTIVE_POWER, -500) //
 						.input(ESS_DISCHARGE_POWER, 2300) //
 						.output(LEVEL, Level.LEVEL_1)) //
@@ -75,7 +74,7 @@ public void realDataTest() throws OpenemsNamedException, Exception {
 						.input(GRID_ACTIVE_POWER, -6000)//
 						.output(LEVEL, Level.LEVEL_3)) //
 				.next(new TestCase()//
-						.timeleap(clock, 181, SECONDS)//
+						.timeleap(CLOCK, 181, SECONDS)//
 						.input(GRID_ACTIVE_POWER, 0)//
 						.input(ESS_DISCHARGE_POWER, 2280)//
 						.output(LEVEL, Level.LEVEL_1)) //
diff --git a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest.java b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest.java
index f874c0994e7..994a7aa400b 100644
--- a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest.java
+++ b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest.java
@@ -1,7 +1,7 @@
 package io.openems.edge.controller.io.heatingelement;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.sum.Sum.ChannelId.GRID_ACTIVE_POWER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.controller.io.heatingelement.ControllerIoHeatingElement.ChannelId.PHASE1_TIME;
 import static io.openems.edge.controller.io.heatingelement.ControllerIoHeatingElement.ChannelId.PHASE2_TIME;
 import static io.openems.edge.controller.io.heatingelement.ControllerIoHeatingElement.ChannelId.PHASE3_TIME;
diff --git a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/ControllerIoHeatPumpSgReadyImplTest.java b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/ControllerIoHeatPumpSgReadyImplTest.java
index a1e14ab2de5..7a59a71d94b 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/ControllerIoHeatPumpSgReadyImplTest.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/ControllerIoHeatPumpSgReadyImplTest.java
@@ -1,9 +1,9 @@
 package io.openems.edge.controller.io.heatpump.sgready;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.sum.Sum.ChannelId.ESS_DISCHARGE_POWER;
 import static io.openems.edge.common.sum.Sum.ChannelId.ESS_SOC;
 import static io.openems.edge.common.sum.Sum.ChannelId.GRID_ACTIVE_POWER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.controller.io.heatpump.sgready.ControllerIoHeatPumpSgReady.ChannelId.AWAITING_HYSTERESIS;
 import static io.openems.edge.controller.io.heatpump.sgready.ControllerIoHeatPumpSgReady.ChannelId.STATUS;
 import static io.openems.edge.io.test.DummyInputOutput.ChannelId.INPUT_OUTPUT0;
diff --git a/io.openems.edge.core/src/io/openems/edge/app/common/props/CommunicationProps.java b/io.openems.edge.core/src/io/openems/edge/app/common/props/CommunicationProps.java
index ae77b67d60c..79e1e8d8446 100644
--- a/io.openems.edge.core/src/io/openems/edge/app/common/props/CommunicationProps.java
+++ b/io.openems.edge.core/src/io/openems/edge/app/common/props/CommunicationProps.java
@@ -1,13 +1,15 @@
 package io.openems.edge.app.common.props;
 
 import static io.openems.edge.app.common.props.CommonProps.defaultDef;
+import static io.openems.edge.core.appmanager.TranslationUtil.getTranslation;
 import static io.openems.edge.core.appmanager.formly.enums.InputType.NUMBER;
 import static io.openems.edge.core.appmanager.formly.enums.Validation.IP;
+import static io.openems.edge.core.host.NetworkConfiguration.PATTERN_INET4ADDRESS;
+import static java.util.stream.Collectors.joining;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import com.google.gson.JsonPrimitive;
 
@@ -21,7 +23,6 @@
 import io.openems.edge.core.appmanager.HostSupplier;
 import io.openems.edge.core.appmanager.Nameable;
 import io.openems.edge.core.appmanager.OpenemsApp;
-import io.openems.edge.core.appmanager.TranslationUtil;
 import io.openems.edge.core.appmanager.Type.Parameter.BundleProvider;
 import io.openems.edge.core.appmanager.formly.Case;
 import io.openems.edge.core.appmanager.formly.DefaultValueOptions;
@@ -29,7 +30,6 @@
 import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
 import io.openems.edge.core.appmanager.formly.expression.StringExpression;
 import io.openems.edge.core.appmanager.formly.expression.Variable;
-import io.openems.edge.core.host.NetworkConfiguration;
 
 public final class CommunicationProps {
 
@@ -80,11 +80,10 @@ AppDef<APP, PROP, PARAM> excludingIp() {
 						var ips = app.getHost().getSystemIPs();
 						final var exclusionPattern = ips.stream().map(ip -> ip.getHostAddress())//
 								.map(ip -> ip.replace(".", "\\.")) //
-								.collect(Collectors.joining("|"));
+								.collect(joining("|"));
 
-						final var regex = "^(?!.*(?:" + exclusionPattern + ")$)"
-								+ NetworkConfiguration.PATTERN_INET4ADDRESS;
-						f.setValidation(regex, TranslationUtil.getTranslation(param.bundle(), "communication.excludingIp"));
+						final var regex = "^(?!.*(?:" + exclusionPattern + ")$)" + PATTERN_INET4ADDRESS;
+						f.setValidation(regex, getTranslation(param.bundle(), "communication.excludingIp"));
 					} catch (OpenemsNamedException e) {
 						f.setValidation(IP);
 					}
@@ -213,12 +212,12 @@ AppDef<APP, PROP, PARAM> modbusGroup(//
 											.notEqual(Exp.currentModelValue(modbusId))));
 
 					final var message = Exp.ifElse(filteredArray.length().equal(Exp.staticValue(1)), //
-							StringExpression.of(TranslationUtil.getTranslation(parameter.bundle(),
+							StringExpression.of(getTranslation(parameter.bundle(),
 									"communication.modbusUnitId.alreadTaken.singular",
 									filteredArray.join(", ").insideTranslation(), componentId)), //
-							StringExpression.of(TranslationUtil.getTranslation(parameter.bundle(),
-									"communication.modbusUnitId.alreadTaken.plural",
-									filteredArray.join(", ").insideTranslation(), componentId)));
+							StringExpression.of(
+									getTranslation(parameter.bundle(), "communication.modbusUnitId.alreadTaken.plural",
+											filteredArray.join(", ").insideTranslation(), componentId)));
 
 					field.setCustomValidation(componentId, expression, message, modbusUnitId);
 
diff --git a/io.openems.edge.core/src/io/openems/edge/app/evcs/AlpitronicEvcs.java b/io.openems.edge.core/src/io/openems/edge/app/evcs/AlpitronicEvcs.java
index 6148f1d85ec..94b0788f57a 100644
--- a/io.openems.edge.core/src/io/openems/edge/app/evcs/AlpitronicEvcs.java
+++ b/io.openems.edge.core/src/io/openems/edge/app/evcs/AlpitronicEvcs.java
@@ -83,8 +83,9 @@
  * </pre>
  */
 @Component(name = "App.Evcs.Alpitronic")
-public class AlpitronicEvcs extends
-		AbstractOpenemsAppWithProps<AlpitronicEvcs, ParentProperty, Parameter.BundleParameter> implements OpenemsApp, HostSupplier {
+public class AlpitronicEvcs
+		extends AbstractOpenemsAppWithProps<AlpitronicEvcs, ParentProperty, Parameter.BundleParameter>
+		implements OpenemsApp, HostSupplier {
 
 	public static interface ParentProperty extends Type<ParentProperty, AlpitronicEvcs, Parameter.BundleParameter> {
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
index ab591f359b6..16d616748e9 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
@@ -23,7 +23,7 @@ public enum OpenemsAppCategory {
 	 * Electric vehicle charging station.
 	 */
 	EVCS("evcs"),
-	
+
 	/**
 	 * Read only Electric vehicle charging station.
 	 */
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java
index c4244dea1c6..8be6e7d652d 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java
@@ -70,7 +70,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleExecuteSystemRe
 	 * @throws OpenemsNamedException on error
 	 */
 	public List<Inet4Address> getSystemIPs() throws OpenemsNamedException;
-	
+
 	/**
 	 * Gets the current operating system version.
 	 * 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemMac.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemMac.java
index 2300905d9ae..362a7046086 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemMac.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemMac.java
@@ -26,7 +26,7 @@ public NetworkConfiguration getNetworkConfiguration() throws OpenemsNamedExcepti
 	public void handleSetNetworkConfigRequest(User user, NetworkConfiguration oldNetworkConfiguration,
 			SetNetworkConfigRequest request) throws OpenemsNamedException {
 		throw new NotImplementedException("SetNetworkConfigRequest is not implemented for Mac");
-		
+
 	}
 
 	@Override
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java
index e099353f493..b59c72f7f5b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java
@@ -57,7 +57,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleExecuteSystemRe
 	public List<Inet4Address> getSystemIPs() throws OpenemsNamedException {
 		return Collections.emptyList();
 	}
-	
+
 	public CompletableFuture<String> getOperatingSystemVersion() {
 		return CompletableFuture.completedFuture(System.getProperty("os.name"));
 	}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetIpAddresses.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetIpAddresses.java
index b7b118ba4b8..c3a69854015 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetIpAddresses.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetIpAddresses.java
@@ -16,7 +16,7 @@
 
 public class GetIpAddresses implements EndpointRequestType<Request, Response> {
 	public record Request() {
-		
+
 		/**
 		 * Returns a {@link JsonSerializer} for a {@link GetIpAddresses.Request}.
 		 * 
@@ -28,7 +28,7 @@ public static JsonSerializer<Request> serializer() {
 	}
 
 	public record Response(List<Inet4Address> ips) {
-		
+
 		/**
 		 * Returns a {@link JsonSerializer} for a {@link GetIpAddresses.Response}.
 		 * 
diff --git a/io.openems.edge.core/test/io/openems/edge/app/integratedsystem/TestFeneconHome10Gen2.java b/io.openems.edge.core/test/io/openems/edge/app/integratedsystem/TestFeneconHome10Gen2.java
index 831cd630988..7cae58845f1 100644
--- a/io.openems.edge.core/test/io/openems/edge/app/integratedsystem/TestFeneconHome10Gen2.java
+++ b/io.openems.edge.core/test/io/openems/edge/app/integratedsystem/TestFeneconHome10Gen2.java
@@ -99,7 +99,8 @@ public final void testCreateAndUpdateFullHome() throws Exception {
 	}
 
 	/**
-	 * Gets a {@link JsonObject} with the full settings for a {@link FeneconHome10Gen2}.
+	 * Gets a {@link JsonObject} with the full settings for a
+	 * {@link FeneconHome10Gen2}.
 	 * 
 	 * @return the settings object
 	 */
diff --git a/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java b/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java
index 9ff2a139fdb..a2c92b9de2b 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/meta/MyConfig.java
@@ -19,7 +19,7 @@ public Builder setCurrency(CurrencyConfig currency) {
 			this.currency = currency;
 			return this;
 		}
-		
+
 		public Builder setIsEssChargeFromGridAllowed(boolean isEssChargeFromGridAllowed) {
 			this.isEssChargeFromGridAllowed = isEssChargeFromGridAllowed;
 			return this;
diff --git a/io.openems.edge.core/test/io/openems/edge/core/predictormanager/PredictorManagerImplTest.java b/io.openems.edge.core/test/io/openems/edge/core/predictormanager/PredictorManagerImplTest.java
index 3bc99e30cdc..9075da90e4f 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/predictormanager/PredictorManagerImplTest.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/predictormanager/PredictorManagerImplTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.core.predictormanager;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.predictor.api.prediction.Prediction.EMPTY_PREDICTION;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static org.junit.Assert.assertArrayEquals;
diff --git a/io.openems.edge.core/test/io/openems/edge/core/sum/ExtremeEverValuesTest.java b/io.openems.edge.core/test/io/openems/edge/core/sum/ExtremeEverValuesTest.java
index 4befb39052f..aa35aa7da51 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/sum/ExtremeEverValuesTest.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/sum/ExtremeEverValuesTest.java
@@ -1,7 +1,7 @@
 package io.openems.edge.core.sum;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.test.TestUtils.activateNextProcessImage;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.test.TestUtils.withValue;
 import static io.openems.edge.core.sum.ExtremeEverValues.Range.NEGATIVE;
 import static io.openems.edge.core.sum.ExtremeEverValues.Range.POSTIVE;
diff --git a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyGlobalSimulationsContext.java b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyGlobalSimulationsContext.java
index 9328ae82a66..e6b87c2935c 100644
--- a/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyGlobalSimulationsContext.java
+++ b/io.openems.edge.energy.api/src/io/openems/edge/energy/api/test/DummyGlobalSimulationsContext.java
@@ -1,6 +1,7 @@
 package io.openems.edge.energy.api.test;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.energy.api.EnergyUtils.filterEshsWithDifferentStates;
 
 import java.time.ZonedDateTime;
@@ -10,7 +11,6 @@
 import com.google.common.collect.ImmutableMap;
 
 import io.openems.common.test.TimeLeapClock;
-import io.openems.edge.common.test.TestUtils;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
 import io.openems.edge.energy.api.RiskLevel;
 import io.openems.edge.energy.api.simulation.GlobalSimulationsContext;
@@ -22,7 +22,7 @@ public class DummyGlobalSimulationsContext {
 	private DummyGlobalSimulationsContext() {
 	}
 
-	public static final TimeLeapClock CLOCK = TestUtils.createDummyClock();
+	public static final TimeLeapClock CLOCK = createDummyClock();
 	public static final ZonedDateTime TIME = ZonedDateTime.now(CLOCK);
 
 	/**
diff --git a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java
index 17a80bec581..3ba69ccbc9e 100644
--- a/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java
+++ b/io.openems.edge.energy/src/io/openems/edge/energy/optimizer/Optimizer.java
@@ -94,13 +94,20 @@ public synchronized void deactivate() {
 	 */
 	public void triggerReschedule(String reason) {
 		// NOTE: This is what happens here:
-		// [_cycle  ] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Trigger Reschedule. Reason: ControllerEvcsImpl::onEvcsStatusChange from 6:The charging limit reached to 1:Not ready for Charging
-		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Optimizer::run() InterruptedException: null
-		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Simulation gave no result!
-		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER Run Quick Optimization...
-		// [thread-1] INFO  [dge.energy.optimizer.Optimizer] OPTIMIZER updateSimulator()...
-		
-		// TODO On interrupt: keep best "regularOptimization" up till now as input for next InitialPopulation
+		// [_cycle ] INFO [dge.energy.optimizer.Optimizer] OPTIMIZER Trigger Reschedule.
+		// Reason: ControllerEvcsImpl::onEvcsStatusChange from 6:The charging limit
+		// reached to 1:Not ready for Charging
+		// [thread-1] INFO [dge.energy.optimizer.Optimizer] OPTIMIZER Optimizer::run()
+		// InterruptedException: null
+		// [thread-1] INFO [dge.energy.optimizer.Optimizer] OPTIMIZER Simulation gave no
+		// result!
+		// [thread-1] INFO [dge.energy.optimizer.Optimizer] OPTIMIZER Run Quick
+		// Optimization...
+		// [thread-1] INFO [dge.energy.optimizer.Optimizer] OPTIMIZER
+		// updateSimulator()...
+
+		// TODO On interrupt: keep best "regularOptimization" up till now as input for
+		// next InitialPopulation
 		this.traceLog(() -> "Trigger Reschedule. Reason: " + reason);
 		this.rescheduleCurrentPeriod.set(true);
 		this.activate(); // interrupt + reschedule
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/EnergySchedulerImplTest.java b/io.openems.edge.energy/test/io/openems/edge/energy/EnergySchedulerImplTest.java
index a4ad94e99c3..7e5b0717e03 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/EnergySchedulerImplTest.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/EnergySchedulerImplTest.java
@@ -1,8 +1,8 @@
 package io.openems.edge.energy;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.common.utils.DateUtils.roundDownToQuarter;
 import static io.openems.common.utils.ReflectionUtils.getValueViaReflection;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.energy.LogVerbosity.TRACE;
 import static io.openems.edge.energy.api.EnergyConstants.SUM_PRODUCTION;
 import static io.openems.edge.energy.api.EnergyConstants.SUM_UNMANAGED_CONSUMPTION;
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/InitialPopulationTest.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/InitialPopulationTest.java
index 0975bb54738..015b0fd48c2 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/InitialPopulationTest.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/InitialPopulationTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.energy.optimizer;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.energy.optimizer.EshCodec.schedulesToStringArray;
 import static io.openems.edge.energy.optimizer.InitialPopulation.variationsFromExistingSimulationResult;
 import static io.openems.edge.energy.optimizer.InitialPopulation.variationsOfAllStatesDefault;
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/OptimizerTest.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/OptimizerTest.java
index 0a4843d3bfb..2486c8f3a36 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/OptimizerTest.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/OptimizerTest.java
@@ -1,8 +1,8 @@
 package io.openems.edge.energy.optimizer;
 
 import static io.jenetics.engine.Limits.byFixedGeneration;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.common.utils.ReflectionUtils.getValueViaReflection;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.energy.EnergySchedulerImplTest.getOptimizer;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/UtilsTest.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/UtilsTest.java
index 91706a287ee..c4a45a1c673 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/UtilsTest.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/UtilsTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.energy.optimizer;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.energy.optimizer.Utils.calculateExecutionLimitSeconds;
 import static io.openems.edge.energy.optimizer.Utils.calculateSleepMillis;
 import static io.openems.edge.energy.optimizer.Utils.sortByScheduler;
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java
index 1d985f6e1ac..f5aa613bfac 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/optimizer/app/RunOptimizerFromLogApp.java
@@ -1,7 +1,7 @@
 package io.openems.edge.energy.optimizer.app;
 
 import static io.jenetics.engine.Limits.byExecutionTime;
-import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
+import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static io.openems.edge.energy.optimizer.SimulationResult.EMPTY;
 import static io.openems.edge.energy.optimizer.app.AppUtils.parseGlobalSimulationsContextFromLogString;
 import static java.time.DayOfWeek.FRIDAY;
@@ -16,6 +16,7 @@
 
 import com.google.common.collect.ImmutableList;
 
+import io.openems.common.jscalendar.JSCalendar;
 import io.openems.edge.controller.ess.emergencycapacityreserve.ControllerEssEmergencyCapacityReserveImpl;
 import io.openems.edge.controller.ess.fixactivepower.ControllerEssFixActivePowerImpl;
 import io.openems.edge.controller.ess.gridoptimizedcharge.ControllerEssGridOptimizedChargeImpl;
@@ -23,7 +24,6 @@
 import io.openems.edge.controller.ess.limittotaldischarge.ControllerEssLimitTotalDischargeImpl;
 import io.openems.edge.controller.ess.timeofusetariff.ControlMode;
 import io.openems.edge.controller.ess.timeofusetariff.TimeOfUseTariffControllerImpl;
-import io.openems.edge.controller.evcs.JSCalendar;
 import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
 import io.openems.edge.energy.api.EnergyScheduleHandler;
 import io.openems.edge.energy.api.EnergyUtils;
diff --git a/io.openems.edge.energy/test/io/openems/edge/energy/v1/optimizer/EnergyFlowV1Test.java b/io.openems.edge.energy/test/io/openems/edge/energy/v1/optimizer/EnergyFlowV1Test.java
index e9749f1848d..b0de70323b6 100644
--- a/io.openems.edge.energy/test/io/openems/edge/energy/v1/optimizer/EnergyFlowV1Test.java
+++ b/io.openems.edge.energy/test/io/openems/edge/energy/v1/optimizer/EnergyFlowV1Test.java
@@ -58,8 +58,8 @@ public void prepareParams() {
 		// essChargeInChargeGrid = 2375
 	}
 
-	private static EnergyFlowV1 execute(TriFunction<ParamsV1, OptimizePeriod, Integer, EnergyFlowV1> function, int essInitial,
-			ParamsV1.Builder pb) {
+	private static EnergyFlowV1 execute(TriFunction<ParamsV1, OptimizePeriod, Integer, EnergyFlowV1> function,
+			int essInitial, ParamsV1.Builder pb) {
 		var p = pb.build();
 		return function.apply(p, p.optimizePeriods().get(0), essInitial);
 	}
diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java
index 9766ada10cf..2e9a0b3446b 100644
--- a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java
+++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java
@@ -8,7 +8,6 @@ public class NearEqualSolverTest {
 
 	@Test
 	public void solverTest() {
-		
 		double[] essUpperLimit = { 10000, 10000, 10000, 1900 };
 		double[] essLowerLimit = { 0, 0, 0, 1800 };
 		double setValue = 50000;
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
index 4e9b7cee5ed..3902b41ced3 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
@@ -704,7 +704,8 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 				.build();
 	}
 
-	/** Defines if the evcs is read only.
+	/**
+	 * Defines if the evcs is read only.
 	 * 
 	 * @return true if the evcs is read-only
 	 */
diff --git a/io.openems.edge.evcs.api/test/io/openems/edge/evcs/api/AbstractManagedEvcsTest.java b/io.openems.edge.evcs.api/test/io/openems/edge/evcs/api/AbstractManagedEvcsTest.java
index c8d060cae6f..573ef70cd38 100644
--- a/io.openems.edge.evcs.api/test/io/openems/edge/evcs/api/AbstractManagedEvcsTest.java
+++ b/io.openems.edge.evcs.api/test/io/openems/edge/evcs/api/AbstractManagedEvcsTest.java
@@ -62,8 +62,7 @@ public void abstractManagedEvcsTest() throws Exception {
 		// validator checks the write value
 		// (.output(ManagedEvcs.ChannelId.SET_CHARGE_POWER_LIMIT, 15000))
 		assertEquals("Check next value of setChargePowerLimit", 15000, //
-				(EVCS0.<IntegerReadChannel>channel(SET_CHARGE_POWER_LIMIT)).getNextValue()
-						.orElse(0).intValue());
+				(EVCS0.<IntegerReadChannel>channel(SET_CHARGE_POWER_LIMIT)).getNextValue().orElse(0).intValue());
 
 		test //
 				.next(new TestCase("Check ChargeState after 'getMinimumTimeTillCharingLimitTaken'") //
@@ -195,8 +194,7 @@ public void abstractManagedEvcsWithFilterTest() throws Exception {
 		// (.output(ManagedEvcs.ChannelId.SET_CHARGE_POWER_LIMIT,
 		// initialResult))
 		assertEquals("Check next value of setChargePowerLimit", initialResult, //
-				(EVCS2.<IntegerReadChannel>channel(SET_CHARGE_POWER_LIMIT)).getNextValue()
-						.orElse(0).intValue());
+				(EVCS2.<IntegerReadChannel>channel(SET_CHARGE_POWER_LIMIT)).getNextValue().orElse(0).intValue());
 
 		int increasingValue = (int) (MAXIMUM * EVCS2.getEvcsPower().getIncreaseRate());
 		test //
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java
index 97f8a70c07c..2de80ca9f6b 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java
@@ -159,7 +159,7 @@ private ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode accessMode)
 				.channel(75, EvcsKebaKeContact.ChannelId.TIMEOUT_CT, ModbusType.UINT16) //
 				.uint16Reserved(76) //
 				.channel(77, EvcsKebaKeContact.ChannelId.OUTPUT, ModbusType.UINT16)
-				.channel(78, EvcsKebaKeContact.ChannelId.INPUT, ModbusType.UINT16)
+				.channel(78, EvcsKebaKeContact.ChannelId.INPUT, ModbusType.UINT16) //
 				.build();
 	}
 }
diff --git a/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadWorkerTest.java b/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadWorkerTest.java
index 713c77047dc..9d39b3073a4 100644
--- a/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadWorkerTest.java
+++ b/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadWorkerTest.java
@@ -59,7 +59,7 @@ public void testReportsFarInFuture() {
 		int result = ReadWorker.getCycleTimeLogic(lastReport1, lastReport2, lastReport3, this.now);
 		assertEquals(0, result);
 	}
-	
+
 	@Test
 	public void testEdgeCaseReportNearNow() {
 		LocalDateTime lastReport1 = this.now.minusSeconds(Report.REPORT1.getRequestSeconds() - 1);
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java
index cf148a50f69..1dea994db32 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java
@@ -1320,7 +1320,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 		 * individually.
 		 */
 		DRED_REMOTE_SHUTDOWN_RCR_FUNCTIONS_ENABLE(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), // 
+				.accessMode(AccessMode.READ_WRITE)), //
 
 		DEBUG_EMS_POWER_MODE(Doc.of(EmsPowerMode.values())), //
 		DEBUG_EMS_POWER_SET(Doc.of(OpenemsType.INTEGER)), //
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java
index 2681a485c74..4ac3f5fa050 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.goodwe.batteryinverter;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.battery.api.Battery.ChannelId.CHARGE_MAX_CURRENT;
 import static io.openems.edge.batteryinverter.api.SymmetricBatteryInverter.ChannelId.ACTIVE_POWER;
 import static io.openems.edge.batteryinverter.api.SymmetricBatteryInverter.ChannelId.MAX_APPARENT_POWER;
@@ -51,7 +52,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TestUtils;
 import io.openems.edge.ess.api.SymmetricEss;
 import io.openems.edge.ess.test.DummyPower;
 import io.openems.edge.goodwe.charger.singlestring.GoodWeChargerPv1;
@@ -750,7 +750,7 @@ public void testReadFromModbus() throws Exception {
 		new ComponentTest(sut) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager",
-						new DummyComponentManager(TestUtils.createDummyClock()))
+						new DummyComponentManager(createDummyClock()))
 				.addReference("setModbus", new DummyModbusBridge("modbus2") //
 						.withRegisters(35011, // Deprecated GoodWe type register
 								new int[] { 0x4757, 0x3135, 0x4b2d, 0x4554, 0x3230 })
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/Config.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/Config.java
index 333aa093ac8..8dd6be7fcbd 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/Config.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/Config.java
@@ -19,7 +19,7 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "Phase", description = "Which Phase is this Shelly Plug connected to?")
 	SinglePhase phase() default SinglePhase.L1;
 
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/Config.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/Config.java
index 92064d4d596..a8a268c2551 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/Config.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/Config.java
@@ -19,6 +19,6 @@
 
 	@AttributeDefinition(name = "IP-Address", description = "The IP address of the Shelly device.")
 	String ip();
-	
-	String webconsole_configurationFactory_nameHint() default "IO Shelly Pro 3 [{id}]"; 
+
+	String webconsole_configurationFactory_nameHint() default "IO Shelly Pro 3 [{id}]";
 }
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/Config.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/Config.java
index 57dfdf4412d..0f8469ad98f 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/Config.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/Config.java
@@ -5,26 +5,25 @@
 
 import io.openems.common.types.MeterType;
 
-@ObjectClassDefinition(
-		name = "IO Shelly Pro 3EM", //
+@ObjectClassDefinition(name = "IO Shelly Pro 3EM", //
 		description = "Implements the Shelly Pro 3EM Energy Meter.")
 @interface Config {
 
 	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
-	String id() default "meter0"; 
+	String id() default "meter0";
 
 	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
-	String alias() default ""; 
+	String alias() default "";
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
-	boolean enabled() default true; 
+	boolean enabled() default true;
 
-	@AttributeDefinition(name = "Meter-Type", description = "Grid, Production (=default), Consumption") 
-	MeterType type() default MeterType.GRID; 
+	@AttributeDefinition(name = "Meter-Type", description = "Grid, Production (=default), Consumption")
+	MeterType type() default MeterType.GRID;
 
 	@AttributeDefinition(name = "IP-Address", description = "The IP address of the Shelly device.")
 	String ip();
 
-	String webconsole_configurationFactory_nameHint() default "IO Shelly Pro 3EM [{id}]"; 
+	String webconsole_configurationFactory_nameHint() default "IO Shelly Pro 3EM [{id}]";
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300ImplTest.java b/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300ImplTest.java
index a802bbe67c0..4cdb50a76d2 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300ImplTest.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300ImplTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.meter.carlo.gavazzi.em300;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.common.types.MeterType.GRID;
 
 import org.junit.Test;
@@ -9,7 +10,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TestUtils;
 import io.openems.edge.meter.api.ElectricityMeter;
 
 public class MeterCarloGavazziEm300ImplTest {
@@ -34,7 +34,7 @@ public void testReadFromModbus() throws Exception {
 		var sut = new MeterCarloGavazziEm300Impl();
 		new ComponentTest(sut) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
-				.addComponent(new DummyComponentManager(TestUtils.createDummyClock()))
+				.addComponent(new DummyComponentManager(createDummyClock()))
 				.addReference("setModbus", new DummyModbusBridge("modbus2") //
 						.withInputRegisters(300001 - this.offset, //
 								new int[] { 0x08c3, 0x0000, //
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java b/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java
index c3cdb032436..c3f7691f7e9 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java
@@ -31,7 +31,7 @@ public Builder setType(MeterType type) {
 			this.type = type;
 			return this;
 		}
-		
+
 		public Builder setModbusUnitId(int unitId) {
 			this.modbusUnitId = unitId;
 			return this;
diff --git a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorManagerTest.java b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorManagerTest.java
index 8dc48474b55..7dfd0039849 100644
--- a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorManagerTest.java
+++ b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorManagerTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.predictor.api.test;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.predictor.api.prediction.Prediction.EMPTY_PREDICTION;
 import static org.junit.Assert.assertEquals;
 
diff --git a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorTest.java b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorTest.java
index f7593b5359c..c7f317dd22b 100644
--- a/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorTest.java
+++ b/io.openems.edge.predictor.api/test/io/openems/edge/predictor/api/test/DummyPredictorTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.predictor.api.test;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.predictor.api.test.DummyPredictorManagerTest.SUM_PRODUCTION_ACTIVE_POWER;
 import static java.time.temporal.ChronoUnit.MINUTES;
 import static org.junit.Assert.assertEquals;
diff --git a/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PredictorPersistenceModelImplTest.java b/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PredictorPersistenceModelImplTest.java
index 665664e9f7d..0090e9e4a33 100644
--- a/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PredictorPersistenceModelImplTest.java
+++ b/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PredictorPersistenceModelImplTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.predictor.persistencemodel;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.predictor.api.prediction.LogVerbosity.NONE;
 import static io.openems.edge.predictor.api.prediction.Prediction.EMPTY_PREDICTION;
 import static java.time.temporal.ChronoUnit.HOURS;
diff --git a/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/SchedulerDailyImplTest.java b/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/SchedulerDailyImplTest.java
index f992c074e95..54bbbfef1a2 100644
--- a/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/SchedulerDailyImplTest.java
+++ b/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/SchedulerDailyImplTest.java
@@ -1,8 +1,8 @@
 package io.openems.edge.scheduler.daily;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.common.utils.JsonUtils.buildJsonArray;
 import static io.openems.common.utils.JsonUtils.buildJsonObject;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static java.time.temporal.ChronoUnit.HOURS;
 import static org.junit.Assert.assertEquals;
 
diff --git a/io.openems.edge.timeofusetariff.api/test/io/openems/edge/timeofusetariff/api/utils/ExchangeRateApiTest.java b/io.openems.edge.timeofusetariff.api/test/io/openems/edge/timeofusetariff/api/utils/ExchangeRateApiTest.java
index 7d0ee419286..8c167f54485 100644
--- a/io.openems.edge.timeofusetariff.api/test/io/openems/edge/timeofusetariff/api/utils/ExchangeRateApiTest.java
+++ b/io.openems.edge.timeofusetariff.api/test/io/openems/edge/timeofusetariff/api/utils/ExchangeRateApiTest.java
@@ -62,7 +62,8 @@ public class ExchangeRateApiTest {
 	// Remove '@Ignore' tag to test this API call.
 	@Ignore
 	@Test
-	public void testGetExchangeRate() throws IOException, OpenemsNamedException, ParserConfigurationException, SAXException {
+	public void testGetExchangeRate()
+			throws IOException, OpenemsNamedException, ParserConfigurationException, SAXException {
 		var rate = getExchangeRate("EUR", Currency.SEK);
 		System.out.println(rate);
 	}
diff --git a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java
index c7268b00ed5..d570f9ee9f9 100644
--- a/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java
+++ b/io.openems.edge.timeofusetariff.entsoe/test/io/openems/edge/timeofusetariff/entsoe/ParserTest.java
@@ -1,5 +1,6 @@
 package io.openems.edge.timeofusetariff.entsoe;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.timeofusetariff.entsoe.Utils.getDuration;
 import static io.openems.edge.timeofusetariff.entsoe.Utils.parseCurrency;
 import static io.openems.edge.timeofusetariff.entsoe.Utils.parsePrices;
@@ -13,7 +14,6 @@
 import com.google.common.collect.ImmutableTable;
 
 import io.openems.edge.common.currency.Currency;
-import io.openems.edge.common.test.TestUtils;
 
 public class ParserTest {
 
@@ -838,7 +838,7 @@ public void testParseCurrency() throws Exception {
 
 	@Test
 	public void testPreferredResolutionExists() {
-		var clock = TestUtils.createDummyClock();
+		final var clock = createDummyClock();
 		// Create sample data
 		var table = ImmutableTable.<Duration, ZonedDateTime, Double>builder()
 				.put(Duration.ofMinutes(15), ZonedDateTime.now(clock), 100.0)
diff --git a/io.openems.edge.timeofusetariff.groupe/test/io/openems/edge/timeofusetariff/groupe/TimeOfUseTariffGroupeImplTest.java b/io.openems.edge.timeofusetariff.groupe/test/io/openems/edge/timeofusetariff/groupe/TimeOfUseTariffGroupeImplTest.java
index ebd8707bfb8..e0e116e20df 100644
--- a/io.openems.edge.timeofusetariff.groupe/test/io/openems/edge/timeofusetariff/groupe/TimeOfUseTariffGroupeImplTest.java
+++ b/io.openems.edge.timeofusetariff.groupe/test/io/openems/edge/timeofusetariff/groupe/TimeOfUseTariffGroupeImplTest.java
@@ -1,7 +1,7 @@
 package io.openems.edge.timeofusetariff.groupe;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.common.currency.Currency.CHF;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.timeofusetariff.groupe.TimeOfUseTariffGroupeImpl.parsePrices;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/Config.java b/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/Config.java
index 1875b929bd1..79612fa199e 100644
--- a/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/Config.java
+++ b/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/Config.java
@@ -16,7 +16,7 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "Tariff Type", description = "Tariff type that the customer has subscribed to")
 	TariffType tariffType() default TariffType.STROM_FLEX;
 
diff --git a/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/TariffType.java b/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/TariffType.java
index 77a9e13618a..92ca11309ba 100644
--- a/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/TariffType.java
+++ b/io.openems.edge.timeofusetariff.hassfurt/src/io/openems/edge/timeofusetariff/hassfurt/TariffType.java
@@ -5,7 +5,7 @@ public enum TariffType {
 	 * haStrom Flex.
 	 */
 	STROM_FLEX, //
-	
+
 	/**
 	 * haStrom Flex Pro.
 	 */
diff --git a/io.openems.edge.timeofusetariff.hassfurt/test/io/openems/edge/timeofusetariff/hassfurt/TimeOfUseTariffHassfurtImplTest.java b/io.openems.edge.timeofusetariff.hassfurt/test/io/openems/edge/timeofusetariff/hassfurt/TimeOfUseTariffHassfurtImplTest.java
index 041b9e6ae0e..52797a738b5 100644
--- a/io.openems.edge.timeofusetariff.hassfurt/test/io/openems/edge/timeofusetariff/hassfurt/TimeOfUseTariffHassfurtImplTest.java
+++ b/io.openems.edge.timeofusetariff.hassfurt/test/io/openems/edge/timeofusetariff/hassfurt/TimeOfUseTariffHassfurtImplTest.java
@@ -1,6 +1,6 @@
 package io.openems.edge.timeofusetariff.hassfurt;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.timeofusetariff.hassfurt.TimeOfUseTariffHassfurtImpl.parsePrices;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java b/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java
index adc60697492..df7f605f959 100644
--- a/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java
+++ b/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java
@@ -1,6 +1,13 @@
 package io.openems.edge.timeofusetariff.rabotcharge;
 
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
+import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.cycleSubscriber;
+import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.dummyBridgeHttpExecutor;
+import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.dummyEndpointFetcher;
+import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.ofBridgeImpl;
+import static io.openems.edge.timeofusetariff.rabotcharge.TimeOfUseTariffRabotChargeImpl.RABOT_CHARGE_API_URL;
+import static io.openems.edge.timeofusetariff.rabotcharge.TimeOfUseTariffRabotChargeImpl.RABOT_CHARGE_PRIZE_COMPONENT_URL;
+import static io.openems.edge.timeofusetariff.rabotcharge.TimeOfUseTariffRabotChargeImpl.RABOT_CHARGE_TOKEN_URL;
 import static io.openems.edge.timeofusetariff.rabotcharge.TimeOfUseTariffRabotChargeImpl.parsePrices;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -15,7 +22,6 @@
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.bridge.http.api.HttpError;
 import io.openems.edge.bridge.http.api.HttpResponse;
-import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
@@ -95,21 +101,20 @@ public class TimeOfUseTariffRabotChargeImplTest {
 	public void test() throws Exception {
 		final var clock = createDummyClock();
 
-		final var endpointFetcher = DummyBridgeHttpFactory.dummyEndpointFetcher();
+		final var endpointFetcher = dummyEndpointFetcher();
 		endpointFetcher.addEndpointHandler(endpoint -> {
 
-			if (endpoint.url().equals(TimeOfUseTariffRabotChargeImpl.RABOT_CHARGE_TOKEN_URL.toEncodedString())) {
+			if (endpoint.url().equals(RABOT_CHARGE_TOKEN_URL.toEncodedString())) {
 				return HttpResponse.ok(JsonUtils.buildJsonObject() //
 						.addProperty("access_token", "FJAWognawn") //
 						.build().toString());
 			}
 
-			if (endpoint.url().equals(TimeOfUseTariffRabotChargeImpl.RABOT_CHARGE_API_URL.toEncodedString())) {
+			if (endpoint.url().equals(RABOT_CHARGE_API_URL.toEncodedString())) {
 				return HttpResponse.ok(DUMMY_PRICES);
 			}
 
-			if (endpoint.url()
-					.startsWith(TimeOfUseTariffRabotChargeImpl.RABOT_CHARGE_PRIZE_COMPONENT_URL.toEncodedString())) {
+			if (endpoint.url().startsWith(RABOT_CHARGE_PRIZE_COMPONENT_URL.toEncodedString())) {
 				return HttpResponse.ok(JsonUtils.buildJsonObject() //
 						.addProperty("taxAndFeeKwHPrice", 3.44) //
 						.addProperty("gridFeeKwHPrice", 7.89) //
@@ -120,10 +125,10 @@ public void test() throws Exception {
 			throw HttpError.ResponseError.notFound();
 		});
 
-		final var executor = DummyBridgeHttpFactory.dummyBridgeHttpExecutor();
+		final var executor = dummyBridgeHttpExecutor();
 
-		final var factory = DummyBridgeHttpFactory.ofBridgeImpl(//
-				() -> DummyBridgeHttpFactory.cycleSubscriber(), //
+		final var factory = ofBridgeImpl(//
+				() -> cycleSubscriber(), //
 				() -> endpointFetcher, //
 				() -> executor //
 		);
diff --git a/io.openems.edge.timeofusetariff.swisspower/test/io/openems/edge/timeofusetariff/swisspower/TimeOfUseTariffSwisspowerImplTest.java b/io.openems.edge.timeofusetariff.swisspower/test/io/openems/edge/timeofusetariff/swisspower/TimeOfUseTariffSwisspowerImplTest.java
index da9f93d852b..d859b6dd77b 100644
--- a/io.openems.edge.timeofusetariff.swisspower/test/io/openems/edge/timeofusetariff/swisspower/TimeOfUseTariffSwisspowerImplTest.java
+++ b/io.openems.edge.timeofusetariff.swisspower/test/io/openems/edge/timeofusetariff/swisspower/TimeOfUseTariffSwisspowerImplTest.java
@@ -1,7 +1,8 @@
 package io.openems.edge.timeofusetariff.swisspower;
 
+import static io.openems.common.test.TestUtils.createDummyClock;
+import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.ofDummyBridge;
 import static io.openems.edge.common.currency.Currency.EUR;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
 import static io.openems.edge.timeofusetariff.swisspower.TimeOfUseTariffSwisspowerImpl.parsePrices;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -9,7 +10,6 @@
 import org.junit.Test;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyMeta;
@@ -200,7 +200,7 @@ public void test() throws Exception {
 		var dummyMeta = new DummyMeta("foo0") //
 				.withCurrency(EUR);
 		new ComponentTest(swissPower) //
-				.addReference("httpBridgeFactory", DummyBridgeHttpFactory.ofDummyBridge()) //
+				.addReference("httpBridgeFactory", ofDummyBridge()) //
 				.addReference("meta", dummyMeta) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.activate(MyConfig.create() //

From c6ca760ffa878c29ffbeba9d5d6390ebce283753 Mon Sep 17 00:00:00 2001
From: DerWahreKlinki <102486171+DerWahreKlinki@users.noreply.github.com>
Date: Thu, 2 Jan 2025 23:49:31 +0100
Subject: [PATCH 31/49] Implement Siemens LOGO! as network relay board (#2350)

---
 io.openems.edge.application/EdgeApp.bndrun    |   2 +
 io.openems.edge.io.siemenslogo/.classpath     |  12 +
 io.openems.edge.io.siemenslogo/.gitignore     |   2 +
 io.openems.edge.io.siemenslogo/.project       |  23 ++
 .../org.eclipse.core.resources.prefs          |   2 +
 io.openems.edge.io.siemenslogo/bnd.bnd        |  19 ++
 io.openems.edge.io.siemenslogo/readme.adoc    |   7 +
 .../openems/edge/io/siemenslogo/Config.java   |  36 +++
 .../edge/io/siemenslogo/SiemensLogoRelay.java | 275 ++++++++++++++++++
 .../io/siemenslogo/SiemensLogoRelayImpl.java  | 184 ++++++++++++
 .../test/.gitignore                           |   0
 .../openems/edge/io/siemenslogo/MyConfig.java | 117 ++++++++
 .../siemenslogo/SiemensLogoRelayImplTest.java |  36 +++
 13 files changed, 715 insertions(+)
 create mode 100644 io.openems.edge.io.siemenslogo/.classpath
 create mode 100644 io.openems.edge.io.siemenslogo/.gitignore
 create mode 100644 io.openems.edge.io.siemenslogo/.project
 create mode 100644 io.openems.edge.io.siemenslogo/.settings/org.eclipse.core.resources.prefs
 create mode 100644 io.openems.edge.io.siemenslogo/bnd.bnd
 create mode 100644 io.openems.edge.io.siemenslogo/readme.adoc
 create mode 100644 io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/Config.java
 create mode 100644 io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelay.java
 create mode 100644 io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelayImpl.java
 create mode 100644 io.openems.edge.io.siemenslogo/test/.gitignore
 create mode 100644 io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/MyConfig.java
 create mode 100644 io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/SiemensLogoRelayImplTest.java

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 5ac61e56d48..c1afa91dad3 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -142,6 +142,7 @@
 	bnd.identity;id='io.openems.edge.io.offgridswitch',\
 	bnd.identity;id='io.openems.edge.io.revpi',\
 	bnd.identity;id='io.openems.edge.io.shelly',\
+	bnd.identity;id='io.openems.edge.io.siemenslogo',\
 	bnd.identity;id='io.openems.edge.io.wago',\
 	bnd.identity;id='io.openems.edge.io.weidmueller',\
 	bnd.identity;id='io.openems.edge.kaco.blueplanet.hybrid10',\
@@ -321,6 +322,7 @@
 	io.openems.edge.io.offgridswitch;version=snapshot,\
 	io.openems.edge.io.revpi;version=snapshot,\
 	io.openems.edge.io.shelly;version=snapshot,\
+	io.openems.edge.io.siemenslogo;version=snapshot,\
 	io.openems.edge.io.wago;version=snapshot,\
 	io.openems.edge.io.weidmueller;version=snapshot,\
 	io.openems.edge.kaco.blueplanet.hybrid10;version=snapshot,\
diff --git a/io.openems.edge.io.siemenslogo/.classpath b/io.openems.edge.io.siemenslogo/.classpath
new file mode 100644
index 00000000000..b4cffd0fe60
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/io.openems.edge.io.siemenslogo/.gitignore b/io.openems.edge.io.siemenslogo/.gitignore
new file mode 100644
index 00000000000..c2b941a96de
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/.gitignore
@@ -0,0 +1,2 @@
+/bin_test/
+/generated/
diff --git a/io.openems.edge.io.siemenslogo/.project b/io.openems.edge.io.siemenslogo/.project
new file mode 100644
index 00000000000..075d5c883e7
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openems.edge.io.siemenslogo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>
diff --git a/io.openems.edge.io.siemenslogo/.settings/org.eclipse.core.resources.prefs b/io.openems.edge.io.siemenslogo/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/io.openems.edge.io.siemenslogo/bnd.bnd b/io.openems.edge.io.siemenslogo/bnd.bnd
new file mode 100644
index 00000000000..9b8a05149c3
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/bnd.bnd
@@ -0,0 +1,19 @@
+Bundle-Name: OpenEMS Edge IO Siemens LOGO!
+Bundle-Description: Siemens LOGO! 8 as network relais. Connected via Modbus. Relays starting \
+	at VM 101, Bit 0 on SPS.
+Bundle-Vendor: OpenEMS Association e.V.
+Bundle-License: https://opensource.org/licenses/EPL-2.0
+Bundle-Version: 1.0.0.${tstamp}
+
+-buildpath: \
+	${buildpath},\
+	com.ghgande.j2mod,\
+	io.openems.common,\
+	io.openems.edge.bridge.modbus,\
+	io.openems.edge.common,\
+	io.openems.edge.io.api,\
+	slf4j.api,\
+
+-testpath: \
+	${testpath}	
+	
\ No newline at end of file
diff --git a/io.openems.edge.io.siemenslogo/readme.adoc b/io.openems.edge.io.siemenslogo/readme.adoc
new file mode 100644
index 00000000000..c2ae5678a51
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/readme.adoc
@@ -0,0 +1,7 @@
+= Siemens LOGO!
+
+First you have to configure a modbus server in LogoSoft which either accepts all connection sources or you limit this to your EMS-system. Like all other modbus devices you have to configure a modbus-ID (255 is default in LogoSoft!) and a start address, e.g. 100 or use the default address 0.
+
+If you don´t do any changes the addresses are configured as coils. In Logo! a virtual address (V) is written 0.0 which is the virtual address 0, Bit 0. For the connected device the coil-addresses start with 800 (first bit/coil), 801 is the second coil and so on
+
+https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.io.siemenslogo[Source Code icon:github[]]
\ No newline at end of file
diff --git a/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/Config.java b/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/Config.java
new file mode 100644
index 00000000000..5acb3061327
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/Config.java
@@ -0,0 +1,36 @@
+package io.openems.edge.io.siemenslogo;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition(//
+		name = "Siemens LOGO!", //
+		description = "Siemens LOGO! 8 digital Input/Output")
+@interface Config {
+
+	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+	String id() default "io0";
+
+	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+	String alias() default "";
+
+	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+	boolean enabled() default true;
+
+	@AttributeDefinition(name = "Modbus-ID", description = "ID of Modbus bridge.")
+	String modbus_id() default "modbus0";
+
+	@AttributeDefinition(name = "Modbus write address offset", description = "Address offset in LOGO! for writing outputs / relays. This is where the virtual addresses start, e.g. 808 for virtual address 101.0 in Logo!")
+	int modbusOffsetWriteAddress() default 800;
+
+	@AttributeDefinition(name = "Modbus read address offset", description = "Address offset in LOGO! for reading inputs (DI1-4). This is where the virtual addresses start, e.g. 808 for virtual address 110.0 in Logo!")
+	int modbusOffsetReadAddress() default 880;
+
+	@AttributeDefinition(name = "Modbus Unit-ID", description = "The Unit-ID of the Modbus device.")
+	int modbusUnitId() default 1;
+
+	@AttributeDefinition(name = "Modbus target filter", description = "This is auto-generated by 'Modbus-ID'.")
+	String Modbus_target() default "(enabled=true)";
+
+	String webconsole_configurationFactory_nameHint() default "Siemens LOGO! [{id}]";
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelay.java b/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelay.java
new file mode 100644
index 00000000000..a4653889ba5
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelay.java
@@ -0,0 +1,275 @@
+package io.openems.edge.io.siemenslogo;
+
+import static io.openems.common.channel.AccessMode.READ_ONLY;
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static io.openems.common.channel.PersistencePriority.HIGH;
+import static io.openems.common.channel.PersistencePriority.MEDIUM;
+import static io.openems.common.types.OpenemsType.BOOLEAN;
+
+import io.openems.edge.common.channel.BooleanDoc;
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.modbusslave.ModbusSlave;
+import io.openems.edge.io.api.DigitalOutput;
+
+public interface SiemensLogoRelay extends DigitalOutput, OpenemsComponent, ModbusSlave {
+
+	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+		/**
+		 * Input 1.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayInput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		INPUT_1(new BooleanDoc() //
+				.accessMode(READ_ONLY) //
+				.persistencePriority(HIGH)),
+		/**
+		 * Input 2.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayInput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		INPUT_2(new BooleanDoc() //
+				.accessMode(READ_ONLY) //
+				.persistencePriority(HIGH)),
+		/**
+		 * Input 3.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayInput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		INPUT_3(new BooleanDoc() //
+				.accessMode(READ_ONLY) //
+				.persistencePriority(HIGH)),
+		/**
+		 * Input 4.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayInput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		INPUT_4(new BooleanDoc() //
+				.accessMode(READ_ONLY) //
+				.persistencePriority(HIGH)),
+		/**
+		 * Holds writes to Relay Output 1 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_1(Doc.of(BOOLEAN)), //
+		/**
+		 * Relay 1.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_1(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_1)),
+		/**
+		 * Holds writes to Relay Output 2 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_2(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 2.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_2(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_2)),
+
+		/**
+		 * Holds writes to Relay Output 3 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_3(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 3.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_3(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_3)),
+
+		/**
+		 * Holds writes to Relay Output 4 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_4(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 4.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_4(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_4)),
+
+		/**
+		 * Holds writes to Relay Output 5 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_5(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 5.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_5(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_5)),
+
+		/**
+		 * Holds writes to Relay Output 6 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_6(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 6.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_6(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_6)),
+
+		/**
+		 * Holds writes to Relay Output 7 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_7(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 7.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_7(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_7)),
+
+		/**
+		 * Holds writes to Relay Output 8 for debugging.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		DEBUG_RELAY_8(Doc.of(BOOLEAN) //
+				.persistencePriority(MEDIUM)), //
+		/**
+		 * Relay 8.
+		 * 
+		 * <ul>
+		 * <li>Interface: SiemensLogoRelayOutput
+		 * <li>Type: Boolean
+		 * <li>Range: On/Off
+		 * </ul>
+		 */
+		RELAY_8(new BooleanDoc() //
+				.accessMode(READ_WRITE) //
+				.persistencePriority(MEDIUM) //
+				.onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_8));
+
+		private final Doc doc;
+
+		private ChannelId(Doc doc) {
+			this.doc = doc;
+		}
+
+		@Override
+		public Doc doc() {
+			return this.doc;
+		}
+	}
+}
diff --git a/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelayImpl.java b/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelayImpl.java
new file mode 100644
index 00000000000..e7308dbdfb3
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/src/io/openems/edge/io/siemenslogo/SiemensLogoRelayImpl.java
@@ -0,0 +1,184 @@
+package io.openems.edge.io.siemenslogo;
+
+import static io.openems.common.channel.AccessMode.READ_ONLY;
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.edge.bridge.modbus.api.AbstractOpenemsModbusComponent;
+import io.openems.edge.bridge.modbus.api.BridgeModbus;
+import io.openems.edge.bridge.modbus.api.ModbusComponent;
+import io.openems.edge.bridge.modbus.api.ModbusProtocol;
+import io.openems.edge.bridge.modbus.api.element.CoilElement;
+import io.openems.edge.bridge.modbus.api.task.FC1ReadCoilsTask;
+import io.openems.edge.bridge.modbus.api.task.FC5WriteCoilTask;
+import io.openems.edge.common.channel.BooleanReadChannel;
+import io.openems.edge.common.channel.BooleanWriteChannel;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.modbusslave.ModbusSlave;
+import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
+import io.openems.edge.common.modbusslave.ModbusSlaveTable;
+import io.openems.edge.common.modbusslave.ModbusType;
+import io.openems.edge.common.taskmanager.Priority;
+import io.openems.edge.io.api.DigitalInput;
+import io.openems.edge.io.api.DigitalOutput;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+		name = "IO.Siemens.LOGO", //
+		immediate = true, //
+		configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class SiemensLogoRelayImpl extends AbstractOpenemsModbusComponent
+		implements SiemensLogoRelay, DigitalOutput, DigitalInput, ModbusComponent, OpenemsComponent, ModbusSlave {
+
+	private final BooleanWriteChannel[] digitalOutputChannels;
+	private final BooleanReadChannel[] digitalInputChannels;
+
+	private int writeOffset = 0;
+	private int readOffset = 0;
+
+	@Reference
+	private ConfigurationAdmin cm;
+
+	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
+	protected void setModbus(BridgeModbus modbus) {
+		super.setModbus(modbus);
+	}
+
+	public SiemensLogoRelayImpl() {
+		super(//
+				OpenemsComponent.ChannelId.values(), //
+				ModbusComponent.ChannelId.values(), //
+				DigitalOutput.ChannelId.values(), //
+				DigitalInput.ChannelId.values(), //
+				SiemensLogoRelay.ChannelId.values() //
+		);
+		this.digitalOutputChannels = stream(SiemensLogoRelay.ChannelId.values()) //
+				.filter(channelId -> channelId.doc().getAccessMode() == READ_WRITE) //
+				.map(channelId -> this.channel(channelId)) //
+				.toArray(BooleanWriteChannel[]::new);
+		this.digitalInputChannels = stream(SiemensLogoRelay.ChannelId.values()) //
+				.filter(channelId -> channelId.doc().getAccessMode() == READ_ONLY) //
+				.map(channelId -> this.channel(channelId)) //
+				.toArray(BooleanReadChannel[]::new);
+	}
+
+	@Activate
+	private void activate(ComponentContext context, Config config) throws OpenemsException {
+		this.writeOffset = config.modbusOffsetWriteAddress();
+		this.readOffset = config.modbusOffsetReadAddress();
+		super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm, "Modbus",
+				config.modbus_id());
+	}
+
+	@Deactivate
+	protected void deactivate() {
+		super.deactivate();
+	}
+
+	@Override
+	public BooleanWriteChannel[] digitalOutputChannels() {
+		return this.digitalOutputChannels;
+	}
+
+	@Override
+	public BooleanReadChannel[] digitalInputChannels() {
+		return this.digitalInputChannels;
+	}
+
+	@Override
+	protected ModbusProtocol defineModbusProtocol() {
+		return new ModbusProtocol(this, //
+				// Read Inputs
+				new FC1ReadCoilsTask(this.readOffset, Priority.HIGH, //
+						m(SiemensLogoRelay.ChannelId.INPUT_1, new CoilElement(0 + this.readOffset)), //
+						m(SiemensLogoRelay.ChannelId.INPUT_2, new CoilElement(1 + this.readOffset)), //
+						m(SiemensLogoRelay.ChannelId.INPUT_3, new CoilElement(2 + this.readOffset)), //
+						m(SiemensLogoRelay.ChannelId.INPUT_4, new CoilElement(3 + this.readOffset)) //
+				),
+
+				/*
+				 * For Read: Read Coils
+				 */
+				new FC1ReadCoilsTask(this.writeOffset, Priority.LOW, //
+						m(SiemensLogoRelay.ChannelId.RELAY_1, new CoilElement(0 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_2, new CoilElement(1 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_3, new CoilElement(2 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_4, new CoilElement(3 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_5, new CoilElement(4 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_6, new CoilElement(5 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_7, new CoilElement(6 + this.writeOffset)), //
+						m(SiemensLogoRelay.ChannelId.RELAY_8, new CoilElement(7 + this.writeOffset)) //
+				),
+				/*
+				 * For Write: Write Single Coil
+				 */
+				new FC5WriteCoilTask(0 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_1, new CoilElement(0 + this.writeOffset))), //
+				new FC5WriteCoilTask(1 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_2, new CoilElement(1 + this.writeOffset))), //
+				new FC5WriteCoilTask(2 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_3, new CoilElement(2 + this.writeOffset))), //
+				new FC5WriteCoilTask(3 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_4, new CoilElement(3 + this.writeOffset))), //
+				new FC5WriteCoilTask(4 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_5, new CoilElement(4 + this.writeOffset))), //
+				new FC5WriteCoilTask(5 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_6, new CoilElement(5 + this.writeOffset))), //
+				new FC5WriteCoilTask(6 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_7, new CoilElement(6 + this.writeOffset))), //
+				new FC5WriteCoilTask(7 + this.writeOffset,
+						m(SiemensLogoRelay.ChannelId.RELAY_8, new CoilElement(7 + this.writeOffset))) //
+		);
+	}
+
+	@Override
+	public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
+		return new ModbusSlaveTable(OpenemsComponent.getModbusSlaveNatureTable(accessMode), //
+				ModbusSlaveNatureTable.of(SiemensLogoRelay.class, accessMode, 100)//
+						.channel(0 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_1, ModbusType.UINT16) //
+						.channel(1 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_2, ModbusType.UINT16) //
+						.channel(2 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_3, ModbusType.UINT16) //
+						.channel(3 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_4, ModbusType.UINT16) //
+						.channel(4 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_5, ModbusType.UINT16) //
+						.channel(5 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_6, ModbusType.UINT16) //
+						.channel(6 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_7, ModbusType.UINT16) //
+						.channel(7 + this.writeOffset, SiemensLogoRelay.ChannelId.RELAY_8, ModbusType.UINT16) //
+
+						.channel(8 + this.readOffset, SiemensLogoRelay.ChannelId.INPUT_1, ModbusType.UINT16) //
+						.channel(9 + this.readOffset, SiemensLogoRelay.ChannelId.INPUT_2, ModbusType.UINT16) //
+						.channel(10 + this.readOffset, SiemensLogoRelay.ChannelId.INPUT_3, ModbusType.UINT16) //
+						.channel(11 + this.readOffset, SiemensLogoRelay.ChannelId.INPUT_4, ModbusType.UINT16) //
+
+						.build()//
+		);
+	}
+
+	@Override
+	public String debugLog() {
+		var outputLog = stream(this.digitalOutputChannels) //
+				.map(c -> c.value().asOptional()) //
+				.map(t -> t.isPresent() ? (t.get() ? "X" : "-") : "?") //
+				.collect(joining(""));
+		var inputLog = stream(this.digitalInputChannels) //
+				.map(c -> c.value().asOptional()) //
+				.map(t -> t.isPresent() ? (t.get() ? "I" : "O") : "?") //
+				.collect(joining(""));
+		return "Output:" + outputLog + "|Input:" + inputLog;
+	}
+}
diff --git a/io.openems.edge.io.siemenslogo/test/.gitignore b/io.openems.edge.io.siemenslogo/test/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/MyConfig.java b/io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/MyConfig.java
new file mode 100644
index 00000000000..f80ac31e01e
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/MyConfig.java
@@ -0,0 +1,117 @@
+package io.openems.edge.io.siemenslogo;
+
+import static io.openems.common.utils.ConfigUtils.generateReferenceTargetFilter;
+
+import io.openems.common.test.AbstractComponentConfig;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+	protected static class Builder {
+		private String id;
+		private String alias = ""; // Default to empty string
+		private boolean enabled = true; // Default to true
+		private String modbusId;
+		private int modbusUnitId;
+		private int modbusOffsetWriteAddress;
+		private int modbusOffsetReadAddress;
+
+		private Builder() {
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setAlias(String alias) {
+			this.alias = alias;
+			return this;
+		}
+
+		public Builder setEnabled(boolean enabled) {
+			this.enabled = enabled;
+			return this;
+		}
+
+		public Builder setModbusId(String modbusId) {
+			this.modbusId = modbusId;
+			return this;
+		}
+
+		public Builder setModbusUnitId(int modbusUnitId) {
+			this.modbusUnitId = modbusUnitId;
+			return this;
+		}
+
+		public Builder setModbusOffsetWriteAddress(int modbusOffsetWriteAddress) {
+			this.modbusOffsetWriteAddress = modbusOffsetWriteAddress;
+			return this;
+		}
+
+		public Builder setModbusOffsetReadAddress(int modbusOffsetReadAddress) {
+			this.modbusOffsetReadAddress = modbusOffsetReadAddress;
+			return this;
+		}
+
+		public MyConfig build() {
+			return new MyConfig(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 *
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfig(Builder builder) {
+		super(Config.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public String id() {
+		return this.builder.id;
+	}
+
+	@Override
+	public String alias() {
+		return this.builder.alias;
+	}
+
+	@Override
+	public boolean enabled() {
+		return this.builder.enabled;
+	}
+
+	@Override
+	public String modbus_id() {
+		return this.builder.modbusId;
+	}
+
+	@Override
+	public int modbusUnitId() {
+		return this.builder.modbusUnitId;
+	}
+
+	@Override
+	public int modbusOffsetWriteAddress() {
+		return this.builder.modbusOffsetWriteAddress;
+	}
+
+	@Override
+	public int modbusOffsetReadAddress() {
+		return this.builder.modbusOffsetReadAddress;
+	}
+
+	@Override
+	public String Modbus_target() {
+		return generateReferenceTargetFilter(this.id(), this.modbus_id());
+	}
+}
diff --git a/io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/SiemensLogoRelayImplTest.java b/io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/SiemensLogoRelayImplTest.java
new file mode 100644
index 00000000000..48a51617328
--- /dev/null
+++ b/io.openems.edge.io.siemenslogo/test/io/openems/edge/io/siemenslogo/SiemensLogoRelayImplTest.java
@@ -0,0 +1,36 @@
+package io.openems.edge.io.siemenslogo;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.edge.bridge.modbus.test.DummyModbusBridge;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+
+public class SiemensLogoRelayImplTest {
+
+	@Test
+	public void test() throws Exception {
+		var sut = new SiemensLogoRelayImpl();
+		new ComponentTest(new SiemensLogoRelayImpl()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("setModbus", new DummyModbusBridge("modbus0")) //
+				.activate(MyConfig.create() //
+						.setId("io0") //
+						.setModbusId("modbus0") //
+						.build()) //
+				.next(new TestCase()) //
+				.deactivate();
+		assertEquals("Output:????????|Input:????????????", sut.debugLog());
+
+		var mst = sut.getModbusSlaveTable(AccessMode.READ_WRITE);
+		assertEquals(180, mst.getLength());
+
+		assertEquals(8, sut.digitalOutputChannels().length);
+		assertEquals(12, sut.digitalInputChannels().length);
+	}
+
+}

From 74de3760ad5a4cc17ac1e930705501fdfd7b0a36 Mon Sep 17 00:00:00 2001
From: Hiromasa Ihara <iharahiromasa@gmail.com>
Date: Fri, 3 Jan 2025 22:44:22 +0900
Subject: [PATCH 32/49] UI: dynamic numberformat conversion by using current
 locale (#2757)

---
 ui/src/app/app.module.ts                      |  2 +-
 .../app/edge/history/abstracthistorychart.ts  |  5 ++--
 .../history/storage/singlechart.component.ts  |  4 ++-
 .../history/storage/totalchart.component.ts   |  4 ++-
 .../TimeOfUseTariff/modal/powerSocChart.ts    |  5 ++--
 .../TimeOfUseTariff/modal/statePriceChart.ts  |  7 ++---
 .../live/common/storage/storage.component.ts  |  4 ++-
 .../settings/powerassistant/powerassistant.ts |  4 ++-
 .../components/chart/abstracthistorychart.ts  | 29 ++++++++++---------
 .../components/flat/abstract-flat-widget.ts   |  2 +-
 .../modal/modal-phases/modal-phases.ts        |  5 ++--
 .../components/shared/testing/tester.ts       |  2 +-
 ui/src/app/shared/service/utils.ts            | 24 +++++++++------
 13 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index 58af2d37c2d..fc43a22c12f 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -57,7 +57,7 @@ import { UserModule } from "./user/user.module";
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     CookieService,
     { provide: ErrorHandler, useClass: MyErrorHandler },
-    { provide: LOCALE_ID, useValue: Language.DEFAULT.key },
+    { provide: LOCALE_ID, useFactory: () => (Language.getByKey(localStorage.LANGUAGE) ?? Language.getByBrowserLang(navigator.language)).key },
     // Use factory for formly. This allows us to use translations in validationMessages.
     { provide: FORMLY_CONFIG, multi: true, useFactory: registerTranslateExtension, deps: [TranslateService] },
     DeviceDetectorService,
diff --git a/ui/src/app/edge/history/abstracthistorychart.ts b/ui/src/app/edge/history/abstracthistorychart.ts
index 00e9bf4a256..a9968fcf779 100644
--- a/ui/src/app/edge/history/abstracthistorychart.ts
+++ b/ui/src/app/edge/history/abstracthistorychart.ts
@@ -116,7 +116,6 @@ export abstract class AbstractHistoryChart {
     public setOptions(options: Chart.ChartOptions): Promise<void> {
 
         return new Promise<void>((resolve) => {
-            const locale = this.service.translate.currentLang;
             const yAxis: HistoryUtils.yAxes = { position: "left", unit: this.unit, yAxisId: ChartAxis.LEFT };
             const chartObject: HistoryUtils.ChartData = {
                 input: [],
@@ -153,7 +152,7 @@ export abstract class AbstractHistoryChart {
                     const value = tooltipItem.dataset.data[tooltipItem.dataIndex];
 
                     const customUnit = tooltipItem.dataset.unit ?? null;
-                    return label.split(":")[0] + ": " + NewAbstractHistoryChart.getToolTipsSuffix("", value, formatNumber, customUnit ?? unit, "line", locale, translate, conf);
+                    return label.split(":")[0] + ": " + NewAbstractHistoryChart.getToolTipsSuffix("", value, formatNumber, customUnit ?? unit, "line", translate, conf);
                 };
 
                 options.plugins.tooltip.callbacks.labelColor = (item: Chart.TooltipItem<any>) => {
@@ -247,7 +246,7 @@ export abstract class AbstractHistoryChart {
                     });
 
                 // Only one yAxis defined
-                options = NewAbstractHistoryChart.getYAxisOptions(options, yAxis, this.translate, "line", locale, this.datasets, true);
+                options = NewAbstractHistoryChart.getYAxisOptions(options, yAxis, this.translate, "line", this.datasets, true);
                 options = NewAbstractHistoryChart.applyChartTypeSpecificOptionsChanges("line", options, this.service, chartObject);
                 options.scales[ChartAxis.LEFT]["stacked"] = false;
                 options.scales.x["stacked"] = true;
diff --git a/ui/src/app/edge/history/storage/singlechart.component.ts b/ui/src/app/edge/history/storage/singlechart.component.ts
index 8be7f1ec9ce..573f7145b0e 100644
--- a/ui/src/app/edge/history/storage/singlechart.component.ts
+++ b/ui/src/app/edge/history/storage/singlechart.component.ts
@@ -6,6 +6,7 @@ import { TranslateService } from "@ngx-translate/core";
 import * as Chart from "chart.js";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { ChartAxis, YAxisType } from "src/app/shared/service/utils";
+import { Language } from "src/app/shared/type/language";
 
 import { ObjectUtils } from "src/app/shared/utils/object/object.utils";
 import { ChannelAddress, Edge, EdgeConfig, Service, Utils } from "../../../shared/shared";
@@ -210,6 +211,7 @@ export class StorageSingleChartComponent extends AbstractHistoryChart implements
 
     private applyControllerSpecificChartOptions(options: Chart.ChartOptions) {
         const translate = this.translate;
+        const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
 
         options.scales[ChartAxis.LEFT].min = null;
         options.plugins.tooltip.callbacks.label = function (tooltipItem: Chart.TooltipItem<any>) {
@@ -229,7 +231,7 @@ export class StorageSingleChartComponent extends AbstractHistoryChart implements
                     label = translate.instant("General.DISCHARGE");
                 }
             }
-            return label + ": " + formatNumber(value, "de", "1.0-2") + " kW";
+            return label + ": " + formatNumber(value, locale, "1.0-2") + " kW";
         };
 
         // Data doesnt have all datapoints for period
diff --git a/ui/src/app/edge/history/storage/totalchart.component.ts b/ui/src/app/edge/history/storage/totalchart.component.ts
index 452cae7557b..4be181bc8fa 100644
--- a/ui/src/app/edge/history/storage/totalchart.component.ts
+++ b/ui/src/app/edge/history/storage/totalchart.component.ts
@@ -7,6 +7,7 @@ import * as Chart from "chart.js";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
 import { ChartAxis, Utils, YAxisType } from "src/app/shared/service/utils";
 import { ChannelAddress, Edge, EdgeConfig, Service } from "src/app/shared/shared";
+import { Language } from "src/app/shared/type/language";
 
 import { ObjectUtils } from "src/app/shared/utils/object/object.utils";
 import { AbstractHistoryChart } from "../abstracthistorychart";
@@ -248,6 +249,7 @@ export class StorageTotalChartComponent extends AbstractHistoryChart implements
 
     private applyControllerSpecificChartOptions(options: Chart.ChartOptions) {
         const translate = this.translate;
+        const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
 
         options.scales[ChartAxis.LEFT].min = null;
         options.plugins.tooltip.callbacks.label = function (tooltipItem: Chart.TooltipItem<any>) {
@@ -259,7 +261,7 @@ export class StorageTotalChartComponent extends AbstractHistoryChart implements
             } else if (value > 0.005) {
                 label += " " + translate.instant("General.DISCHARGE");
             }
-            return label + ": " + formatNumber(value, "de", "1.0-2") + " kW";
+            return label + ": " + formatNumber(value, locale, "1.0-2") + " kW";
         };
     }
 }
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
index 1814b01ed84..0d19eab02ba 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts
@@ -206,10 +206,9 @@ export class SchedulePowerAndSocChartComponent extends AbstractHistoryChart impl
     private applyControllerSpecificOptions() {
         const rightYAxis: HistoryUtils.yAxes = { position: "right", unit: YAxisType.PERCENTAGE, yAxisId: ChartAxis.RIGHT };
         const leftYAxis: HistoryUtils.yAxes = { position: "left", unit: YAxisType.POWER, yAxisId: ChartAxis.LEFT };
-        const locale = this.service.translate.currentLang;
 
-        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, rightYAxis, this.translate, "line", locale, ChartConstants.EMPTY_DATASETS, true);
-        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, leftYAxis, this.translate, "line", locale, ChartConstants.EMPTY_DATASETS, true);
+        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, rightYAxis, this.translate, "line", ChartConstants.EMPTY_DATASETS, true);
+        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, leftYAxis, this.translate, "line", ChartConstants.EMPTY_DATASETS, true);
 
         this.datasets = this.datasets.map((el: Chart.ChartDataset) => {
 
diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
index 1b10751ca53..6e348cd5ea8 100644
--- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
+++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts
@@ -114,12 +114,11 @@ export class ScheduleStateAndPriceChartComponent extends AbstractHistoryChart im
     }
 
     private applyControllerSpecificOptions() {
-        const locale = this.service.translate.currentLang;
         const rightYaxisSoc: HistoryUtils.yAxes = { position: "right", unit: YAxisType.PERCENTAGE, yAxisId: ChartAxis.RIGHT, displayGrid: true };
-        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, rightYaxisSoc, this.translate, "line", locale, this.datasets, true);
+        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, rightYaxisSoc, this.translate, "line", this.datasets, true);
 
         const rightYAxisPower: HistoryUtils.yAxes = { position: "right", unit: YAxisType.POWER, yAxisId: ChartAxis.RIGHT_2 };
-        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, rightYAxisPower, this.translate, "line", locale, this.datasets, true);
+        this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, rightYAxisPower, this.translate, "line", this.datasets, true);
 
         this.options.scales.x["time"].unit = calculateResolution(this.service, this.service.historyPeriod.value.from, this.service.historyPeriod.value.to).timeFormat;
         this.options.scales.x["ticks"] = { source: "auto", autoSkip: false };
@@ -176,7 +175,7 @@ export class ScheduleStateAndPriceChartComponent extends AbstractHistoryChart im
         });
         const leftYAxis: HistoryUtils.yAxes = { position: "left", unit: this.unit, yAxisId: ChartAxis.LEFT, customTitle: this.currencyUnit, scale: { dynamicScale: true } };
         [rightYaxisSoc, rightYAxisPower].forEach((element) => {
-            this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, element, this.translate, "line", locale, this.datasets, true);
+            this.options = NewAbstractHistoryChart.getYAxisOptions(this.options, element, this.translate, "line", this.datasets, true);
         });
 
         this.options.scales[ChartAxis.LEFT] = {
diff --git a/ui/src/app/edge/live/common/storage/storage.component.ts b/ui/src/app/edge/live/common/storage/storage.component.ts
index e26dbdf19ef..4bcaad43273 100644
--- a/ui/src/app/edge/live/common/storage/storage.component.ts
+++ b/ui/src/app/edge/live/common/storage/storage.component.ts
@@ -3,6 +3,7 @@ import { formatNumber } from "@angular/common";
 import { Component } from "@angular/core";
 import { AbstractFlatWidget } from "src/app/shared/components/flat/abstract-flat-widget";
 import { ChannelAddress, CurrentData, EdgeConfig, Utils } from "src/app/shared/shared";
+import { Language } from "src/app/shared/type/language";
 import { DateUtils } from "src/app/shared/utils/date/dateutils";
 
 import { StorageModalComponent } from "./modal/modal.component";
@@ -51,6 +52,7 @@ export class StorageComponent extends AbstractFlatWidget {
      * @returns only positive and 0
      */
     public convertPower(value: number, isCharge?: boolean) {
+        const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
         if (value == null) {
             return "-";
         }
@@ -59,7 +61,7 @@ export class StorageComponent extends AbstractFlatWidget {
 
         // Round thisValue to Integer when decimal place equals 0
         if (thisValue > 0) {
-            return formatNumber(thisValue, "de", "1.0-1") + " kW"; // TODO get locale dynamically
+            return formatNumber(thisValue, locale, "1.0-1") + " kW";
 
         } else if (thisValue == 0 && isCharge) {
             // if thisValue is 0, then show only when charge and not discharge
diff --git a/ui/src/app/edge/settings/powerassistant/powerassistant.ts b/ui/src/app/edge/settings/powerassistant/powerassistant.ts
index b6861e4fe30..cbbc6bec221 100644
--- a/ui/src/app/edge/settings/powerassistant/powerassistant.ts
+++ b/ui/src/app/edge/settings/powerassistant/powerassistant.ts
@@ -3,6 +3,7 @@ import { formatNumber } from "@angular/common";
 import { Component } from "@angular/core";
 import { AbstractFlatWidget } from "src/app/shared/components/flat/abstract-flat-widget";
 import { DataService } from "src/app/shared/components/shared/dataservice";
+import { Language } from "src/app/shared/type/language";
 import { ChannelAddress, CurrentData, EdgeConfig, Utils } from "../../../shared/shared";
 import { LiveDataService } from "../../live/livedataservice";
 
@@ -222,10 +223,11 @@ export class PowerAssistantComponent extends AbstractFlatWidget {
 export namespace Converter {
   export function unit(unit: string): (value: any) => string {
     return function (value: any): string {
+      const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
       if (value == null) {
         return "-";
       } else if (value >= 0) {
-        return formatNumber(value, "de", "1.0-0") + " " + unit;
+        return formatNumber(value, locale, "1.0-0") + " " + unit;
       }
     };
   }
diff --git a/ui/src/app/shared/components/chart/abstracthistorychart.ts b/ui/src/app/shared/components/chart/abstracthistorychart.ts
index 2e16ca13128..4fc3deb9545 100644
--- a/ui/src/app/shared/components/chart/abstracthistorychart.ts
+++ b/ui/src/app/shared/components/chart/abstracthistorychart.ts
@@ -352,19 +352,17 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
     translate: TranslateService,
     legendOptions: { label: string, strokeThroughHidingStyle: boolean; }[],
     channelData: { data: { [name: string]: number[]; }; },
-    locale: string,
     config: EdgeConfig,
     datasets: Chart.ChartDataset[],
     chartOptionsType: XAxisType,
     labels: (Date | string)[],
   ): Chart.ChartOptions {
-
     let tooltipsLabel: string | null = null;
     let options: Chart.ChartOptions = Utils.deepCopy(<Chart.ChartOptions>Utils.deepCopy(AbstractHistoryChart.getDefaultOptions(chartOptionsType, service, labels)));
     const displayValues: HistoryUtils.DisplayValue<HistoryUtils.CustomOptions>[] = chartObject.output(channelData.data, labels);
 
     chartObject.yAxes.forEach((element) => {
-      options = AbstractHistoryChart.getYAxisOptions(options, element, translate, chartType, locale, datasets, true);
+      options = AbstractHistoryChart.getYAxisOptions(options, element, translate, chartType, datasets, true);
     });
 
     options.plugins.tooltip.callbacks.title = (tooltipItems: Chart.TooltipItem<any>[]): string => {
@@ -395,7 +393,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
         tooltipsLabel = AbstractHistoryChart.getToolTipsAfterTitleLabel(unit, chartType, value, translate);
       }
 
-      return label.split(":")[0] + ": " + AbstractHistoryChart.getToolTipsSuffix(tooltipsLabel, value, displayValue.custom?.formatNumber ?? chartObject.tooltip.formatNumber, unit, chartType, locale, translate, config);
+      return label.split(":")[0] + ": " + AbstractHistoryChart.getToolTipsSuffix(tooltipsLabel, value, displayValue.custom?.formatNumber ?? chartObject.tooltip.formatNumber, unit, chartType, translate, config);
     };
 
     options.plugins.tooltip.callbacks.labelColor = (item: Chart.TooltipItem<any>) => {
@@ -445,6 +443,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
     };
 
     options.plugins.tooltip.callbacks.afterTitle = function (items: Chart.TooltipItem<any>[]) {
+      const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
 
       if (items?.length === 0) {
         return null;
@@ -468,7 +467,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
 
       const totalValue = datasets.filter(el => el.stack == stack).reduce((_total, dataset) => Utils.addSafely(_total, Math.abs(dataset.data[datasetIndex])), 0);
       if (afterTitle) {
-        return afterTitle + ": " + formatNumber(totalValue, "de", chartObject.tooltip.formatNumber) + " " + tooltipsLabel;
+        return afterTitle + ": " + formatNumber(totalValue, locale, chartObject.tooltip.formatNumber) + " " + tooltipsLabel;
       }
 
       return null;
@@ -483,7 +482,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
       function rebuildScales(chart: Chart.Chart) {
         let options = chart.options;
         chartObject.yAxes.forEach((element) => {
-          options = AbstractHistoryChart.getYAxisOptions(options, element, translate, chartType, locale, _dataSets, true);
+          options = AbstractHistoryChart.getYAxisOptions(options, element, translate, chartType, _dataSets, true);
         });
       }
 
@@ -534,8 +533,8 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
    * @param locale the current locale
    * @returns the chart options {@link Chart.ChartOptions}
    */
-  public static getYAxisOptions(options: Chart.ChartOptions, element: HistoryUtils.yAxes, translate: TranslateService, chartType: "line" | "bar", locale: string, datasets: Chart.ChartDataset[], showYAxisType?: boolean): Chart.ChartOptions {
-
+  public static getYAxisOptions(options: Chart.ChartOptions, element: HistoryUtils.yAxes, translate: TranslateService, chartType: "line" | "bar", datasets: Chart.ChartDataset[], showYAxisType?: boolean): Chart.ChartOptions {
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     const baseConfig = ChartConstants.DEFAULT_Y_SCALE_OPTIONS(element, translate, chartType, datasets, showYAxisType);
     switch (element.unit) {
       case YAxisType.RELAY:
@@ -633,15 +632,16 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
    * @returns a string, that is either the baseName, if no suffix is provided, or a baseName with a formatted number
    */
   public static getTooltipsLabelName(baseName: string, unit: YAxisType, suffix?: number | string): string {
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     if (suffix != null) {
       if (typeof suffix === "string") {
         return baseName + " " + suffix;
       } else {
         switch (unit) {
           case YAxisType.ENERGY:
-            return baseName + ": " + formatNumber(suffix / 1000, "de", "1.0-1") + " kWh";
+            return baseName + ": " + formatNumber(suffix / 1000, locale, "1.0-1") + " kWh";
           case YAxisType.PERCENTAGE:
-            return baseName + ": " + formatNumber(suffix, "de", "1.0-1") + " %";
+            return baseName + ": " + formatNumber(suffix, locale, "1.0-1") + " %";
           case YAxisType.RELAY:
           case YAxisType.TIME: {
             const pipe = new FormatSecondsToDurationPipe(new DecimalPipe(Language.DE.key));
@@ -661,7 +661,9 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
    * @param title the YAxisType
    * @returns the tooltips suffix
    */
-  public static getToolTipsSuffix(label: any, value: number, format: string, title: YAxisType, chartType: "bar" | "line", language: string, translate: TranslateService, config: EdgeConfig): string {
+  public static getToolTipsSuffix(label: any, value: number, format: string, title: YAxisType, chartType: "bar" | "line", translate: TranslateService, config: EdgeConfig): string {
+    const language: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).key;
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     let tooltipsLabel: string | null = null;
     switch (title) {
       case YAxisType.RELAY: {
@@ -704,7 +706,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
         break;
     }
 
-    return formatNumber(value, "de", format) + " " + tooltipsLabel;
+    return formatNumber(value, locale, format) + " " + tooltipsLabel;
   }
 
   public static getDefaultOptions(xAxisType: XAxisType, service: Service, labels: (Date | string)[]): Chart.ChartOptions {
@@ -1084,8 +1086,7 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy {
    * Sets the Labels of the Chart
    */
   protected setChartLabel() {
-    const locale = this.service.translate.currentLang;
-    this.options = AbstractHistoryChart.getOptions(this.chartObject, this.chartType, this.service, this.translate, this.legendOptions, this.channelData, locale, this.config, this.datasets, this.xAxisScalingType, this.labels);
+    this.options = AbstractHistoryChart.getOptions(this.chartObject, this.chartType, this.service, this.translate, this.legendOptions, this.channelData, this.config, this.datasets, this.xAxisScalingType, this.labels);
     this.loading = false;
     this.stopSpinner();
   }
diff --git a/ui/src/app/shared/components/flat/abstract-flat-widget.ts b/ui/src/app/shared/components/flat/abstract-flat-widget.ts
index a8a1e654f82..4a4e6131ada 100644
--- a/ui/src/app/shared/components/flat/abstract-flat-widget.ts
+++ b/ui/src/app/shared/components/flat/abstract-flat-widget.ts
@@ -1,5 +1,5 @@
 // @ts-strict-ignore
-import { Directive, Inject, Input, OnDestroy, OnInit } from "@angular/core";
+import { Directive, Input, OnDestroy, OnInit, Inject } from "@angular/core";
 import { FormBuilder, FormGroup } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { ModalController } from "@ionic/angular";
diff --git a/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts b/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts
index 2a0cf4c5059..774ef47d7b1 100644
--- a/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts
+++ b/ui/src/app/shared/components/modal/modal-phases/modal-phases.ts
@@ -1,6 +1,7 @@
 import { formatNumber } from "@angular/common";
 import { Component, Input } from "@angular/core";
 import { ChannelAddress, CurrentData, Utils } from "src/app/shared/shared";
+import { Language } from "src/app/shared/type/language";
 
 import { AbstractModalLine } from "../abstract-modal-line";
 import { TextIndentation } from "../modal-line/modal-line";
@@ -47,8 +48,8 @@ export class ModalPhasesComponent extends AbstractModalLine {
    * @returns converted value
    */
   protected CONVERT_TO_POSITIVE_WATT = (value: number | null): string => {
-
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     value = Utils.absSafely(value) ?? 0;
-    return formatNumber(value, "de", "1.0-0") + " W";
+    return formatNumber(value, locale, "1.0-0") + " W";
   };
 }
diff --git a/ui/src/app/shared/components/shared/testing/tester.ts b/ui/src/app/shared/components/shared/testing/tester.ts
index c6ed9f0bfd9..a41579bde67 100644
--- a/ui/src/app/shared/components/shared/testing/tester.ts
+++ b/ui/src/app/shared/components/shared/testing/tester.ts
@@ -308,7 +308,7 @@ export class OeChartTester {
       legendOptions.push(AbstractHistoryChart.getLegendOptions(label, displayValue));
     });
 
-    let options: Chart.ChartOptions = AbstractHistoryChart.getOptions(chartData, chartType, testContext.service, testContext.translate, legendOptions, channelData.result, locale, config, datasets, xAxisType, labels);
+    let options: Chart.ChartOptions = AbstractHistoryChart.getOptions(chartData, chartType, testContext.service, testContext.translate, legendOptions, channelData.result, config, datasets, xAxisType, labels);
     options = prepareOptionsForTesting(options, chartData);
 
     return {
diff --git a/ui/src/app/shared/service/utils.ts b/ui/src/app/shared/service/utils.ts
index cf1f4ec3143..bae81131bc9 100644
--- a/ui/src/app/shared/service/utils.ts
+++ b/ui/src/app/shared/service/utils.ts
@@ -4,6 +4,7 @@ import { TranslateService } from "@ngx-translate/core";
 import { ChartDataset } from "chart.js";
 import { saveAs } from "file-saver-es";
 import { DefaultTypes } from "src/app/shared/service/defaulttypes";
+import { Language } from "src/app/shared/type/language";
 import { JsonrpcResponseSuccess } from "../jsonrpc/base";
 import { Base64PayloadResponse } from "../jsonrpc/response/base64PayloadResponse";
 import { QueryHistoricTimeseriesEnergyResponse } from "../jsonrpc/response/queryHistoricTimeseriesEnergyResponse";
@@ -251,10 +252,11 @@ export class Utils {
    * @returns converted value
    */
   public static CONVERT_TO_WATT = (value: number | null): string => {
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     if (value == null) {
       return "-";
     } else if (value >= 0) {
-      return formatNumber(value, "de", "1.0-0") + " W";
+      return formatNumber(value, locale, "1.0-0") + " W";
     } else {
       return "0 W";
     }
@@ -267,13 +269,14 @@ export class Utils {
    * @returns converted value
    */
   public static CONVERT_WATT_TO_KILOWATT = (value: number | null): string => {
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     if (value == null) {
       return "-";
     }
     const thisValue: number = (value / 1000);
 
     if (thisValue >= 0) {
-      return formatNumber(thisValue, "de", "1.0-1") + " kW";
+      return formatNumber(thisValue, locale, "1.0-1") + " kW";
     } else {
       return "0 kW";
     }
@@ -306,7 +309,8 @@ export class Utils {
    * @returns converted value
    */
   public static CONVERT_TO_WATTHOURS = (value: number): string => {
-    return formatNumber(value, "de", "1.0-1") + " Wh";
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
+    return formatNumber(value, locale, "1.0-1") + " Wh";
   };
 
   /**
@@ -316,7 +320,8 @@ export class Utils {
    * @returns converted value
    */
   public static CONVERT_TO_KILO_WATTHOURS = (value: number): string => {
-    return formatNumber(Utils.divideSafely(value, 1000), "de", "1.0-1") + " kWh";
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
+    return formatNumber(Utils.divideSafely(value, 1000), locale, "1.0-1") + " kWh";
   };
 
   /**
@@ -395,8 +400,9 @@ export class Utils {
    * @returns converted value
    */
   public static CONVERT_PRICE_TO_CENT_PER_KWH = (decimal: number, label: string) => {
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     return (value: number | null | undefined): string =>
-      (value == null ? "-" : formatNumber(value / 10, "de", "1.0-" + decimal)) + " " + label;
+      (value == null ? "-" : formatNumber(value / 10, locale, "1.0-" + decimal)) + " " + label;
   };
 
   /**
@@ -863,7 +869,7 @@ export namespace TimeOfUseTariffUtils {
    * @returns The formatted label, or exits if the value is not valid.
    */
   export function getLabel(value: number, label: string, translate: TranslateService, currencyLabel?: Currency.Label): string {
-
+    const locale: string = (Language.getByKey(localStorage.LANGUAGE) ?? Language.DEFAULT).i18nLocaleKey;
     // Error handling: Return undefined if value is not valid
     if (value === undefined || value === null || Number.isNaN(Number.parseInt(value.toString()))) {
       return;
@@ -878,18 +884,18 @@ export namespace TimeOfUseTariffUtils {
     // Switch case to handle different labels
     switch (label) {
       case socLabel:
-        return label + ": " + formatNumber(value, "de", "1.0-0") + " %";
+        return label + ": " + formatNumber(value, locale, "1.0-0") + " %";
 
       case dischargeLabel:
       case chargeConsumptionLabel:
       case balancingLabel:
         // Show floating point number for values between 0 and 1
-        return label + ": " + formatNumber(value, "de", "1.0-4") + " " + currencyLabel;
+        return label + ": " + formatNumber(value, locale, "1.0-4") + " " + currencyLabel;
 
       default:
       case gridBuyLabel:
         // Power values
-        return label + ": " + formatNumber(value, "de", "1.0-2") + " kW";
+        return label + ": " + formatNumber(value, locale, "1.0-2") + " kW";
     }
   }
 

From ba4bd6319427974a023eabd9122b271df577f474 Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Sat, 4 Jan 2025 22:28:51 +0100
Subject: [PATCH 33/49] Shelly: common executeWrite() method & many JUnit tests
 (#2658)

---
 io.openems.edge.io.api/bnd.bnd                |   2 +-
 .../openems/edge/io/shelly/common/Utils.java  |  91 +++++++++---
 .../io/shelly/shelly25/IoShelly25Impl.java    |  23 +--
 .../io/shelly/shelly3em/IoShelly3EmImpl.java  |  35 +----
 .../shelly/shellyplug/IoShellyPlugImpl.java   |  24 ++--
 .../shellyplus1pm/IoShellyPlus1PmImpl.java    |   4 +-
 .../IoShellyPlusPlugsImpl.java                |  38 +----
 .../shelly/shellypro3/IoShellyPro3Impl.java   |  32 +----
 .../shellypro3em/IoShellyPro3EmImpl.java      |   2 +
 .../shelly/shelly25/IoShelly25ImplTest.java   |  63 ++++++++-
 .../shelly/shelly3em/IoShelly3EmImplTest.java | 131 +++++++++++++++++-
 .../shellyplug/IoShellyPlugImplTest.java      |  99 ++++++++++++-
 .../IoShellyPlus1PmImplTest.java              |  68 +++++----
 .../shellyplusplugs/IoShellyPlugImplTest.java |  98 -------------
 .../IoShellyPlusPlugImplTest.java             | 112 +++++++++++++++
 .../shellypro3/IoShellyPro3ImplTest.java      |  65 ++++++++-
 .../shellypro3em/IoShelly3EmImplTest.java     |  23 ---
 .../shellypro3em/IoShellyPro3EmImplTest.java  | 112 +++++++++++++++
 ui/src/app/app.module.ts                      |   2 +-
 19 files changed, 720 insertions(+), 304 deletions(-)
 delete mode 100644 io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlugImplTest.java
 create mode 100644 io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugImplTest.java
 delete mode 100644 io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShelly3EmImplTest.java
 create mode 100644 io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImplTest.java

diff --git a/io.openems.edge.io.api/bnd.bnd b/io.openems.edge.io.api/bnd.bnd
index e6f2e03ce02..aa7c0dd5fa0 100644
--- a/io.openems.edge.io.api/bnd.bnd
+++ b/io.openems.edge.io.api/bnd.bnd
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.${tstamp}
 -buildpath: \
 	${buildpath},\
 	io.openems.common,\
-	io.openems.edge.common
+	io.openems.edge.common,\
 
 -testpath: \
 	${testpath}
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/Utils.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/Utils.java
index ca4ac6ff5b4..d5d0edfabeb 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/Utils.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/Utils.java
@@ -1,7 +1,16 @@
 package io.openems.edge.io.shelly.common;
 
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import io.openems.edge.bridge.http.api.BridgeHttp;
 import io.openems.edge.common.channel.BooleanWriteChannel;
 import io.openems.edge.common.channel.Channel;
+import io.openems.edge.common.channel.WriteChannel;
 import io.openems.edge.common.component.OpenemsComponent;
 
 public class Utils {
@@ -13,17 +22,20 @@ private Utils() {
 	 * Generates a standard Debug-Log string for Shellys with one relay and power
 	 * meter.
 	 * 
-	 * @param relayChannel       the Relay-Channel
+	 * @param relayChannels      the Relay-Channel
 	 * @param activePowerChannel the ActivePower-Channel
 	 * @return suitable for {@link OpenemsComponent#debugLog()}
 	 */
-	public static String generateDebugLog(Channel<Boolean> relayChannel, Channel<Integer> activePowerChannel) {
+	public static String generateDebugLog(Channel<Boolean>[] relayChannels, Channel<Integer> activePowerChannel) {
 		var b = new StringBuilder();
-		relayChannel.value().asOptional().ifPresentOrElse(//
-				v -> b.append(v ? "On" : "Off"), //
-				() -> b.append("Unknown"));
-		b.append("|");
-		b.append(activePowerChannel.value().asString());
+		for (int i = 0; i < relayChannels.length; i++) {
+			var relayChannel = relayChannels[i];
+			relayChannel.value().asOptional().ifPresentOrElse(v -> b.append(v ? "x" : "-"), () -> b.append("?"));
+			if (i < relayChannels.length - 1) {
+				b.append("|");
+			}
+		}
+		b.append("|").append(activePowerChannel.value().asString());
 		return b.toString();
 	}
 
@@ -35,21 +47,58 @@ public static String generateDebugLog(Channel<Boolean> relayChannel, Channel<Int
 	 */
 	public static String generateDebugLog(BooleanWriteChannel[] digitalOutputChannels) {
 		// TODO share code with AbstractKmtronicRelay.debugLog()
-		var b = new StringBuilder();
-		var i = 1;
-		for (var channel : digitalOutputChannels) {
-			var valueOpt = channel.value().asOptional();
-			if (valueOpt.isPresent()) {
-				b.append(valueOpt.get() ? "x" : "-");
+		return stream(digitalOutputChannels) //
+				.map(c -> c.value().asOptional().map(v -> v //
+						? "x" //
+						: "-") //
+						.orElse("?")) //
+				.collect(joining(" "));
+	}
+
+	/**
+	 * Executes a write command to a specified relay channel by constructing and
+	 * sending an HTTP request based on the channel's current and intended state.
+	 * This method compares the current state with the desired state, and only
+	 * proceeds with the HTTP request if they differ, ensuring no unnecessary
+	 * commands are sent. The method returns a CompletableFuture that completes when
+	 * the HTTP request is finished. It completes normally if the HTTP request
+	 * succeeds, and exceptionally if the request fails due to errors.
+	 *
+	 * @param relayChannel the channel for the relay, specifying the current and
+	 *                     desired states
+	 * @param baseUrl      the base URL for constructing the final endpoint URL
+	 * @param httpBridge   the HTTP bridge to send the request
+	 * @param index        the index of the DigitalChannel to write to (used for the
+	 *                     URL)
+	 * @return CompletableFuture{@code <Void>} that completes when the HTTP
+	 *         operation completes. Completes exceptionally if there is an error in
+	 *         the HTTP request.
+	 */
+	public static CompletableFuture<Void> executeWrite(WriteChannel<Boolean> relayChannel, String baseUrl,
+			BridgeHttp httpBridge, Integer index) {
+		CompletableFuture<Void> future = new CompletableFuture<>();
+		Boolean readValue = relayChannel.value().get();
+		Optional<Boolean> writeValue = relayChannel.getNextWriteValueAndReset();
+
+		if (writeValue.isEmpty()) {
+			future.complete(null); // No action needed
+			return future;
+		}
+		if (Objects.equals(readValue, writeValue.get())) {
+			future.complete(null); // No change in state
+			return future;
+		}
+
+		final String url = baseUrl + "/rpc/Switch.Set?id=" + index + "&on=" + (writeValue.get() ? "true" : "false");
+		httpBridge.get(url).whenComplete((response, exception) -> {
+			if (exception != null) {
+				future.completeExceptionally(exception);
 			} else {
-				b.append("Unknown");
+				future.complete(null);
 			}
-			if (i < digitalOutputChannels.length) {
-				b.append("|");
-			}
-			i++;
-		}
-		return b.toString();
+		});
+
+		return future;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java
index 3040a02fbbc..ef0297dac35 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java
@@ -137,14 +137,19 @@ private void processHttpResult(HttpResponse<JsonElement> result, HttpError error
 		var relay1State = new RelayState(null, null, null);
 		var relay2State = new RelayState(null, null, null);
 
-		try {
-			final var relays = getAsJsonArray(result.data(), "relays");
-			relay1State = RelayState.from(getAsJsonObject(relays.get(0)));
-			relay2State = RelayState.from(getAsJsonObject(relays.get(1)));
-
-		} catch (OpenemsNamedException | IndexOutOfBoundsException e) {
-			this.logDebug(this.log, e.getMessage());
-			slaveCommunicationFailed = true;
+		if (error != null) {
+			this.logDebug(this.log, error.getMessage());
+
+		} else {
+			try {
+				final var relays = getAsJsonArray(result.data(), "relays");
+				relay1State = RelayState.from(getAsJsonObject(relays.get(0)));
+				relay2State = RelayState.from(getAsJsonObject(relays.get(1)));
+
+			} catch (OpenemsNamedException | IndexOutOfBoundsException e) {
+				this.logDebug(this.log, e.getMessage());
+				slaveCommunicationFailed = true;
+			}
 		}
 
 		this._setSlaveCommunicationFailed(slaveCommunicationFailed);
@@ -182,4 +187,4 @@ private void executeWrite(BooleanWriteChannel channel, int index) {
 			}
 		});
 	}
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImpl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImpl.java
index d33add0361a..19a5447471c 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImpl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImpl.java
@@ -4,11 +4,10 @@
 import static io.openems.common.utils.JsonUtils.getAsFloat;
 import static io.openems.common.utils.JsonUtils.getAsJsonArray;
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
+import static io.openems.edge.io.shelly.common.Utils.executeWrite;
 import static io.openems.edge.io.shelly.common.Utils.generateDebugLog;
 import static java.lang.Math.round;
 
-import java.util.Objects;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -83,6 +82,8 @@ public IoShelly3EmImpl() {
 		this.digitalOutputChannels = new BooleanWriteChannel[] { this.channel(IoShelly3Em.ChannelId.RELAY) };
 
 		ElectricityMeter.calculateSumActivePowerFromPhases(this);
+		ElectricityMeter.calculateSumCurrentFromPhases(this);
+		ElectricityMeter.calculateAverageVoltageFromPhases(this);
 	}
 
 	@Activate
@@ -111,7 +112,7 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		return generateDebugLog(this.getRelayChannel(), this.getActivePowerChannel());
+		return generateDebugLog(this.digitalOutputChannels, this.getActivePowerChannel());
 	}
 
 	@Override
@@ -124,7 +125,7 @@ public void handleEvent(Event event) {
 		case EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE //
 			-> this.calculateEnergy();
 		case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
-			-> this.executeWrite();
+			-> executeWrite(this.getRelayChannel(), this.baseUrl, this.httpBridge, 0);
 		}
 	}
 
@@ -219,32 +220,6 @@ private void processHttpResult(HttpResponse<JsonElement> result, Throwable error
 		this._setCurrentL3(currentL3);
 	}
 
-	/**
-	 * Execute on Cycle Event "Execute Write".
-	 */
-	private void executeWrite() {
-		var channel = this.getRelayChannel();
-		var index = 0;
-		var readValue = channel.value().get();
-		var writeValue = channel.getNextWriteValueAndReset();
-		if (writeValue.isEmpty()) {
-			return;
-		}
-		if (Objects.equals(readValue, writeValue.get())) {
-			return;
-		}
-		final var url = this.baseUrl + "/relay/" + index + "?turn=" + (writeValue.get() ? "on" : "off");
-
-		this.httpBridge.get(url).whenComplete((t, e) -> {
-			this._setSlaveCommunicationFailed(e != null);
-			if (e == null) {
-				this.logInfo(this.log, "Executed write successfully for URL: " + url);
-			} else {
-				this.logError(this.log, "Failed to execute write for URL: " + url + "; Error: " + e.getMessage());
-			}
-		});
-	}
-
 	/**
 	 * Calculate the Energy values from ActivePower.
 	 */
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImpl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImpl.java
index 0e196afdfc6..24c6efa60d0 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImpl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImpl.java
@@ -1,6 +1,12 @@
 package io.openems.edge.io.shelly.shellyplug;
 
+import static io.openems.common.utils.JsonUtils.getAsBoolean;
+import static io.openems.common.utils.JsonUtils.getAsFloat;
+import static io.openems.common.utils.JsonUtils.getAsJsonArray;
+import static io.openems.common.utils.JsonUtils.getAsJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsLong;
 import static io.openems.edge.io.shelly.common.Utils.generateDebugLog;
+import static java.lang.Math.round;
 
 import java.util.Objects;
 
@@ -21,7 +27,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.types.MeterType;
-import io.openems.common.utils.JsonUtils;
 import io.openems.edge.bridge.http.api.BridgeHttp;
 import io.openems.edge.bridge.http.api.BridgeHttpFactory;
 import io.openems.edge.bridge.http.api.HttpResponse;
@@ -102,7 +107,7 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		return generateDebugLog(this.getRelayChannel(), this.getActivePowerChannel());
+		return generateDebugLog(this.digitalOutputChannels, this.getActivePowerChannel());
 	}
 
 	@Override
@@ -128,17 +133,18 @@ private void processHttpResult(HttpResponse<JsonElement> result, Throwable error
 			return;
 		}
 		try {
-			final var relays = JsonUtils.getAsJsonArray(result.data(), "relays");
-			final var relay1 = JsonUtils.getAsJsonObject(relays.get(0));
-			final var relayIson = JsonUtils.getAsBoolean(relay1, "ison");
-			final var meters = JsonUtils.getAsJsonArray(result.data(), "meters");
-			final var meter1 = JsonUtils.getAsJsonObject(meters.get(0));
-			final var power = Math.round(JsonUtils.getAsFloat(meter1, "power"));
-			final var energy = JsonUtils.getAsLong(meter1, "total") /* Unit: Wm */ / 60 /* Wh */;
+			var relays = getAsJsonArray(result.data(), "relays");
+			var relay1 = getAsJsonObject(relays.get(0));
+			var relayIson = getAsBoolean(relay1, "ison");
+			var meters = getAsJsonArray(result.data(), "meters");
+			var meter1 = getAsJsonObject(meters.get(0));
+			var power = round(getAsFloat(meter1, "power"));
+			var energy = getAsLong(meter1, "total")/* Unit: Wm */ / 60 /* Wh */;
 
 			this._setRelay(relayIson);
 			this._setActivePower(power);
 			this._setActiveProductionEnergy(energy);
+
 		} catch (OpenemsNamedException e) {
 			this._setRelay(null);
 			this._setActivePower(null);
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImpl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImpl.java
index 2de16729597..2c7ba81f6d9 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImpl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImpl.java
@@ -123,7 +123,7 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		return generateDebugLog(this.getRelayChannel(), this.getActivePowerChannel());
+		return generateDebugLog(this.digitalOutputChannels, this.getActivePowerChannel());
 	}
 
 	@Override
@@ -238,4 +238,4 @@ public Timedata getTimedata() {
 		return this.timedata;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugsImpl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugsImpl.java
index 4308fed821a..1828438a49a 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugsImpl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugsImpl.java
@@ -3,11 +3,10 @@
 import static io.openems.common.utils.JsonUtils.getAsBoolean;
 import static io.openems.common.utils.JsonUtils.getAsFloat;
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
+import static io.openems.edge.io.shelly.common.Utils.executeWrite;
 import static io.openems.edge.io.shelly.common.Utils.generateDebugLog;
 import static java.lang.Math.round;
 
-import java.util.Objects;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -29,7 +28,6 @@
 import io.openems.common.types.MeterType;
 import io.openems.edge.bridge.http.api.BridgeHttp;
 import io.openems.edge.bridge.http.api.BridgeHttpFactory;
-import io.openems.edge.bridge.http.api.HttpError;
 import io.openems.edge.bridge.http.api.HttpResponse;
 import io.openems.edge.common.channel.BooleanWriteChannel;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
@@ -123,7 +121,7 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		return generateDebugLog(this.getRelayChannel(), this.getActivePowerChannel());
+		return generateDebugLog(this.digitalOutputChannels, this.getActivePowerChannel());
 	}
 
 	@Override
@@ -136,11 +134,11 @@ public void handleEvent(Event event) {
 		case EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE //
 			-> this.calculateEnergy();
 		case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
-			-> this.executeWrite();
+			-> executeWrite(this.getRelayChannel(), this.baseUrl, this.httpBridge, 0);
 		}
 	}
 
-	private void processHttpResult(HttpResponse<JsonElement> result, HttpError error) {
+	private void processHttpResult(HttpResponse<JsonElement> result, Throwable error) {
 		this._setSlaveCommunicationFailed(result == null);
 
 		Boolean relayStatus = null;
@@ -177,32 +175,6 @@ private void processHttpResult(HttpResponse<JsonElement> result, HttpError error
 		this.channel(IoShellyPlusPlugs.ChannelId.HAS_UPDATE).setNextValue(updatesAvailable);
 	}
 
-	/**
-	 * Execute on Cycle Event "Execute Write".
-	 */
-	private void executeWrite() {
-		var channel = this.getRelayChannel();
-		var readValue = channel.value().get();
-		var writeValue = channel.getNextWriteValueAndReset();
-		if (writeValue.isEmpty()) {
-			return;
-		}
-		if (Objects.equals(readValue, writeValue.get())) {
-			return;
-		}
-		var index = 0;
-		final var url = this.baseUrl + "/relay/" + index + "?turn=" + (writeValue.get() ? "on" : "off");
-
-		this.httpBridge.get(url).whenComplete((t, e) -> {
-			this._setSlaveCommunicationFailed(e != null);
-			if (e == null) {
-				this.logDebug(this.log, "Executed write successfully for URL: " + url);
-			} else {
-				this.logError(this.log, "Failed to execute write for URL: " + url + "; Error: " + e.getMessage());
-			}
-		});
-	}
-
 	/**
 	 * Calculate the Energy values from ActivePower.
 	 */
@@ -236,4 +208,4 @@ public Timedata getTimedata() {
 		return this.timedata;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/IoShellyPro3Impl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/IoShellyPro3Impl.java
index 888ceb58da3..5de68423610 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/IoShellyPro3Impl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3/IoShellyPro3Impl.java
@@ -4,8 +4,6 @@
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
 import static io.openems.edge.io.shelly.common.Utils.generateDebugLog;
 
-import java.util.Objects;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -30,6 +28,7 @@
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.event.EdgeEventConstants;
 import io.openems.edge.io.api.DigitalOutput;
+import io.openems.edge.io.shelly.common.Utils;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -106,7 +105,7 @@ public void handleEvent(Event event) {
 
 		switch (event.getTopic()) {
 		case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
-			-> this.eventExecuteWrite();
+			-> this.executeWrite();
 		}
 	}
 
@@ -137,31 +136,10 @@ private void processHttpResult(HttpResponse<JsonElement> result, HttpError error
 		}
 	}
 
-	/**
-	 * Execute on Cycle Event "Execute Write".
-	 */
-	private void eventExecuteWrite() {
+	private void executeWrite() {
 		for (int i = 0; i < this.digitalOutputChannels.length; i++) {
-			this.executeWrite(this.digitalOutputChannels[i], i);
-		}
-	}
-
-	private void executeWrite(BooleanWriteChannel channel, int index) {
-		var readValue = channel.value().get();
-		var writeValue = channel.getNextWriteValueAndReset();
-		if (writeValue.isEmpty()) {
-			return;
-		}
-		if (Objects.equals(readValue, writeValue.get())) {
-			return;
+			Utils.executeWrite(this.digitalOutputChannels[i], this.baseUrl, this.httpBridge, i);
 		}
-		final String url = this.baseUrl + "/relay/" + index + "?turn=" + (writeValue.get() ? "on" : "off");
-		this.httpBridge.get(url).whenComplete((t, e) -> {
-			if (e != null) {
-				this.logError(this.log, "HTTP request failed: " + e.getMessage());
-				this._setSlaveCommunicationFailed(true);
-			}
-		});
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImpl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImpl.java
index e0a59bc939b..d6f2957eb5a 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImpl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImpl.java
@@ -76,6 +76,8 @@ public IoShellyPro3EmImpl() {
 		);
 
 		ElectricityMeter.calculateSumActivePowerFromPhases(this);
+		ElectricityMeter.calculateSumCurrentFromPhases(this);
+		ElectricityMeter.calculateAverageVoltageFromPhases(this);
 	}
 
 	@Activate
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java
index 679d091a7de..42f6e4b355a 100644
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java
@@ -1,22 +1,75 @@
 package io.openems.edge.io.shelly.shelly25;
 
-import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.ofDummyBridge;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import io.openems.edge.bridge.http.api.HttpError;
+import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
 
 public class IoShelly25ImplTest {
 
 	@Test
 	public void test() throws Exception {
-		new ComponentTest(new IoShelly25Impl()) //
-				.addReference("httpBridgeFactory", ofDummyBridge()) //
+		final var sut = new IoShelly25Impl();
+		final var httpTestBundle = new DummyBridgeHttpBundle();
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
 				.activate(MyConfig.create() //
 						.setId("io0") //
 						.setIp("127.0.0.1") //
 						.build()) //
-		;
-	}
 
+				// Test case for a successful JSON response
+				.next(new TestCase("Successful read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+										{
+											"relays": [
+												{
+													"ison": true,
+													"overtemperature": false,
+													"overpower": false
+												},
+												{
+													"ison": false,
+													"overtemperature": true,
+													"overpower": true
+												}
+											]
+										}
+									"""));
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("x -", sut.debugLog())) //
+
+						.output(IoShelly25.ChannelId.RELAY_1, null) // expecting WriteValue
+						.output(IoShelly25.ChannelId.RELAY_1_OVERPOWER, false) //
+						.output(IoShelly25.ChannelId.RELAY_1_OVERTEMP, false) //
+						.output(IoShelly25.ChannelId.RELAY_2, null) // expecting WriteValue
+						.output(IoShelly25.ChannelId.RELAY_2_OVERPOWER, true) //
+						.output(IoShelly25.ChannelId.RELAY_2_OVERTEMP, true) //
+						.output(IoShelly25.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
+
+				// Test case for an invalid JSON response
+				.next(new TestCase("Invalid read response") //
+						.onBeforeProcessImage(() -> { //
+							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("? ?", sut.debugLog())) //
+
+						.output(IoShelly25.ChannelId.RELAY_1, null) // expecting WriteValue
+						.output(IoShelly25.ChannelId.RELAY_1_OVERPOWER, null) //
+						.output(IoShelly25.ChannelId.RELAY_1_OVERTEMP, null) //
+						.output(IoShelly25.ChannelId.RELAY_2, null) // expecting WriteValue
+						.output(IoShelly25.ChannelId.RELAY_2_OVERPOWER, null) //
+						.output(IoShelly25.ChannelId.RELAY_2_OVERTEMP, null) //
+						.output(IoShelly25.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
+
+				.deactivate();//
+	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImplTest.java
index e51922918ef..6d3671cf46c 100644
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImplTest.java
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly3em/IoShelly3EmImplTest.java
@@ -1,24 +1,145 @@
 package io.openems.edge.io.shelly.shelly3em;
 
 import static io.openems.common.types.MeterType.CONSUMPTION_METERED;
-import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.ofDummyBridge;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import io.openems.edge.bridge.http.api.HttpError;
+import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.meter.api.ElectricityMeter;
 
 public class IoShelly3EmImplTest {
 
 	@Test
 	public void test() throws Exception {
-		new ComponentTest(new IoShelly3EmImpl()) //
-				.addReference("httpBridgeFactory", ofDummyBridge()) //
+		final var sut = new IoShelly3EmImpl();
+		final var httpTestBundle = new DummyBridgeHttpBundle();
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
 				.activate(MyConfig.create() //
 						.setId("io0") //
 						.setIp("127.0.0.1") //
 						.setType(CONSUMPTION_METERED) //
 						.build()) //
-		;
-	}
 
+				.next(new TestCase("Successful read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+									{
+									  "relays": [
+									    {
+									      "ison": true,
+									      "overpower": false
+									    }
+									  ],
+									  "emeters": [
+									    {
+									      "power": 8.52,
+									      "current": 1,
+									      "voltage": 230,
+									      "is_valid": true
+									    },
+									    {
+									      "power": 31.39,
+									      "current": 2,
+									      "voltage": 231,
+									      "is_valid": true
+									    },
+									    {
+									      "power": 58.75,
+									      "current": 3,
+									      "voltage": 232,
+									      "is_valid": false
+									    }
+									  ],
+									  "total_power": 35.88,
+									  "emeter_n": {
+									    "current": 0,
+									    "ixsum": 0.7,
+									    "mismatch": false,
+									    "is_valid": false
+									  },
+									  "update": {
+									    "status": "idle",
+									    "has_update": false
+									  }
+									}
+									"""));
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("x|99 W", sut.debugLog())) //
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 99) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, 9) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, 31) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, 59) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, 231000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 230000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, 231000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, 232000) //
+						.output(ElectricityMeter.ChannelId.CURRENT, 6000) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, 1000) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, 2000) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, 3000) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, null) //
+						.output(IoShelly3Em.ChannelId.RELAY_OVERPOWER_EXCEPTION, false) //
+						.output(IoShelly3Em.ChannelId.HAS_UPDATE, false) //
+						.output(IoShelly3Em.ChannelId.EMETER1_EXCEPTION, false) //
+						.output(IoShelly3Em.ChannelId.EMETER2_EXCEPTION, false) //
+						.output(IoShelly3Em.ChannelId.EMETER3_EXCEPTION, true) //
+						.output(IoShelly3Em.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
+
+				.next(new TestCase("Invalid read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("?|UNDEFINED", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, null) //
+						.output(IoShelly3Em.ChannelId.RELAY_OVERPOWER_EXCEPTION, false) //
+						.output(IoShelly3Em.ChannelId.HAS_UPDATE, false) //
+						.output(IoShelly3Em.ChannelId.EMETER1_EXCEPTION, false) //
+						.output(IoShelly3Em.ChannelId.EMETER2_EXCEPTION, false) //
+						.output(IoShelly3Em.ChannelId.EMETER3_EXCEPTION, true) //
+						.output(IoShelly3Em.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
+
+				// Test case for writing to relay
+				.next(new TestCase("Write") //
+						.onBeforeControllersCallbacks(() -> {
+							sut.setRelay(true);
+						}) //
+						.also(testCase -> {
+							final var relayTurnedOn = httpTestBundle
+									.expect("http://127.0.0.1/rpc/Switch.Set?id=0&on=true").toBeCalled();
+
+							testCase.onBeforeControllersCallbacks(() -> {
+								httpTestBundle.triggerNextCycle();
+							});
+							testCase.onAfterWriteCallbacks(() -> {
+								assertTrue("Failed to turn on relay", relayTurnedOn.get());
+							});
+						})) //
+
+				.deactivate();
+	}
 }
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImplTest.java
index 60d97be0f50..6255b5fb688 100644
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImplTest.java
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplug/IoShellyPlugImplTest.java
@@ -1,25 +1,112 @@
 package io.openems.edge.io.shelly.shellyplug;
 
 import static io.openems.common.types.MeterType.PRODUCTION;
-import static io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory.ofDummyBridge;
+import static io.openems.edge.meter.api.SinglePhase.L1;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import io.openems.edge.bridge.http.api.HttpError;
+import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
-import io.openems.edge.meter.api.SinglePhase;
+import io.openems.edge.meter.api.ElectricityMeter;
 
 public class IoShellyPlugImplTest {
 
 	@Test
 	public void test() throws Exception {
-		new ComponentTest(new IoShellyPlugImpl()) //
-				.addReference("httpBridgeFactory", ofDummyBridge()) //
+		final var sut = new IoShellyPlugImpl();
+		final var httpTestBundle = new DummyBridgeHttpBundle();
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
 				.activate(MyConfig.create() //
 						.setId("io0") //
-						.setPhase(SinglePhase.L1) //
+						.setPhase(L1) //
 						.setIp("127.0.0.1") //
 						.setType(PRODUCTION) //
 						.build()) //
-		;
+
+				.next(new TestCase("Successful read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+									{
+									  "relays": [
+									    {
+									      "ison": true
+									    }
+									  ],
+									  "meters": [
+									    {
+									      "power": 789.1,
+									      "total": 72000
+									    }
+									  ]
+									}
+									"""));
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("x|789 W", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 789) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, 789) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, 1200L) //
+						.output(IoShellyPlug.ChannelId.RELAY, null) //
+						.output(IoShellyPlug.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
+
+				.next(new TestCase("Invalid read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("?|UNDEFINED", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, 1200L) //
+						.output(IoShellyPlug.ChannelId.RELAY, null) //
+						.output(IoShellyPlug.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
+
+				// Test case for writing to relay
+				.next(new TestCase("Write") //
+						.onBeforeControllersCallbacks(() -> {
+							sut.setRelay(true);
+						}) //
+						.also(testCase -> {
+							final var relayTurnedOn = httpTestBundle.expect("http://127.0.0.1/relay/0?turn=on")
+									.toBeCalled();
+							testCase.onBeforeControllersCallbacks(() -> {
+								httpTestBundle.triggerNextCycle();
+							});
+							testCase.onAfterWriteCallbacks(() -> {
+								assertTrue("Failed to turn on relay", relayTurnedOn.get());
+							});
+						})) //
+
+				.deactivate();//
 	}
 }
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImplTest.java
index d2314907aea..7ccd5d5a10a 100644
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImplTest.java
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplus1pm/IoShellyPlus1PmImplTest.java
@@ -1,13 +1,6 @@
 package io.openems.edge.io.shelly.shellyplus1pm;
 
 import static io.openems.common.types.MeterType.CONSUMPTION_METERED;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_POWER;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_POWER_L1;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_POWER_L2;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.CURRENT;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.VOLTAGE;
 import static io.openems.edge.meter.api.SinglePhase.L1;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -19,15 +12,15 @@
 import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.meter.api.ElectricityMeter;
 import io.openems.edge.timedata.test.DummyTimedata;
 
 public class IoShellyPlus1PmImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final var httpTestBundle = new DummyBridgeHttpBundle();
 		final var sut = new IoShellyPlus1PmImpl();
-
+		final var httpTestBundle = new DummyBridgeHttpBundle();
 		new ComponentTest(sut) //
 				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
 				.addReference("timedata", new DummyTimedata("timedata0")) //
@@ -39,11 +32,10 @@ public void test() throws Exception {
 						.build()) //
 
 				.next(new TestCase("Successful read response") //
-						.onBeforeControllersCallbacks(() -> {
+						.onBeforeProcessImage(() -> {
 							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
 									{
 									   "ble":{
-
 									   },
 									   "cloud":{
 									      "connected":true
@@ -91,7 +83,6 @@ public void test() throws Exception {
 									      "schedule_rev":0,
 									      "webhook_rev":0,
 									      "available_updates":{
-
 									      },
 									      "reset_reason":3
 									   },
@@ -109,29 +100,50 @@ public void test() throws Exception {
 									"""));
 							httpTestBundle.triggerNextCycle();
 						}) //
-						.output(ACTIVE_POWER, 123) //
-						.output(ACTIVE_POWER_L1, 123) //
-						.output(ACTIVE_POWER_L2, null) //
-						.output(CURRENT, 500) //
-						.output(VOLTAGE, 231300)) //
+						.onAfterProcessImage(() -> assertEquals("-|123 W", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 123) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, 123) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, 231300) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 231300) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, 500) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, 500) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, null) //
+						.output(IoShellyPlus1Pm.ChannelId.RELAY, null) //
+						.output(IoShellyPlus1Pm.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
 
 				.next(new TestCase("Invalid read response") //
-						.onBeforeControllersCallbacks(() -> assertEquals("Off|123 W", sut.debugLog()))
-						.onBeforeControllersCallbacks(() -> {
+						.onBeforeProcessImage(() -> {
 							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
 							httpTestBundle.triggerNextCycle();
 						}) //
-						.output(ACTIVE_POWER, null) //
-						.output(ACTIVE_POWER_L1, null) //
-						.output(ACTIVE_POWER_L2, null) //
-						.output(CURRENT, null) //
-						.output(VOLTAGE, null) //
+						.onAfterProcessImage(() -> assertEquals("?|UNDEFINED", sut.debugLog()))
 
-						.output(ACTIVE_PRODUCTION_ENERGY, 0L) //
-						.output(ACTIVE_CONSUMPTION_ENERGY, 0L)) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, 0L) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, 0L) //
+						.output(IoShellyPlus1Pm.ChannelId.RELAY, null) //
+						.output(IoShellyPlus1Pm.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
 
 				.next(new TestCase("Write") //
-						.onBeforeControllersCallbacks(() -> assertEquals("Unknown|UNDEFINED", sut.debugLog()))
 						.onBeforeControllersCallbacks(() -> sut.setRelay(true)) //
 						.also(testCase -> {
 							final var relayTurnedOn = httpTestBundle.expect("http://127.0.0.1/relay/0?turn=on")
@@ -145,4 +157,4 @@ public void test() throws Exception {
 				.deactivate();
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlugImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlugImplTest.java
deleted file mode 100644
index 773e6df2661..00000000000
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlugImplTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.openems.edge.io.shelly.shellyplusplugs;
-
-import static io.openems.common.types.MeterType.PRODUCTION;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_POWER;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_POWER_L1;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_POWER_L2;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.CURRENT;
-import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.VOLTAGE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import io.openems.edge.bridge.http.api.HttpError;
-import io.openems.edge.bridge.http.api.HttpResponse;
-import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
-import io.openems.edge.common.test.AbstractComponentTest.TestCase;
-import io.openems.edge.common.test.ComponentTest;
-import io.openems.edge.meter.api.SinglePhase;
-import io.openems.edge.timedata.test.DummyTimedata;
-
-public class IoShellyPlugImplTest {
-
-	@Test
-	public void test() throws Exception {
-		final var httpTestBundle = new DummyBridgeHttpBundle();
-		final var sut = new IoShellyPlusPlugsImpl();
-		new ComponentTest(sut) //
-				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
-				.addReference("timedata", new DummyTimedata("timedata0")) //
-				.activate(MyConfig.create() //
-						.setId("io0") //
-						.setPhase(SinglePhase.L1) //
-						.setIp("127.0.0.1") //
-						.setType(PRODUCTION) //
-						.build()) //
-
-				.next(new TestCase("Successful read response") //
-						.onBeforeControllersCallbacks(() -> {
-							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
-									{
-									  "sys": {
-									    "available_updates": {
-									      "foo": "bar"
-									    }
-									  },
-									  "switch:0": {
-									    "current": 1.234,
-									    "voltage": 231.5,
-									    "output": false,
-									    "apower": 789.1
-									  }
-									}
-									"""));
-							httpTestBundle.triggerNextCycle();
-						}) //
-						.output(ACTIVE_POWER, 789) //
-						.output(ACTIVE_POWER_L1, 789) //
-						.output(ACTIVE_POWER_L2, null) //
-						.output(CURRENT, 1234) //
-						.output(VOLTAGE, 231500)) //
-
-				.next(new TestCase("Invalid read response") //
-						.onBeforeControllersCallbacks(() -> assertEquals("Off|789 W", sut.debugLog()))
-
-						.onBeforeControllersCallbacks(() -> {
-							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
-							httpTestBundle.triggerNextCycle();
-						}) //
-						.output(ACTIVE_POWER, null) //
-						.output(ACTIVE_POWER_L1, null) //
-						.output(ACTIVE_POWER_L2, null) //
-						.output(CURRENT, null) //
-						.output(VOLTAGE, null) //
-
-						.output(ACTIVE_PRODUCTION_ENERGY, 0L) //
-						.output(ACTIVE_CONSUMPTION_ENERGY, 0L)) //
-
-				.next(new TestCase("Write") //
-						.onBeforeControllersCallbacks(() -> assertEquals("Unknown|UNDEFINED", sut.debugLog()))
-						.onBeforeControllersCallbacks(() -> {
-							sut.setRelay(true);
-						}) //
-						.also(testCase -> {
-							final var relayTurnedOn = httpTestBundle.expect("http://127.0.0.1/relay/0?turn=on")
-									.toBeCalled();
-
-							testCase.onBeforeControllersCallbacks(() -> httpTestBundle.triggerNextCycle());
-							testCase.onAfterWriteCallbacks(
-									() -> assertTrue("Failed to turn on relay", relayTurnedOn.get()));
-						})) //
-
-				.deactivate();
-	}
-
-}
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugImplTest.java
new file mode 100644
index 00000000000..144244905c6
--- /dev/null
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellyplusplugs/IoShellyPlusPlugImplTest.java
@@ -0,0 +1,112 @@
+package io.openems.edge.io.shelly.shellyplusplugs;
+
+import static io.openems.common.types.MeterType.PRODUCTION;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import io.openems.edge.bridge.http.api.HttpError;
+import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.meter.api.ElectricityMeter;
+import io.openems.edge.meter.api.SinglePhase;
+import io.openems.edge.timedata.test.DummyTimedata;
+
+public class IoShellyPlusPlugImplTest {
+
+	@Test
+	public void test() throws Exception {
+		final var httpTestBundle = new DummyBridgeHttpBundle();
+		final var sut = new IoShellyPlusPlugsImpl();
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
+				.addReference("timedata", new DummyTimedata("timedata0")) //
+				.activate(MyConfig.create() //
+						.setId("io0") //
+						.setPhase(SinglePhase.L1) //
+						.setIp("127.0.0.1") //
+						.setType(PRODUCTION) //
+						.build()) //
+
+				.next(new TestCase("Successful read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+									{
+									  "sys": {
+									    "available_updates": {
+									      "foo": "bar"
+									    }
+									  },
+									  "switch:0": {
+									    "current": 1.234,
+									    "voltage": 231.5,
+									    "output": false,
+									    "apower": 789.1
+									  }
+									}
+									"""));
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("-|789 W", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 789) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, 789) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, 231500) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 231500) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, 1234) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, 1234) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, null) //
+						.output(IoShellyPlusPlugs.ChannelId.RELAY, null) //
+						.output(IoShellyPlusPlugs.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
+
+				.next(new TestCase("Invalid read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("?|UNDEFINED", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, 0L) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, 0L) //
+						.output(IoShellyPlusPlugs.ChannelId.RELAY, null) //
+						.output(IoShellyPlusPlugs.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
+
+				// Test case for writing to relay
+				.next(new TestCase("Write") //
+						.onBeforeControllersCallbacks(() -> {
+							sut.setRelay(true);
+						}) //
+						.also(testCase -> {
+							final var relayTurnedOn = httpTestBundle
+									.expect("http://127.0.0.1/rpc/Switch.Set?id=0&on=true").toBeCalled();
+
+							testCase.onBeforeControllersCallbacks(() -> httpTestBundle.triggerNextCycle());
+							testCase.onAfterWriteCallbacks(
+									() -> assertTrue("Failed to turn on relay", relayTurnedOn.get()));
+						})) //
+
+				.deactivate();//
+	}
+}
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3/IoShellyPro3ImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3/IoShellyPro3ImplTest.java
index c7213418efe..4da9baff117 100644
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3/IoShellyPro3ImplTest.java
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3/IoShellyPro3ImplTest.java
@@ -1,21 +1,74 @@
 package io.openems.edge.io.shelly.shellypro3;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
-import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory;
+import io.openems.edge.bridge.http.api.HttpError;
+import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
 
 public class IoShellyPro3ImplTest {
 
 	@Test
 	public void test() throws Exception {
-		new ComponentTest(new IoShellyPro3Impl()) //
-				.addReference("httpBridgeFactory", DummyBridgeHttpFactory.ofDummyBridge()) //
+		final var httpTestBundle = new DummyBridgeHttpBundle();
+		final var sut = new IoShellyPro3Impl();
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
 				.activate(MyConfig.create() //
 						.setId("io0") //
 						.setIp("127.0.0.1") //
 						.build()) //
-		;
-	}
 
-}
\ No newline at end of file
+				// Test case for successful JSON responses for all relays
+				.next(new TestCase("Successful read response for all relays") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+									    {
+									        "id": 0,
+									        "source": "HTTP",
+									        "output": true
+									    }
+									"""));
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+									    {
+									        "id": 1,
+									        "source": "HTTP",
+									        "output": false
+									    }
+									"""));
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+									    {
+									        "id": 2,
+									        "source": "HTTP",
+									        "output": true
+									    }
+									"""));
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("x x -", sut.debugLog()))
+
+						.output(IoShellyPro3.ChannelId.RELAY_1, null) // expecting WriteValue
+						.output(IoShellyPro3.ChannelId.RELAY_2, null) // expecting WriteValue
+						.output(IoShellyPro3.ChannelId.RELAY_3, null) // expecting WriteValue
+						.output(IoShellyPro3.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
+
+				// Test case for an invalid JSON response
+				.next(new TestCase("Invalid read response for all relays") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("? ? ?", sut.debugLog()))
+
+						.output(IoShellyPro3.ChannelId.RELAY_1, null) //
+						.output(IoShellyPro3.ChannelId.RELAY_2, null) //
+						.output(IoShellyPro3.ChannelId.RELAY_3, null) //
+						.output(IoShellyPro3.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
+
+				.deactivate(); //
+	}
+}
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShelly3EmImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShelly3EmImplTest.java
deleted file mode 100644
index c6f0e340da5..00000000000
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShelly3EmImplTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.openems.edge.io.shelly.shellypro3em;
-
-import org.junit.Test;
-
-import io.openems.common.types.MeterType;
-import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory;
-import io.openems.edge.common.test.ComponentTest;
-
-public class IoShelly3EmImplTest {
-
-	@Test
-	public void test() throws Exception {
-		new ComponentTest(new IoShellyPro3EmImpl()) //
-				.addReference("httpBridgeFactory", DummyBridgeHttpFactory.ofDummyBridge()) //
-				.activate(MyConfig.create() //
-						.setId("io0") //
-						.setIp("127.0.0.1") //
-						.setType(MeterType.CONSUMPTION_METERED) //
-						.build()) //
-		;
-	}
-
-}
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImplTest.java
new file mode 100644
index 00000000000..a2ff6c34a54
--- /dev/null
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shellypro3em/IoShellyPro3EmImplTest.java
@@ -0,0 +1,112 @@
+package io.openems.edge.io.shelly.shellypro3em;
+
+import static io.openems.common.types.MeterType.GRID;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import io.openems.edge.bridge.http.api.HttpError;
+import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpBundle;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.meter.api.ElectricityMeter;
+import io.openems.edge.timedata.test.DummyTimedata;
+
+public class IoShellyPro3EmImplTest {
+
+	@Test
+	public void test() throws Exception {
+		final var sut = new IoShellyPro3EmImpl();
+		final var httpTestBundle = new DummyBridgeHttpBundle();
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", httpTestBundle.factory()) //
+				.addReference("timedata", new DummyTimedata("timedata0")) //
+				.activate(MyConfig.create() //
+						.setId("io0") //
+						.setIp("127.0.0.1") //
+						.setType(GRID) //
+						.build()) //
+
+				.next(new TestCase("Successful read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextSuccessfulResult(HttpResponse.ok("""
+											{
+											  "id": 0,
+											  "a_current": 0.593,
+											  "a_voltage": 230.5,
+											  "a_act_power": -75.4,
+											  "a_aprt_power": 136.9,
+											  "a_pf": 0.68,
+											  "a_freq": 50,
+											  "b_current": 11.608,
+											  "b_voltage": 228.5,
+											  "b_act_power": 2655.2,
+											  "b_aprt_power": 2656.6,
+											  "b_pf": 1,
+											  "b_freq": 50,
+											  "c_current": 0.058,
+											  "c_voltage": 232.1,
+											  "c_act_power": 2.1,
+											  "c_aprt_power": 13.5,
+											  "c_pf": 0.54,
+											  "c_freq": 50,
+											  "n_current": null,
+											  "total_current": 12.259,
+											  "total_act_power": 2581.781,
+											  "total_aprt_power": 2806.935,
+											  "user_calibrated_phase": []
+											}
+									"""));
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("L:2582 W", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 2582) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, -75) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, 2655) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, 2) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, 230367) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 230500) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, 228500) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, 232100) //
+						.output(ElectricityMeter.ChannelId.CURRENT, 12259) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, 593) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, 11608) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, 58) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, null) //
+						.output(IoShellyPro3Em.ChannelId.NO_LOAD, false) //
+						.output(IoShellyPro3Em.ChannelId.PHASE_SEQUENCE_ERROR, false) //
+						.output(IoShellyPro3Em.ChannelId.POWER_METER_FAILURE, false) //
+						.output(IoShellyPro3Em.ChannelId.SLAVE_COMMUNICATION_FAILED, false)) //
+
+				.next(new TestCase("Invalid read response") //
+						.onBeforeProcessImage(() -> {
+							httpTestBundle.forceNextFailedResult(HttpError.ResponseError.notFound());
+							httpTestBundle.triggerNextCycle();
+						}) //
+						.onAfterProcessImage(() -> assertEquals("L:UNDEFINED", sut.debugLog()))
+
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, null) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, null) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, null) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, 0L) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, 0L) //
+						.output(IoShellyPro3Em.ChannelId.NO_LOAD, false) //
+						.output(IoShellyPro3Em.ChannelId.PHASE_SEQUENCE_ERROR, false) //
+						.output(IoShellyPro3Em.ChannelId.POWER_METER_FAILURE, false) //
+						.output(IoShellyPro3Em.ChannelId.SLAVE_COMMUNICATION_FAILED, true)) //
+
+				.deactivate();
+	}
+}
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index fc43a22c12f..4a96690019b 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -57,7 +57,7 @@ import { UserModule } from "./user/user.module";
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     CookieService,
     { provide: ErrorHandler, useClass: MyErrorHandler },
-    { provide: LOCALE_ID, useFactory: () => (Language.getByKey(localStorage.LANGUAGE) ?? Language.getByBrowserLang(navigator.language)).key },
+    { provide: LOCALE_ID, useFactory: () => (Language.getByKey(localStorage.LANGUAGE) ?? Language.getByBrowserLang(navigator.language) ?? Language.DEFAULT).key },
     // Use factory for formly. This allows us to use translations in validationMessages.
     { provide: FORMLY_CONFIG, multi: true, useFactory: registerTranslateExtension, deps: [TranslateService] },
     DeviceDetectorService,

From 2574b22fc4b732bd0ffc2a044ba55398a757e9f9 Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Sat, 4 Jan 2025 23:19:29 +0100
Subject: [PATCH 34/49] UI: Overview search: trigger on every input change
 (#2935)

* Fix Search gets only Fired when "Enter" is pressed
---
 ui/src/app/index/overview/overview.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/index/overview/overview.component.html b/ui/src/app/index/overview/overview.component.html
index 62afa44537f..6b6988a838b 100644
--- a/ui/src/app/index/overview/overview.component.html
+++ b/ui/src/app/index/overview/overview.component.html
@@ -42,7 +42,7 @@
                                 <ion-col>
                                     <ion-searchbar
                                         style="--background: var(--ion-color-searchbar-background); color:var(--ion-color-searchbar-text);"
-                                        [(ngModel)]="query" (ionChange)="searchOnChange()">
+                                        [(ngModel)]="query" (ionInput)="searchOnChange()">
                                     </ion-searchbar>
                                 </ion-col>
                             </ion-row>

From 3f12b223e2eb0ece98ca17c1efb163df7be56c58 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 6 Jan 2025 20:03:08 +0100
Subject: [PATCH 35/49] Controller IO Heating Room (#2950)

Controls electric floor and infrared heating in a room.

The Controller activates electric floor and infrared heating in a room in order to keep a configured LOW or HIGH temperature. The timings of LOW or HIGH are configured via a `schedule` configuration parameter.

Additionally:
- Improvements to JSCalendar (this is the first Controller that uses a JSCalendar schedule configuration... more to come!)
- Improvements to core components (JsonUtils, Thermometer, DummyThermometer, DummyInputOutput, etc.)
---
 .../openems/common/jscalendar/JSCalendar.java | 211 +++++---
 .../io/openems/common/utils/JsonUtils.java    |  13 +
 .../common/jscalendar/JSCalendarTest.java     |  74 ++-
 .../common/test/TimeLeapClockTest.java        |   2 +-
 .../openems/common/utils/JsonUtilsTest.java   |   8 +
 io.openems.edge.application/EdgeApp.bndrun    |   2 +
 .../io/openems/edge/common/sum/DummySum.java  |  55 ++
 .../common/test/AbstractComponentTest.java    |  26 +-
 .../.classpath                                |  12 +
 .../.gitignore                                |   2 +
 .../.project                                  |  23 +
 .../org.eclipse.core.resources.prefs          |   2 +
 .../bnd.bnd                                   |  17 +
 .../readme.adoc                               |  45 ++
 .../edge/controller/heating/room/Config.java  |  73 +++
 .../edge/controller/heating/room/Mode.java    |  33 ++
 .../heating/room/RoomHeatingController.java   | 148 ++++++
 .../room/RoomHeatingControllerImpl.java       | 472 ++++++++++++++++++
 .../edge/controller/heating/room/Utils.java   |  29 ++
 .../test/.gitignore                           |   0
 .../controller/heating/room/MyConfig.java     | 204 ++++++++
 .../room/RoomHeatingControllerImplTest.java   | 234 +++++++++
 .../controller/heating/room/UtilsTest.java    |  76 +++
 .../edge/io/test/DummyInputOutput.java        | 136 ++++-
 .../thermometer/OneWireThermometer.java       |   5 +-
 .../test/AbstractDummyThermometer.java        |  26 +
 .../thermometer/test/DummyThermometer.java    |  23 +
 .../edge/thermometer/test/package-info.java   |   3 +
 28 files changed, 1849 insertions(+), 105 deletions(-)
 create mode 100644 io.openems.edge.controller.io.heating.room/.classpath
 create mode 100644 io.openems.edge.controller.io.heating.room/.gitignore
 create mode 100644 io.openems.edge.controller.io.heating.room/.project
 create mode 100644 io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs
 create mode 100644 io.openems.edge.controller.io.heating.room/bnd.bnd
 create mode 100644 io.openems.edge.controller.io.heating.room/readme.adoc
 create mode 100644 io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Config.java
 create mode 100644 io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Mode.java
 create mode 100644 io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingController.java
 create mode 100644 io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingControllerImpl.java
 create mode 100644 io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Utils.java
 create mode 100644 io.openems.edge.controller.io.heating.room/test/.gitignore
 create mode 100644 io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/MyConfig.java
 create mode 100644 io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/RoomHeatingControllerImplTest.java
 create mode 100644 io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/UtilsTest.java
 create mode 100644 io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/AbstractDummyThermometer.java
 create mode 100644 io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/DummyThermometer.java
 create mode 100644 io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/package-info.java

diff --git a/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java b/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
index fcf4e8f06ec..d96cb19793c 100644
--- a/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
+++ b/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
@@ -2,14 +2,15 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
-import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static io.openems.common.utils.JsonUtils.getAsEnum;
-import static io.openems.common.utils.JsonUtils.getAsJsonArray;
 import static io.openems.common.utils.JsonUtils.getAsJsonObject;
-import static io.openems.common.utils.JsonUtils.getAsLocalDateTime;
+import static io.openems.common.utils.JsonUtils.getAsOptionalJsonArray;
+import static io.openems.common.utils.JsonUtils.getAsOptionalJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsOptionalString;
+import static io.openems.common.utils.JsonUtils.getAsOptionalUUID;
+import static io.openems.common.utils.JsonUtils.getAsOptionalZonedDateTime;
 import static io.openems.common.utils.JsonUtils.getAsString;
-import static io.openems.common.utils.JsonUtils.getAsUUID;
-import static io.openems.common.utils.JsonUtils.getAsZonedDateTime;
+import static io.openems.common.utils.JsonUtils.parseToJsonArray;
 import static io.openems.common.utils.JsonUtils.stream;
 import static io.openems.common.utils.JsonUtils.toJsonArray;
 import static java.time.DayOfWeek.FRIDAY;
@@ -19,16 +20,22 @@
 import static java.time.DayOfWeek.THURSDAY;
 import static java.time.DayOfWeek.TUESDAY;
 import static java.time.DayOfWeek.WEDNESDAY;
+import static java.time.LocalDate.EPOCH;
 import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
 import static java.time.temporal.ChronoField.NANO_OF_DAY;
 import static java.time.temporal.TemporalAdjusters.nextOrSame;
 import static java.util.Arrays.stream;
-import static java.util.UUID.randomUUID;
 
 import java.time.DayOfWeek;
+import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 import java.util.NoSuchElementException;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -58,9 +65,33 @@
 public class JSCalendar<PAYLOAD> {
 	// CHECKSTYLE:ON
 
-	public static record Task<PAYLOAD>(UUID uid, ZonedDateTime updated, LocalDateTime start,
+	private static final String PROPERTY_PAYLOAD = "openems.io:payload";
+
+	public static record Task<PAYLOAD>(UUID uid, ZonedDateTime updated, LocalDateTime start, Duration duration,
 			ImmutableList<RecurrenceRule> recurrenceRules, PAYLOAD payload) {
 
+		/**
+		 * Parse a List of {@link Task}s from a String representing a {@link JsonArray}
+		 * - includes checks for null and empty.
+		 * 
+		 * @param <PAYLOAD>     the type of the Payload
+		 * @param string        the {@link JsonArray} string
+		 * @param payloadParser a parser for a Payload
+		 * @return the List of {@link Task}s
+		 */
+		public static <PAYLOAD> ImmutableList<Task<PAYLOAD>> fromStringOrEmpty(String string,
+				ThrowingFunction<JsonObject, PAYLOAD, OpenemsNamedException> payloadParser) {
+			if (string == null || string.isBlank()) {
+				return ImmutableList.of();
+			}
+			try {
+				return fromJson(parseToJsonArray(string), payloadParser);
+			} catch (OpenemsNamedException e) {
+				e.printStackTrace();
+				return ImmutableList.of();
+			}
+		}
+
 		/**
 		 * Parse a List of {@link Task}s from a {@link JsonArray}.
 		 * 
@@ -76,7 +107,7 @@ public static <PAYLOAD> ImmutableList<Task<PAYLOAD>> fromJson(JsonArray json,
 			return stream(json) //
 					.map(j -> {
 						try {
-							return fromJson(JsonUtils.getAsJsonObject(j), payloadParser);
+							return fromJson(getAsJsonObject(j), payloadParser);
 						} catch (OpenemsNamedException e) {
 							e.printStackTrace();
 							throw new NoSuchElementException(e.getMessage());
@@ -121,43 +152,40 @@ public static <PAYLOAD> Task<PAYLOAD> fromJson(JsonObject json,
 			if (!type.equalsIgnoreCase("Task")) {
 				throw new OpenemsException("This is not a 'Task': " + type);
 			}
-			try {
-				var uid = getAsUUID(json, "uid");
-				var updated = getAsZonedDateTime(json, "updated");
-				var start = getAsLocalDateTime(json, "start");
-				var recurrenceRules = stream(getAsJsonArray(json, "recurrenceRules")) //
-						.map(r -> {
-							try {
-								return RecurrenceRule.fromJson(r);
-							} catch (OpenemsNamedException e) {
-								e.printStackTrace();
-								throw new NoSuchElementException(e.getMessage());
-							}
-						}) //
-						.collect(toImmutableList());
-				var payload = payloadParser.apply(getAsJsonObject(json, "payload"));
-				return new Task<PAYLOAD>(uid, updated, start, recurrenceRules, payload);
-
-			} catch (NoSuchElementException e) {
-				throw new OpenemsException("NoSuchElementException: " + e.getMessage());
-			}
+			var b = Task.<PAYLOAD>create() //
+					.setUid(getAsOptionalUUID(json, "uid").orElse(null)) //
+					.setUpdated(getAsOptionalZonedDateTime(json, "updated").orElse(null)) //
+					.setStart(getAsString(json, "start")) //
+					.setDuration(getAsOptionalString(json, "duration").orElse(null)); //
+			getAsOptionalJsonArray(json, "recurrenceRules") //
+					.ifPresent(j -> stream(j) //
+							.forEach(r -> b.addRecurrenceRule(r)));
+			var rawPayload = getAsOptionalJsonObject(json, PROPERTY_PAYLOAD);
+			b.setPayload(rawPayload.isPresent() //
+					? payloadParser.apply(rawPayload.get()) //
+					: null);
+			return b.build();
 		}
 
 		public static class Builder<PAYLOAD> {
-			private final UUID uid;
-			private final ZonedDateTime updated;
-
+			private UUID uid = null;
+			private ZonedDateTime updated = null;
 			private LocalDateTime start = null;
+			private Duration duration = null;
 			private ImmutableList.Builder<RecurrenceRule> recurrenceRules = ImmutableList.builder();
 			private PAYLOAD payload = null;
 
 			protected Builder() {
-				this(randomUUID(), ZonedDateTime.now());
 			}
 
-			protected Builder(UUID uid, ZonedDateTime updated) {
+			public Builder<PAYLOAD> setUid(UUID uid) {
 				this.uid = uid;
+				return this;
+			}
+
+			public Builder<PAYLOAD> setUpdated(ZonedDateTime updated) {
 				this.updated = updated;
+				return this;
 			}
 
 			public Builder<PAYLOAD> setStart(LocalDateTime start) {
@@ -165,11 +193,27 @@ public Builder<PAYLOAD> setStart(LocalDateTime start) {
 				return this;
 			}
 
-			protected Builder<PAYLOAD> setStart(String start) {
-				this.setStart(LocalDateTime.parse(start));
+			public Builder<PAYLOAD> setStart(LocalTime start) {
+				return this.setStart(LocalDateTime.of(EPOCH, start));
+			}
+
+			protected Builder<PAYLOAD> setStart(String start) throws DateTimeParseException {
+				try {
+					return this.setStart(LocalDateTime.parse(start));
+				} catch (DateTimeParseException e) {
+					return this.setStart(LocalTime.parse(start));
+				}
+			}
+
+			public Builder<PAYLOAD> setDuration(Duration duration) {
+				this.duration = duration;
 				return this;
 			}
 
+			protected Builder<PAYLOAD> setDuration(String duration) {
+				return this.setDuration(duration == null ? null : Duration.parse(duration));
+			}
+
 			/**
 			 * Adds a {@link RecurrenceRule}.
 			 * 
@@ -181,6 +225,21 @@ public Builder<PAYLOAD> addRecurrenceRule(RecurrenceRule recurrenceRule) {
 				return this;
 			}
 
+			/**
+			 * Adds a {@link RecurrenceRule}.
+			 * 
+			 * @param json the {@link RecurrenceRule} as {@link JsonObject}
+			 * @return myself
+			 */
+			public Builder<PAYLOAD> addRecurrenceRule(JsonElement json) throws NoSuchElementException {
+				try {
+					return this.addRecurrenceRule(RecurrenceRule.fromJson(json));
+				} catch (OpenemsNamedException e) {
+					e.printStackTrace();
+					throw new NoSuchElementException(e.getMessage());
+				}
+			}
+
 			/**
 			 * Adds a {@link RecurrenceRule}.
 			 * 
@@ -200,8 +259,8 @@ public Builder<PAYLOAD> setPayload(PAYLOAD payload) {
 			}
 
 			public Task<PAYLOAD> build() {
-				return new Task<PAYLOAD>(this.uid, this.updated, this.start, this.recurrenceRules.build(),
-						this.payload);
+				return new Task<PAYLOAD>(this.uid, this.updated, this.start, this.duration,
+						this.recurrenceRules.build(), this.payload);
 			}
 		}
 
@@ -223,11 +282,22 @@ public static <PAYLOAD> Builder<PAYLOAD> create() {
 		 */
 		public JsonObject toJson(Function<PAYLOAD, JsonObject> payloadConverter) {
 			var j = JsonUtils.buildJsonObject() //
-					.addProperty("@type", "Task") //
-					.addProperty("uid", this.uid.toString()) //
-					.addProperty("updated", this.updated.format(ISO_INSTANT));
+					.addProperty("@type", "Task");
+			if (this.uid != null) {
+				j.addProperty("uid", this.uid.toString());
+			}
+			if (this.updated != null) {
+				j.addProperty("updated", this.updated.format(ISO_INSTANT));
+			}
 			if (this.start != null) {
-				j.addProperty("start", this.start.format(ISO_LOCAL_DATE_TIME));
+				if (LocalDate.from(this.start).equals(EPOCH)) {
+					j.addProperty("start", this.start.format(DateTimeFormatter.ISO_LOCAL_TIME));
+				} else {
+					j.addProperty("start", this.start.format(ISO_LOCAL_DATE_TIME));
+				}
+			}
+			if (this.duration != null) {
+				j.addProperty("duration", this.duration.toString());
 			}
 			if (!this.recurrenceRules.isEmpty()) {
 				j.add("recurrenceRules", this.recurrenceRules.stream() //
@@ -235,21 +305,25 @@ public JsonObject toJson(Function<PAYLOAD, JsonObject> payloadConverter) {
 						.collect(toJsonArray()));
 			}
 			if (this.payload != null) {
-				j.add("payload", payloadConverter.apply(this.payload));
+				j.add(PROPERTY_PAYLOAD, payloadConverter.apply(this.payload));
 			}
 			return j.build();
 		}
 
 		/**
-		 * Gets the next occurence of the {@link Task} at or after a date.
+		 * Gets the next occurence of the {@link Task} (including duration) at or after
+		 * a date.
 		 * 
 		 * @param from the from timestamp
 		 * @return a {@link ZonedDateTime}
 		 */
 		public ZonedDateTime getNextOccurence(ZonedDateTime from) {
+			var f = this.duration == null //
+					? from //
+					: from.minus(this.duration); // query active tasks
 			var start = this.start.atZone(from.getZone());
 			return this.recurrenceRules.stream() //
-					.map(rr -> rr.getNextOccurence(from.isBefore(start) ? start : from, start)) //
+					.map(rr -> rr.getNextOccurence(f.isBefore(start) ? start : f, start)) //
 					.min((o1, o2) -> o1.toInstant().compareTo(o2.toInstant())) //
 					.orElse(null);
 		}
@@ -282,18 +356,20 @@ public record RecurrenceRule(RecurrenceFrequency frequency, ImmutableSortedSet<D
 		 */
 		public static RecurrenceRule fromJson(JsonElement json) throws OpenemsNamedException, NoSuchElementException {
 			var frequency = getAsEnum(RecurrenceFrequency.class, json, "frequency");
-			var byDay = stream(getAsJsonArray(json, "byDay")) //
-					.map(j -> switch (JsonUtils.getAsOptionalString(j).orElseThrow()) {
-					case "mo" -> MONDAY;
-					case "tu" -> TUESDAY;
-					case "we" -> WEDNESDAY;
-					case "th" -> THURSDAY;
-					case "fr" -> FRIDAY;
-					case "sa" -> SATURDAY;
-					case "su" -> SUNDAY;
-					default -> throw new NoSuchElementException("");
-					}) //
-					.collect(toImmutableSortedSet(Ordering.natural()));
+			var byDay = getAsOptionalJsonArray(json, "byDay") //
+					.map(arr -> stream(arr) //
+							.map(j -> switch (getAsOptionalString(j).orElseThrow()) {
+							case "mo" -> MONDAY;
+							case "tu" -> TUESDAY;
+							case "we" -> WEDNESDAY;
+							case "th" -> THURSDAY;
+							case "fr" -> FRIDAY;
+							case "sa" -> SATURDAY;
+							case "su" -> SUNDAY;
+							default -> throw new NoSuchElementException("");
+							}) //
+							.collect(toImmutableSortedSet(Ordering.natural()))) //
+					.orElse(ImmutableSortedSet.of());
 			return new RecurrenceRule(frequency, byDay);
 		}
 
@@ -342,21 +418,36 @@ public static Builder create() {
 		 * @return a {@link ZonedDateTime}
 		 */
 		public ZonedDateTime getNextOccurence(ZonedDateTime from, ZonedDateTime start) {
-			if (this.frequency == WEEKLY) {
+			final var startTime = start.toLocalTime();
+
+			return switch (this.frequency) {
+			case DAILY -> {
+				var resultDay = from.truncatedTo(ChronoUnit.DAYS);
+				if (from.toLocalTime().isAfter(startTime)) {
+					resultDay = from.plusDays(1);
+				}
+				yield resultDay.with(NANO_OF_DAY, startTime.toNanoOfDay());
+			}
+			case WEEKLY -> {
 				if (!this.byDay.isEmpty()) {
-					var startTime = start.toLocalTime();
 					var nextByDay = this.byDay.ceiling(from.toLocalTime().isAfter(startTime) //
 							? from.getDayOfWeek().plus(1) // next day
 							: from.getDayOfWeek()); // same day
 					if (nextByDay == null) {
 						nextByDay = this.byDay.first();
 					}
-					return from //
+					yield from //
 							.with(nextOrSame(nextByDay)) //
 							.with(NANO_OF_DAY, startTime.toNanoOfDay());
 				}
+				// TODO: If frequency is weekly and there is no byDay property, add a byDay
+				// property with the sole value being the day of the week of the initial
+				// date-time.
+				yield null; // not implemented
 			}
-			return null;
+			case MONTHLY -> null; // not implemented
+			case YEARLY -> null; // not implemented
+			};
 		}
 
 		/**
diff --git a/io.openems.common/src/io/openems/common/utils/JsonUtils.java b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
index 1ead2112db3..954e55fa99d 100644
--- a/io.openems.common/src/io/openems/common/utils/JsonUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
@@ -1759,6 +1759,19 @@ public static LocalDateTime getAsLocalDateTime(JsonElement jElement, String memb
 		return DateUtils.parseLocalDateTimeOrError(toString(toPrimitive(toSubElement(jElement, memberName))));
 	}
 
+	/**
+	 * Takes a JSON in the form '2020-01-01T00:00:00' and converts it to a
+	 * {@link LocalDateTime}.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member of the JsonObject
+	 * @return the {@link ZonedDateTime}
+	 */
+	public static Optional<LocalDateTime> getAsOptionalLocalDateTime(JsonElement jElement, String memberName) {
+		return JsonUtils.getAsOptionalString(jElement, memberName)//
+				.map(DateUtils::parseLocalDateTimeOrNull);
+	}
+
 	/**
 	 * Takes a JSON in the form '2020-01-01T00:00:00Z' and converts it to a
 	 * {@link ZonedDateTime}.
diff --git a/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java b/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
index 73061feb84a..689368466fd 100644
--- a/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
+++ b/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
@@ -1,10 +1,11 @@
 package io.openems.common.jscalendar;
 
+import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.DAILY;
 import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.WEEKLY;
 import static io.openems.common.test.TestUtils.createDummyClock;
+import static io.openems.common.utils.JsonUtils.buildJsonArray;
 import static io.openems.common.utils.JsonUtils.buildJsonObject;
 import static io.openems.common.utils.JsonUtils.prettyToString;
-import static io.openems.common.utils.UuidUtils.getNilUuid;
 import static java.time.DayOfWeek.FRIDAY;
 import static java.time.DayOfWeek.MONDAY;
 import static java.time.DayOfWeek.SATURDAY;
@@ -22,17 +23,51 @@
 import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.common.utils.JsonUtils;
 
 //CHECKSTYLE:OFF
 public class JSCalendarTest {
 	// CHECKSTYLE:ON
 
+	@Test
+	public void testDaily() throws OpenemsNamedException {
+		var clock = createDummyClock();
+		var sut = JSCalendar.Task.<JsonObject>create() //
+				.setStart("07:00:00") //
+				.addRecurrenceRule(b -> b //
+						.setFrequency(DAILY)) //
+				.build();
+
+		var next = sut.getNextOccurence(ZonedDateTime.now(clock));
+		assertEquals("2020-01-01T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2020-01-02T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2020-01-03T07:00Z", next.toString());
+	}
+
+	@Test
+	public void testDailyParse() throws OpenemsNamedException {
+		var sut = JSCalendar.Task.fromStringOrEmpty("""
+				[
+				   {
+				      "@type":"Task",
+				      "start":"19:00:00",
+				      "duration":"PT12H",
+				      "recurrenceRules":[
+				         {
+				            "frequency":"daily"
+				         }
+				      ]
+				   }
+				]""", j -> j);
+		assertEquals(1, sut.size());
+	}
+
 	@Test
 	public void testWeekday() throws OpenemsNamedException {
 		var clock = createDummyClock();
-		var sut = new JSCalendar.Task.Builder<JsonObject>(getNilUuid(), ZonedDateTime.now(clock)) //
-				.setStart("2024-06-17T07:00:00") //
+		var sut = JSCalendar.Task.<JsonObject>create() //
+				.setStart("07:00:00") //
 				.addRecurrenceRule(b -> b //
 						.setFrequency(WEEKLY) //
 						.addByDay(MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY)) //
@@ -40,12 +75,11 @@ public void testWeekday() throws OpenemsNamedException {
 						.addProperty("sessionEnergy", 10000) //
 						.build()) //
 				.build();
+
 		assertEquals("""
 				{
 				  "@type": "Task",
-				  "uid": "00000000-0000-0000-0000-000000000000",
-				  "updated": "2020-01-01T00:00:00Z",
-				  "start": "2024-06-17T07:00:00",
+				  "start": "07:00:00",
 				  "recurrenceRules": [
 				    {
 				      "frequency": "weekly",
@@ -58,28 +92,28 @@ public void testWeekday() throws OpenemsNamedException {
 				      ]
 				    }
 				  ],
-				  "payload": {
+				  "openems.io:payload": {
 				    "sessionEnergy": 10000
 				  }
 				}""", prettyToString(sut.toJson(identity())));
 
 		var next = sut.getNextOccurence(ZonedDateTime.now(clock));
-		assertEquals("2024-06-17T07:00Z", next.toString());
+		assertEquals("2020-01-01T07:00Z", next.toString());
+		next = sut.getNextOccurence(next.plusSeconds(1));
+		assertEquals("2020-01-02T07:00Z", next.toString());
 		next = sut.getNextOccurence(next.plusSeconds(1));
-		assertEquals("2024-06-18T07:00Z", next.toString());
+		assertEquals("2020-01-03T07:00Z", next.toString());
 		next = sut.getNextOccurence(next.plusSeconds(1));
-		assertEquals("2024-06-19T07:00Z", next.toString());
+		assertEquals("2020-01-06T07:00Z", next.toString()); // next week
 		next = sut.getNextOccurence(next.plusSeconds(1));
-		assertEquals("2024-06-20T07:00Z", next.toString());
+		assertEquals("2020-01-07T07:00Z", next.toString());
 		next = sut.getNextOccurence(next.plusSeconds(1));
-		assertEquals("2024-06-21T07:00Z", next.toString());
-		next = sut.getNextOccurence(next.plusSeconds(1)); // next week
-		assertEquals("2024-06-24T07:00Z", next.toString());
+		assertEquals("2020-01-08T07:00Z", next.toString());
 		next = sut.getNextOccurence(next);
-		assertEquals("2024-06-24T07:00Z", next.toString()); // same
+		assertEquals("2020-01-08T07:00Z", next.toString()); // same
 
 		// Parse JSON
-		var fromJson = JSCalendar.Task.fromJson(JsonUtils.buildJsonArray() //
+		var fromJson = JSCalendar.Task.fromJson(buildJsonArray() //
 				.add(sut.toJson(identity())) //
 				.build(), j -> j);
 		assertEquals(sut.toJson(identity()), fromJson.get(0).toJson(identity()));
@@ -88,7 +122,7 @@ public void testWeekday() throws OpenemsNamedException {
 	@Test
 	public void testWeekend() throws OpenemsNamedException {
 		var clock = createDummyClock();
-		var sut = new JSCalendar.Task.Builder<JsonObject>(getNilUuid(), ZonedDateTime.now(clock)) //
+		var sut = JSCalendar.Task.<JsonObject>create() //
 				.setStart("2024-06-17T00:00:00") //
 				.addRecurrenceRule(b -> b //
 						.setFrequency(WEEKLY) //
@@ -100,8 +134,6 @@ public void testWeekend() throws OpenemsNamedException {
 		assertEquals("""
 				{
 				  "@type": "Task",
-				  "uid": "00000000-0000-0000-0000-000000000000",
-				  "updated": "2020-01-01T00:00:00Z",
 				  "start": "2024-06-17T00:00:00",
 				  "recurrenceRules": [
 				    {
@@ -112,7 +144,7 @@ public void testWeekend() throws OpenemsNamedException {
 				      ]
 				    }
 				  ],
-				  "payload": {
+				  "openems.io:payload": {
 				    "sessionEnergy": 10001
 				  }
 				}""", prettyToString(sut.toJson(identity())));
diff --git a/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java b/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java
index 3609efce3a5..6c7485a35ce 100644
--- a/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java
+++ b/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java
@@ -52,7 +52,7 @@ public void testMillis() {
 
 	@Test
 	public void testLeap() {
-		var dateTime = ZonedDateTime.now();
+		var dateTime = ZonedDateTime.of(2023, 1, 2, 3, 4, 5, 6, ZoneId.of("UTC"));
 
 		final var instant = dateTime.toInstant();
 		final var zone = dateTime.getZone();
diff --git a/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java b/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
index de06b6e2bd3..37f25ae848b 100644
--- a/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
+++ b/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
@@ -54,10 +54,12 @@
 import static io.openems.common.utils.JsonUtils.getAsOptionalInt;
 import static io.openems.common.utils.JsonUtils.getAsOptionalJsonArray;
 import static io.openems.common.utils.JsonUtils.getAsOptionalJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsOptionalLocalDateTime;
 import static io.openems.common.utils.JsonUtils.getAsOptionalLong;
 import static io.openems.common.utils.JsonUtils.getAsOptionalShort;
 import static io.openems.common.utils.JsonUtils.getAsOptionalString;
 import static io.openems.common.utils.JsonUtils.getAsOptionalUUID;
+import static io.openems.common.utils.JsonUtils.getAsOptionalZonedDateTime;
 import static io.openems.common.utils.JsonUtils.getAsPrimitive;
 import static io.openems.common.utils.JsonUtils.getAsShort;
 import static io.openems.common.utils.JsonUtils.getAsString;
@@ -688,11 +690,17 @@ public void testGetAsZonedDateTime() throws OpenemsNamedException {
 		);
 
 		assertEquals("1900-01-01T00:00Z", getAsZonedDateTime(JSON_OBJECT, "ZonedDateTime").toString());
+
+		assertTrue(getAsOptionalZonedDateTime(JSON_OBJECT, "foo").isEmpty());
 	}
 
 	@Test
 	public void testGetAsLocalDateTime() throws OpenemsNamedException {
 		assertEquals("1900-01-01T00:00", getAsLocalDateTime(JSON_OBJECT, "LocalDateTime").toString());
+
+		assertEquals("1900-01-01T00:00", getAsOptionalLocalDateTime(JSON_OBJECT, "LocalDateTime").get().toString());
+
+		assertTrue(getAsOptionalLocalDateTime(JSON_OBJECT, "foo").isEmpty());
 	}
 
 	@Test
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index c1afa91dad3..63598ac0cd9 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -96,6 +96,7 @@
 	bnd.identity;id='io.openems.edge.controller.io.analog',\
 	bnd.identity;id='io.openems.edge.controller.io.channelsinglethreshold',\
 	bnd.identity;id='io.openems.edge.controller.io.fixdigitaloutput',\
+	bnd.identity;id='io.openems.edge.controller.io.heating.room',\
 	bnd.identity;id='io.openems.edge.controller.io.heatingelement',\
 	bnd.identity;id='io.openems.edge.controller.io.heatpump.sgready',\
 	bnd.identity;id='io.openems.edge.controller.pvinverter.fixpowerlimit',\
@@ -272,6 +273,7 @@
 	io.openems.edge.controller.io.analog;version=snapshot,\
 	io.openems.edge.controller.io.channelsinglethreshold;version=snapshot,\
 	io.openems.edge.controller.io.fixdigitaloutput;version=snapshot,\
+	io.openems.edge.controller.io.heating.room;version=snapshot,\
 	io.openems.edge.controller.io.heatingelement;version=snapshot,\
 	io.openems.edge.controller.io.heatpump.sgready;version=snapshot,\
 	io.openems.edge.controller.pvinverter.fixpowerlimit;version=snapshot,\
diff --git a/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java b/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java
index 2a2b9bd7568..64d093c8511 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java
@@ -93,4 +93,59 @@ public DummySum withEssMaxDischargePower(int value) {
 		return this.self();
 	}
 
+	/**
+	 * Set {@link Sum.ChannelId#GRID_BUY_ACTIVE_ENERGY}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public DummySum withGridBuyActiveEnergy(long value) {
+		withValue(this, Sum.ChannelId.GRID_BUY_ACTIVE_ENERGY, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Sum.ChannelId#GRID_SELL_ACTIVE_ENERGY}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public DummySum withGridSellActiveEnergy(long value) {
+		withValue(this, Sum.ChannelId.GRID_SELL_ACTIVE_ENERGY, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Sum.ChannelId#ESS_ACTIVE_CHARGE_ENERGY}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public DummySum withEssActiveChargeEnergy(long value) {
+		withValue(this, Sum.ChannelId.ESS_ACTIVE_CHARGE_ENERGY, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Sum.ChannelId#ESS_ACTIVE_DISCHARGE_ENERGY}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public DummySum withEssActiveDischargeEnergy(long value) {
+		withValue(this, Sum.ChannelId.ESS_ACTIVE_DISCHARGE_ENERGY, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Sum.ChannelId#CONSUMPTION_ACTIVE_ENERGY}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public DummySum withConsumptionActiveEnergy(long value) {
+		withValue(this, Sum.ChannelId.CONSUMPTION_ACTIVE_ENERGY, value);
+		return this.self();
+	}
+
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
index 9096c7d91ef..fc7b59be4aa 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
@@ -3,6 +3,13 @@
 import static io.openems.common.utils.ReflectionUtils.invokeMethodViaReflection;
 import static io.openems.common.utils.ReflectionUtils.invokeMethodWithoutArgumentsViaReflection;
 import static io.openems.common.utils.ReflectionUtils.setAttributeViaReflection;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_CONTROLLERS;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_WRITE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_BEFORE_CONTROLLERS;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_BEFORE_WRITE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -900,31 +907,30 @@ public SELF next(TestCase testCase) throws Exception {
 		testCase.applyTimeLeap();
 		this.onBeforeProcessImage();
 		executeCallbacks(testCase.onBeforeProcessImageCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE);
-		for (Channel<?> channel : this.getSut().channels()) {
-			channel.nextProcessImage();
-		}
+		this.handleEvent(TOPIC_CYCLE_BEFORE_PROCESS_IMAGE);
+		this.sut.channels() //
+				.forEach(Channel::nextProcessImage);
 		testCase.applyInputs(this);
 		this.onAfterProcessImage();
 		executeCallbacks(testCase.onAfterProcessImageCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE);
+		this.handleEvent(TOPIC_CYCLE_AFTER_PROCESS_IMAGE);
 		this.onBeforeControllers();
 		executeCallbacks(testCase.onBeforeControllersCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_BEFORE_CONTROLLERS);
+		this.handleEvent(TOPIC_CYCLE_BEFORE_CONTROLLERS);
 		this.onExecuteControllers();
 		executeCallbacks(testCase.onExecuteControllersCallbacks);
 		this.onAfterControllers();
 		executeCallbacks(testCase.onAfterControllersCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_AFTER_CONTROLLERS);
+		this.handleEvent(TOPIC_CYCLE_AFTER_CONTROLLERS);
 		this.onBeforeWrite();
 		executeCallbacks(testCase.onBeforeWriteCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_BEFORE_WRITE);
+		this.handleEvent(TOPIC_CYCLE_BEFORE_WRITE);
 		this.onExecuteWrite();
 		executeCallbacks(testCase.onExecuteWriteCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE);
+		this.handleEvent(TOPIC_CYCLE_EXECUTE_WRITE);
 		this.onAfterWrite();
 		executeCallbacks(testCase.onAfterWriteCallbacks);
-		this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_AFTER_WRITE);
+		this.handleEvent(TOPIC_CYCLE_AFTER_WRITE);
 		testCase.validateOutputs(this);
 		return this.self();
 	}
diff --git a/io.openems.edge.controller.io.heating.room/.classpath b/io.openems.edge.controller.io.heating.room/.classpath
new file mode 100644
index 00000000000..b4cffd0fe60
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/io.openems.edge.controller.io.heating.room/.gitignore b/io.openems.edge.controller.io.heating.room/.gitignore
new file mode 100644
index 00000000000..c2b941a96de
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.gitignore
@@ -0,0 +1,2 @@
+/bin_test/
+/generated/
diff --git a/io.openems.edge.controller.io.heating.room/.project b/io.openems.edge.controller.io.heating.room/.project
new file mode 100644
index 00000000000..b63b02b9297
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openems.edge.controller.io.heating.room</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>
diff --git a/io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs b/io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/io.openems.edge.controller.io.heating.room/bnd.bnd b/io.openems.edge.controller.io.heating.room/bnd.bnd
new file mode 100644
index 00000000000..80110260ed9
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/bnd.bnd
@@ -0,0 +1,17 @@
+Bundle-Name: OpenEMS Edge Controller IO Heating Room
+Bundle-Vendor: OpenEMS Association e.V.
+Bundle-License: https://opensource.org/licenses/EPL-2.0
+Bundle-Version: 1.0.0.${tstamp}
+
+-buildpath: \
+	${buildpath},\
+	io.openems.common,\
+	io.openems.edge.common,\
+	io.openems.edge.controller.api,\
+	io.openems.edge.io.api,\
+	io.openems.edge.meter.api,\
+	io.openems.edge.thermometer.api,\
+	io.openems.edge.timedata.api,\
+
+-testpath: \
+	${testpath}
diff --git a/io.openems.edge.controller.io.heating.room/readme.adoc b/io.openems.edge.controller.io.heating.room/readme.adoc
new file mode 100644
index 00000000000..849e0c1ff29
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/readme.adoc
@@ -0,0 +1,45 @@
+= IO Heating Room
+
+Controls electric floor and infrared heating in a room.
+
+The Controller activates electric floor and infrared heating in a room in order to keep a configured LOW or HIGH temperature. 
+The timings of LOW or HIGH are configured via a `schedule` configuration parameter. 
+It holds a JsonArray with JSCalendar information, e.g.
+
+----
+[
+   {
+      "@type":"Task",
+      "start":"05:30:00",
+      "duration":"PT2H30M",
+      "recurrenceRules":[
+         {
+            "frequency":"weekly",
+            "byDay":[
+               "mo",
+               "tu",
+               "we",
+               "th",
+               "fr"
+            ]
+         }
+      ]
+   },
+   {
+      "@type":"Task",
+      "start":"08:00:00",
+      "duration":"PT16H",
+      "recurrenceRules":[
+         {
+            "frequency":"weekly",
+            "byDay":[
+               "sa",
+               "su"
+            ]
+         }
+      ]
+   }
+]
+----
+
+https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.controller.io.heating.room[Source Code icon:github[]]
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Config.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Config.java
new file mode 100644
index 00000000000..375398a3a66
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Config.java
@@ -0,0 +1,73 @@
+package io.openems.edge.controller.heating.room;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition(//
+		name = "Controller Heating Room", //
+		description = "Controls electric floor and infrared heating in a room")
+@interface Config {
+
+	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+	String id() default "ctrlHeatingRoom0";
+
+	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+	String alias() default "";
+
+	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+	boolean enabled() default true;
+
+	@AttributeDefinition(name = "Mode", description = "Heating control mode")
+	Mode mode() default Mode.AUTOMATIC;
+
+	@AttributeDefinition(name = "JSON Schedule in AUTOMATIC Mode", description = "Takes a Json-Array in JSCalendar format")
+	String schedule() default "";
+
+	@AttributeDefinition(name = "Low Floor Temperature", description = "The target floor temperature in LOW mode (in 0.1 degree celsius)")
+	int lowFloorTemperature();
+
+	@AttributeDefinition(name = "Low Ambient Temperature", description = "The target ambient temperature in LOW mode (in 0.1 degree celsius)")
+	int lowAmbientTemperature();
+
+	@AttributeDefinition(name = "High Floor Temperature", description = "The target floor temperature in HIGH mode (in 0.1 degree celsius)")
+	int highFloorTemperature();
+
+	@AttributeDefinition(name = "High Ambient Temperature", description = "The target ambient temperature in HIGH mode (in 0.1 degree celsius)")
+	int highAmbientTemperature();
+
+	@AttributeDefinition(name = "Floor Thermometer ID", description = "Component-ID of the Floor Thermometer")
+	String floorThermometer_id();
+
+	@AttributeDefinition(name = "Ambient Thermometer ID", description = "Component-ID of the Ambient Air Thermometer")
+	String ambientThermometer_id();
+
+	@AttributeDefinition(name = "Floor Heating Relay(s)", description = "Channel addresses of the Relays for Floor Heating")
+	String[] floorRelays();
+
+	@AttributeDefinition(name = "Infrared Heating Relay(s)", description = "Channel addresses of the Relays for Infrared Heating")
+	String[] infraredRelays();
+
+	@AttributeDefinition(name = "Floor Heating Power", description = "The switched power of the floor heating (in Watt)")
+	int floorPower();
+
+	@AttributeDefinition(name = "Infrared Heating Power", description = "The switched power of the infrared heating (in Watt)")
+	int infraredPower();
+
+	@AttributeDefinition(name = "Has external ambient heating?", description = "Is there an external ambient heating in this room - like a wood stove")
+	boolean hasExternalAmbientHeating();
+
+	@AttributeDefinition(name = "Floor Thermometer target filter", description = "This is auto-generated by 'Floor Thermometer ID'")
+	String floorThermometer_target() default "(enabled=true)";
+
+	@AttributeDefinition(name = "Ambient Thermometer target filter", description = "This is auto-generated by 'Ambient Thermometer ID'")
+	String ambientThermometer_target() default "(enabled=true)";
+
+	@AttributeDefinition(name = "Floor Relay Components target filter", description = "This is auto-generated by 'Floor Heating Relay(s)'")
+	String floorRelayComponents_target() default "(enabled=true)";
+
+	@AttributeDefinition(name = "Infrared Relay Components target filter", description = "This is auto-generated by 'Infrared Heating Relay(s)'")
+	String infraredRelayComponents_target() default "(enabled=true)";
+
+	String webconsole_configurationFactory_nameHint() default "Controller Heating Room [{id}]";
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Mode.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Mode.java
new file mode 100644
index 00000000000..af978519d8f
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Mode.java
@@ -0,0 +1,33 @@
+package io.openems.edge.controller.heating.room;
+
+import io.openems.common.types.OptionsEnum;
+
+public enum Mode implements OptionsEnum {
+	OFF(0, "Off"), //
+	MANUAL_LOW(1, "Manual Low"), //
+	MANUAL_HIGH(2, "Manual High"), //
+	AUTOMATIC(3, "Automatic schedule control"); //
+
+	private final int value;
+	private final String name;
+
+	private Mode(int value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return OFF;
+	}
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingController.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingController.java
new file mode 100644
index 00000000000..f2481a48229
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingController.java
@@ -0,0 +1,148 @@
+package io.openems.edge.controller.heating.room;
+
+import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.IntegerReadChannel;
+import io.openems.edge.common.channel.value.Value;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.meter.api.ElectricityMeter;
+
+public interface RoomHeatingController extends Controller, ElectricityMeter, OpenemsComponent {
+
+	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+		FLOOR_ACTUAL(Doc.of(OpenemsType.INTEGER)), //
+		FLOOR_TARGET(Doc.of(OpenemsType.INTEGER)), //
+		AMBIENT_ACTUAL(Doc.of(OpenemsType.INTEGER)), //
+		AMBIENT_TARGET(Doc.of(OpenemsType.INTEGER)), //
+		;
+
+		private final Doc doc;
+
+		private ChannelId(Doc doc) {
+			this.doc = doc;
+		}
+
+		@Override
+		public Doc doc() {
+			return this.doc;
+		}
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#FLOOR_ACTUAL}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getFloorActualChannel() {
+		return this.channel(ChannelId.FLOOR_ACTUAL);
+	}
+
+	/**
+	 * Gets the Floor Actual Temperature in [deci degC]. See
+	 * {@link ChannelId#FLOOR_ACTUAL}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default Value<Integer> getFloorActual() {
+		return this.getFloorActualChannel().value();
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#FLOOR_ACTUAL}
+	 * Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setFloorActual(Integer value) {
+		this.getFloorActualChannel().setNextValue(value);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#FLOOR_TARGET}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getFloorTargetChannel() {
+		return this.channel(ChannelId.FLOOR_TARGET);
+	}
+
+	/**
+	 * Gets the Floor Target Temperature in [deci degC]. See
+	 * {@link ChannelId#FLOOR_TARGET}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default Value<Integer> getFloorTarget() {
+		return this.getFloorTargetChannel().value();
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#FLOOR_TARGET}
+	 * Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setFloorTarget(Integer value) {
+		this.getFloorTargetChannel().setNextValue(value);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#AMBIENT_ACTUAL}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getAmbientActualChannel() {
+		return this.channel(ChannelId.AMBIENT_ACTUAL);
+	}
+
+	/**
+	 * Gets the Ambient Actual Temperature in [deci degC]. See
+	 * {@link ChannelId#AMBIENT_ACTUAL}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default Value<Integer> getAmbientActual() {
+		return this.getAmbientActualChannel().value();
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#AMBIENT_ACTUAL}
+	 * Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setAmbientActual(Integer value) {
+		this.getAmbientActualChannel().setNextValue(value);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#AMBIENT_TARGET}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getAmbientTargetChannel() {
+		return this.channel(ChannelId.AMBIENT_TARGET);
+	}
+
+	/**
+	 * Gets the Ambient Target Temperature in [deci degC]. See
+	 * {@link ChannelId#AMBIENT_TARGET}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default Value<Integer> getAmbientTarget() {
+		return this.getAmbientTargetChannel().value();
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#AMBIENT_TARGET}
+	 * Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setAmbientTarget(Integer value) {
+		this.getAmbientTargetChannel().setNextValue(value);
+	}
+
+}
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingControllerImpl.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingControllerImpl.java
new file mode 100644
index 00000000000..22e08ec6215
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/RoomHeatingControllerImpl.java
@@ -0,0 +1,472 @@
+package io.openems.edge.controller.heating.room;
+
+import static io.openems.edge.controller.heating.room.Utils.getNextHighPeriod;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.jscalendar.JSCalendar;
+import io.openems.common.jscalendar.JSCalendar.Task;
+import io.openems.common.types.ChannelAddress;
+import io.openems.common.types.MeterType;
+import io.openems.edge.common.channel.BooleanWriteChannel;
+import io.openems.edge.common.channel.WriteChannel;
+import io.openems.edge.common.component.AbstractOpenemsComponent;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.heating.room.Utils.HighPeriod;
+import io.openems.edge.io.api.DigitalOutput;
+import io.openems.edge.meter.api.ElectricityMeter;
+import io.openems.edge.thermometer.api.Thermometer;
+import io.openems.edge.timedata.api.Timedata;
+import io.openems.edge.timedata.api.TimedataProvider;
+import io.openems.edge.timedata.api.utils.CalculateEnergyFromPower;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+		name = "Controller.IO.Heating.Room", //
+		immediate = true, //
+		configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class RoomHeatingControllerImpl extends AbstractOpenemsComponent
+		implements RoomHeatingController, Controller, ElectricityMeter, OpenemsComponent, TimedataProvider {
+
+	private static final int MINIMUM_SWITCHING_TIME = 180; // [s]
+
+	private final Logger log = LoggerFactory.getLogger(RoomHeatingControllerImpl.class);
+	private final Clock clock;
+	private final CalculateEnergyFromPower calculateEnergy = new CalculateEnergyFromPower(this,
+			ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY);
+
+	@Reference
+	private ConfigurationAdmin cm;
+
+	@Reference
+	private Timedata timedata;
+
+	@Reference(policyOption = ReferencePolicyOption.GREEDY)
+	private Thermometer floorThermometer;
+
+	@Reference(policyOption = ReferencePolicyOption.GREEDY)
+	private Thermometer ambientThermometer;
+
+	@Reference(policyOption = ReferencePolicyOption.GREEDY)
+	private List<DigitalOutput> floorRelayComponents;
+
+	@Reference(policyOption = ReferencePolicyOption.GREEDY)
+	private List<DigitalOutput> infraredRelayComponents;
+
+	private Config config = null;
+	private ImmutableList<Task<JsonObject>> schedule = ImmutableList.of();
+	private final List<ChannelAddress> floorRelays = new ArrayList<>();
+	private final List<ChannelAddress> infraredRelays = new ArrayList<>();
+
+	private HighPeriod highPeriod;
+	private RelayState lastFloorRelayState = null;
+	private RelayState lastInfraredRelayState = null;
+
+	public RoomHeatingControllerImpl(Clock clock) {
+		super(//
+				OpenemsComponent.ChannelId.values(), //
+				ElectricityMeter.ChannelId.values(), //
+				Controller.ChannelId.values(), //
+				RoomHeatingController.ChannelId.values() //
+		);
+		this.clock = clock;
+
+		// Set static Meter channels
+		this._setActiveConsumptionEnergy(0);
+		this._setReactivePower(0);
+	}
+
+	public RoomHeatingControllerImpl() {
+		this(Clock.systemDefaultZone());
+	}
+
+	@Activate
+	private void activate(ComponentContext context, Config config) throws OpenemsNamedException {
+		super.activate(context, config.id(), config.alias(), config.enabled());
+		this.applyConfig(config);
+	}
+
+	@Modified
+	private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
+		this.applyConfig(config);
+		super.modified(context, config.id(), config.alias(), config.enabled());
+	}
+
+	@Deactivate
+	protected void deactivate() {
+		super.deactivate();
+	}
+
+	@Override
+	public synchronized void run() throws OpenemsNamedException {
+		this.applyHeatingLogic();
+		this.updateMeterValues();
+	}
+
+	/**
+	 * Applies the actual heating logic.
+	 */
+	private void applyHeatingLogic() {
+		/*
+		 * Evaluate actual temperatures
+		 */
+		var floorActual = this.floorThermometer.getTemperature();
+		var ambientActual = this.ambientThermometer.getTemperature();
+		this._setFloorActual(floorActual.get());
+		this._setAmbientActual(ambientActual.get());
+
+		/*
+		 * Evaluate target temperatures
+		 */
+		final var actualMode = switch (this.config.mode()) {
+		case AUTOMATIC -> this.getActualModeFromSchedule();
+		case MANUAL_HIGH -> ActualMode.HIGH;
+		case MANUAL_LOW -> ActualMode.LOW;
+		case OFF -> ActualMode.OFF;
+		};
+		var floorTarget = switch (actualMode) {
+		case HIGH -> this.config.highFloorTemperature();
+		case LOW -> this.config.lowFloorTemperature();
+		case OFF -> null;
+		};
+		var ambientTarget = switch (actualMode) {
+		case HIGH -> this.config.highAmbientTemperature();
+		case LOW -> this.config.lowAmbientTemperature();
+		case OFF -> null;
+		};
+		this._setFloorTarget(floorTarget);
+		this._setAmbientTarget(ambientTarget);
+
+		/*
+		 * Control floor heating
+		 */
+		if (floorActual.isDefined() && floorTarget != null && floorActual.get() < floorTarget) {
+			if (this.config.hasExternalAmbientHeating() //
+					&& ambientActual.isDefined() && ambientTarget != null && ambientActual.get() > ambientTarget) {
+				// Switch Floor heating OFF if there is external heating in the room and ambient
+				// target temperature is already met
+				this.switchFloorRelays(Switch.OFF);
+			} else {
+				this.switchFloorRelays(Switch.ON);
+			}
+
+		} else {
+			this.switchFloorRelays(Switch.OFF);
+		}
+
+		/*
+		 * Control infrared heating
+		 */
+		if (ambientActual.isDefined() && ambientTarget != null && ambientActual.get() < ambientTarget) {
+			this.switchInfraredRelays(Switch.ON);
+		} else {
+			this.switchInfraredRelays(Switch.OFF);
+		}
+	}
+
+	public static enum ActualMode {
+		OFF, LOW, HIGH;
+	}
+
+	/**
+	 * Gets the {@link ActualMode} from the Schedule.
+	 * 
+	 * @return the {@link ActualMode}
+	 */
+	protected synchronized ActualMode getActualModeFromSchedule() {
+		var hp = this.highPeriod;
+		if (hp == null) {
+			return ActualMode.LOW;
+		}
+		var now = Instant.now(this.clock);
+		if (now.isBefore(hp.from())) {
+			return ActualMode.LOW;
+		}
+		if (now.isAfter(hp.to())) {
+			this.updateHighPeriod();
+			return this.getActualModeFromSchedule();
+		}
+		return ActualMode.HIGH;
+	}
+
+	public static enum Switch {
+		ON, OFF;
+	}
+
+	/**
+	 * Switch the Floor Heating Relays.
+	 * 
+	 * @param target the {@link Switch} target
+	 */
+	private void switchFloorRelays(Switch target) {
+		this.lastFloorRelayState = this.switchRelays(//
+				this.getFloorRelayChannels(), //
+				this.lastFloorRelayState, //
+				target);
+	}
+
+	/**
+	 * Switch the Infrared Heating Relays.
+	 * 
+	 * @param target the {@link Switch} target
+	 */
+	private void switchInfraredRelays(Switch target) {
+		this.lastInfraredRelayState = this.switchRelays(//
+				this.getInfraredRelayChannels(), //
+				this.lastInfraredRelayState, //
+				target);
+	}
+
+	private static record RelayState(Instant lastChange, Switch target) {
+	}
+
+	/**
+	 * Switches Relays ON or OFF. Does not switch faster than MINIMUM_SWITCHING_TIME
+	 * and does not set the command if the Relay is already in correct state.
+	 * 
+	 * @param channels       the Relay channels
+	 * @param lastRelayState the matching {@link RelayState} information object
+	 * @param target         the {@link Switch} target
+	 * @return a new {@link RelayState} information object
+	 */
+	private RelayState switchRelays(List<WriteChannel<Boolean>> channels, RelayState lastRelayState, Switch target) {
+		var now = Instant.now(this.clock);
+		if (lastRelayState != null
+				&& Duration.between(lastRelayState.lastChange, now).getSeconds() < MINIMUM_SWITCHING_TIME) {
+			// Hysteresis is active
+			return lastRelayState;
+		}
+
+		boolean value = target == Switch.ON;
+		for (var channel : channels) {
+			try {
+				if (channel.value().asOptional().equals(Optional.of(value))) {
+					// it is already in the desired state
+				} else {
+					channel.setNextWriteValue(value);
+				}
+			} catch (OpenemsNamedException e) {
+				this.logError(this.log,
+						"Unable to switch Relay [" + channel.address() + "] " + target.name() + ": " + e.getMessage());
+			}
+		}
+		return new RelayState(now, target);
+	}
+
+	/**
+	 * Gets the Floor Heating Relay Channels.
+	 * 
+	 * @return a list of {@link BooleanWriteChannel}s
+	 */
+	private List<WriteChannel<Boolean>> getFloorRelayChannels() {
+		return getChannels(this.floorRelayComponents, this.floorRelays); //
+	}
+
+	/**
+	 * Gets the Infrared Heating Relay Channels.
+	 * 
+	 * @return a list of {@link BooleanWriteChannel}s
+	 */
+	private List<WriteChannel<Boolean>> getInfraredRelayChannels() {
+		return getChannels(this.infraredRelayComponents, this.infraredRelays); //
+	}
+
+	/**
+	 * Gets the Relay Channels from addresses.
+	 * 
+	 * @param components the {@link DigitalOutput} components
+	 * @param addresses  the {@link ChannelAddress}es of the Relays
+	 * @return a list of relay channels
+	 */
+	private static List<WriteChannel<Boolean>> getChannels(List<DigitalOutput> components,
+			List<ChannelAddress> addresses) {
+		final List<WriteChannel<Boolean>> result = new ArrayList<>();
+		for (var address : addresses) {
+			for (var component : components) {
+				if (address.getComponentId().equals(component.id())) {
+					WriteChannel<Boolean> channel = component.channel(address.getChannelId());
+					result.add(channel);
+				}
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public MeterType getMeterType() {
+		return MeterType.CONSUMPTION_METERED;
+	}
+
+	/**
+	 * Update the Meter values.
+	 */
+	private void updateMeterValues() {
+		/*
+		 * Floor Power
+		 */
+		var floorIsOn = this.getFloorRelayChannels().stream() //
+				.map(c -> c.value()) //
+				.filter(v -> v.isDefined() && v.get()) // is any channel value true?
+				.findAny() //
+				.isPresent();
+		final int floorPower;
+		if (floorIsOn) {
+			floorPower = this.config.floorPower();
+		} else {
+			floorPower = 0;
+		}
+
+		/*
+		 * Infrared Power
+		 */
+		var infraredIsOn = this.getInfraredRelayChannels().stream() //
+				.map(c -> c.value()) //
+				.filter(v -> v.isDefined() && v.get()) // is any channel value true?
+				.findAny() //
+				.isPresent();
+		final int infraredPower;
+		if (infraredIsOn) {
+			infraredPower = this.config.infraredPower();
+		} else {
+			infraredPower = 0;
+		}
+
+		/*
+		 * Sum
+		 */
+		var power = floorPower + infraredPower;
+		this._setActivePower(power);
+		this.calculateEnergy.update(power);
+	}
+
+	/**
+	 * Applies the Configuration and updates reference target filters.
+	 * 
+	 * @param config the {@link Config}
+	 * @throws OpenemsNamedException on error
+	 */
+	private synchronized void applyConfig(Config config) throws OpenemsNamedException {
+		this.config = config;
+
+		// Reset RelayStates
+		this.lastFloorRelayState = null;
+		this.lastInfraredRelayState = null;
+
+		OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "floorThermometer",
+				this.config.floorThermometer_id());
+		OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ambientThermometer",
+				this.config.ambientThermometer_id());
+
+		// Parse Channel-Addresses
+		{
+			this.floorRelays.clear();
+			for (String channel : config.floorRelays()) {
+				if (channel.isEmpty()) {
+					continue;
+				}
+				var address = ChannelAddress.fromString(channel);
+				this.floorRelays.add(address);
+			}
+			OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "floorRelayComponents",
+					this.floorRelays.stream().map(c -> c.getComponentId()).distinct().toArray(String[]::new));
+		}
+		{
+			this.infraredRelays.clear();
+			for (String channel : config.infraredRelays()) {
+				if (channel.isEmpty()) {
+					continue;
+				}
+				var address = ChannelAddress.fromString(channel);
+				this.infraredRelays.add(address);
+			}
+			OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "infraredRelayComponents",
+					this.infraredRelays.stream().map(c -> c.getComponentId()).distinct().toArray(String[]::new));
+		}
+
+		this.schedule = JSCalendar.Task.fromStringOrEmpty(config.schedule(), j -> j);
+		this.updateHighPeriod();
+	}
+
+	private synchronized void updateHighPeriod() {
+		var now = ZonedDateTime.now(this.clock);
+		this.highPeriod = getNextHighPeriod(now, this.schedule);
+	}
+
+	@Override
+	public Timedata getTimedata() {
+		return this.timedata;
+	}
+
+	@Override
+	public String debugLog() {
+		final var mode = this.config.mode();
+		final var b = new StringBuilder(); //
+		switch (mode) {
+		case OFF -> b.append("Off");
+		case MANUAL_HIGH -> b.append("Manual HIGH");
+		case MANUAL_LOW -> b.append("Manual LOW");
+		case AUTOMATIC -> {
+			var hp = this.highPeriod;
+			b.append("Auto|");
+			if (hp == null) {
+				b.append("LOW|NoSchedule");
+			} else {
+				var now = Instant.now(this.clock);
+				if (now.isBefore(hp.from())) {
+					b //
+							.append("LOW|NextHigh:") //
+							.append(LocalDateTime.ofInstant(hp.from(), this.clock.getZone())
+									.format(ISO_LOCAL_DATE_TIME));
+				} else if (now.isAfter(hp.to())) {
+					b.append("LOW|NoSchedule"); //
+				} else {
+					b //
+							.append("HIGH|Till:") //
+							.append(LocalDateTime.ofInstant(hp.to(), this.clock.getZone()).format(ISO_LOCAL_DATE_TIME));
+				}
+			}
+		}
+		}
+		if (mode != Mode.OFF) {
+			b //
+					.append("|Floor:") //
+					.append(this.getFloorActual().asStringWithoutUnit()) //
+					.append("->") //
+					.append(this.getFloorTarget().asString()) //
+					.append("|Ambient:") //
+					.append(this.getAmbientActual().asStringWithoutUnit()) //
+					.append("->") //
+					.append(this.getAmbientTarget().asString()) //
+					.append("|") //
+					.append(this.getActivePower().asString());
+		}
+		return b.toString();
+	}
+}
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Utils.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Utils.java
new file mode 100644
index 00000000000..1041ceae199
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/heating/room/Utils.java
@@ -0,0 +1,29 @@
+package io.openems.edge.controller.heating.room;
+
+import java.time.Instant;
+import java.time.ZonedDateTime;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gson.JsonObject;
+
+import io.openems.common.jscalendar.JSCalendar.Task;
+
+public class Utils {
+
+	private Utils() {
+	}
+
+	protected static record HighPeriod(Instant from, Instant to) {
+	}
+
+	protected static HighPeriod getNextHighPeriod(ZonedDateTime now, ImmutableList<Task<JsonObject>> schedule) {
+		return schedule.stream() //
+				.map(task -> {
+					var next = task.getNextOccurence(now);
+					return new HighPeriod(next.toInstant(), next.plus(task.duration()).toInstant());
+				}) //
+				.sorted((t0, t1) -> t0.from.compareTo(t1.from)) //
+				.findFirst() //
+				.orElse(null);
+	}
+}
diff --git a/io.openems.edge.controller.io.heating.room/test/.gitignore b/io.openems.edge.controller.io.heating.room/test/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/MyConfig.java b/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/MyConfig.java
new file mode 100644
index 00000000000..794fa29a591
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/MyConfig.java
@@ -0,0 +1,204 @@
+package io.openems.edge.controller.heating.room;
+
+import static io.openems.common.utils.ConfigUtils.generateReferenceTargetFilter;
+
+import io.openems.common.test.AbstractComponentConfig;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+	protected static class Builder {
+		private String id;
+		private Mode mode;
+		private String schedule;
+		private int lowFloorTemperature;
+		private int lowAmbientTemperature;
+		private int highFloorTemperature;
+		private int highAmbientTemperature;
+		private String floorThermometerId;
+		private String ambientThermometerId;
+		private String[] floorRelays;
+		private String[] infraredRelays;
+		private int floorPower;
+		private int infraredPower;
+		private boolean hasExternalAmbientHeating;
+
+		private Builder() {
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setMode(Mode mode) {
+			this.mode = mode;
+			return this;
+		}
+
+		public Builder setSchedule(String schedule) {
+			this.schedule = schedule;
+			return this;
+		}
+
+		public Builder setLowFloorTemperature(int lowFloorTemperature) {
+			this.lowFloorTemperature = lowFloorTemperature;
+			return this;
+		}
+
+		public Builder setLowAmbientTemperature(int lowAmbientTemperature) {
+			this.lowAmbientTemperature = lowAmbientTemperature;
+			return this;
+		}
+
+		public Builder setHighFloorTemperature(int highFloorTemperature) {
+			this.highFloorTemperature = highFloorTemperature;
+			return this;
+		}
+
+		public Builder setHighAmbientTemperature(int highAmbientTemperature) {
+			this.highAmbientTemperature = highAmbientTemperature;
+			return this;
+		}
+
+		public Builder setFloorThermometerId(String floorThermometerId) {
+			this.floorThermometerId = floorThermometerId;
+			return this;
+		}
+
+		public Builder setAmbientThermometerId(String ambientThermometerId) {
+			this.ambientThermometerId = ambientThermometerId;
+			return this;
+		}
+
+		public Builder setFloorRelays(String... floorRelays) {
+			this.floorRelays = floorRelays;
+			return this;
+		}
+
+		public Builder setInfraredRelays(String... infraredRelays) {
+			this.infraredRelays = infraredRelays;
+			return this;
+		}
+
+		public Builder setFloorPower(int floorPower) {
+			this.floorPower = floorPower;
+			return this;
+		}
+
+		public Builder setInfraredPower(int infraredPower) {
+			this.infraredPower = infraredPower;
+			return this;
+		}
+
+		public Builder setHasExternalAmbientHeating(boolean hasExternalAmbientHeating) {
+			this.hasExternalAmbientHeating = hasExternalAmbientHeating;
+			return this;
+		}
+
+		public MyConfig build() {
+			return new MyConfig(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 * 
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfig(Builder builder) {
+		super(Config.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public Mode mode() {
+		return this.builder.mode;
+	}
+
+	@Override
+	public String schedule() {
+		return this.builder.schedule;
+	}
+
+	@Override
+	public int lowFloorTemperature() {
+		return this.builder.lowFloorTemperature;
+	}
+
+	@Override
+	public int lowAmbientTemperature() {
+		return this.builder.lowAmbientTemperature;
+	}
+
+	@Override
+	public int highFloorTemperature() {
+		return this.builder.highFloorTemperature;
+	}
+
+	@Override
+	public int highAmbientTemperature() {
+		return this.builder.highAmbientTemperature;
+	}
+
+	@Override
+	public String floorThermometer_id() {
+		return this.builder.floorThermometerId;
+	}
+
+	@Override
+	public String ambientThermometer_id() {
+		return this.builder.ambientThermometerId;
+	}
+
+	@Override
+	public String[] floorRelays() {
+		return this.builder.floorRelays;
+	}
+
+	@Override
+	public String[] infraredRelays() {
+		return this.builder.infraredRelays;
+	}
+
+	@Override
+	public int floorPower() {
+		return this.builder.floorPower;
+	}
+
+	@Override
+	public int infraredPower() {
+		return this.builder.infraredPower;
+	}
+
+	@Override
+	public boolean hasExternalAmbientHeating() {
+		return this.builder.hasExternalAmbientHeating;
+	}
+
+	@Override
+	public String floorThermometer_target() {
+		return generateReferenceTargetFilter(this.id(), this.floorThermometer_id());
+	}
+
+	@Override
+	public String ambientThermometer_target() {
+		return generateReferenceTargetFilter(this.id(), this.ambientThermometer_id());
+	}
+
+	@Override
+	public String floorRelayComponents_target() {
+		return generateReferenceTargetFilter(this.id(), this.floorRelays());
+	}
+
+	@Override
+	public String infraredRelayComponents_target() {
+		return generateReferenceTargetFilter(this.id(), this.infraredRelays());
+	}
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/RoomHeatingControllerImplTest.java b/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/RoomHeatingControllerImplTest.java
new file mode 100644
index 00000000000..6f790a32a6f
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/RoomHeatingControllerImplTest.java
@@ -0,0 +1,234 @@
+package io.openems.edge.controller.heating.room;
+
+import static io.openems.common.test.TestUtils.createDummyClock;
+import static io.openems.edge.controller.heating.room.Mode.AUTOMATIC;
+import static io.openems.edge.controller.heating.room.Mode.MANUAL_LOW;
+import static io.openems.edge.controller.heating.room.Mode.OFF;
+import static java.time.temporal.ChronoUnit.HOURS;
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.openems.common.function.ThrowingRunnable;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.controller.test.ControllerTest;
+import io.openems.edge.io.test.DummyInputOutput;
+import io.openems.edge.meter.api.ElectricityMeter;
+import io.openems.edge.thermometer.api.Thermometer;
+import io.openems.edge.thermometer.test.DummyThermometer;
+
+public class RoomHeatingControllerImplTest {
+
+	@Test
+	public void testLow() throws Exception {
+		final var clock = createDummyClock();
+		final var io = new DummyInputOutput("io0");
+		final var sut = new RoomHeatingControllerImpl(clock);
+		new ControllerTest(sut) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("floorThermometer", new DummyThermometer("temp0")) //
+				.addReference("ambientThermometer", new DummyThermometer("temp1")) //
+				.addReference("floorRelayComponents", List.of(io)) //
+				.addReference("infraredRelayComponents", List.of(io)) //
+				.activate(MyConfig.create() //
+						.setId("ctrl0") //
+						.setMode(MANUAL_LOW) //
+						.setSchedule("") //
+						.setLowFloorTemperature(150) //
+						.setLowAmbientTemperature(160) //
+						.setHighFloorTemperature(210) //
+						.setHighAmbientTemperature(220) //
+						.setFloorThermometerId("temp0") //
+						.setAmbientThermometerId("temp1") //
+						.setFloorRelays("io0/InputOutput0", "io0/InputOutput1") //
+						.setInfraredRelays("io0/InputOutput2", "io0/InputOutput3") //
+						.setFloorPower(2600) //
+						.setInfraredPower(2000) //
+						.setHasExternalAmbientHeating(true) //
+						.build())
+				.next(new TestCase() //
+						.onAfterProcessImage(assertLog(sut,
+								"Manual LOW|Floor:UNDEFINED->UNDEFINED|Ambient:UNDEFINED->UNDEFINED|UNDEFINED")) //
+						.input("temp0", Thermometer.ChannelId.TEMPERATURE, 160) //
+						.input("temp1", Thermometer.ChannelId.TEMPERATURE, 160) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, false) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 0)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:160->150|Ambient:160->160|0 W")) //
+						.input("temp0", Thermometer.ChannelId.TEMPERATURE, 140) //
+						.input("temp1", Thermometer.ChannelId.TEMPERATURE, 140) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, true) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, true) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, true) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, true)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:140->150|Ambient:140->160|0 W")) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, true) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, true) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, true) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, true) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 4600)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:140->150|Ambient:140->160|4600 W")) //
+						.input("temp0", Thermometer.ChannelId.TEMPERATURE, 150) //
+						.input("temp1", Thermometer.ChannelId.TEMPERATURE, 150) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, true) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, true)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:150->150|Ambient:150->160|4600 W")) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, false) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, false) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, true) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, true) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 2000)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:150->150|Ambient:150->160|2000 W")) //
+						.input("temp0", Thermometer.ChannelId.TEMPERATURE, 160) //
+						.input("temp1", Thermometer.ChannelId.TEMPERATURE, 170) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, false) //
+						.output("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, false)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:160->150|Ambient:170->160|2000 W")) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT0, false) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT1, false) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT2, false) //
+						.input("io0", DummyInputOutput.ChannelId.INPUT_OUTPUT3, false) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 0)) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 3, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, "Manual LOW|Floor:160->150|Ambient:170->160|0 W"))) //
+
+				.deactivate();
+	}
+
+	@Test
+	public void testAuto() throws Exception {
+		final var clock = createDummyClock();
+		final var io = new DummyInputOutput("io0");
+		final var sut = new RoomHeatingControllerImpl(clock);
+		new ControllerTest(sut) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("floorThermometer", new DummyThermometer("temp0")) //
+				.addReference("ambientThermometer", new DummyThermometer("temp1")) //
+				.addReference("floorRelayComponents", List.of(io)) //
+				.addReference("infraredRelayComponents", List.of(io)) //
+				.activate(MyConfig.create() //
+						.setId("ctrl0") //
+						.setMode(AUTOMATIC) //
+						.setSchedule("""
+								[
+								   {
+								      "@type":"Task",
+								      "start":"01:00:00",
+								      "duration":"PT1H",
+								      "recurrenceRules":[
+								         {
+								            "frequency":"daily"
+								         }
+								      ]
+								   }
+								]""") //
+						.setLowFloorTemperature(150) //
+						.setLowAmbientTemperature(160) //
+						.setHighFloorTemperature(210) //
+						.setHighAmbientTemperature(220) //
+						.setFloorThermometerId("temp0") //
+						.setAmbientThermometerId("temp1") //
+						.setFloorRelays("io0/InputOutput0") //
+						.setInfraredRelays("io0/InputOutput2") //
+						.setFloorPower(2600) //
+						.setInfraredPower(2000) //
+						.setHasExternalAmbientHeating(true) //
+						.build())
+				.next(new TestCase() //
+						.onAfterProcessImage(assertLog(sut, //
+								"Auto|LOW|NextHigh:2020-01-01T01:00:00|Floor:UNDEFINED->UNDEFINED|Ambient:UNDEFINED->UNDEFINED|UNDEFINED"))) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 1, HOURS) //
+						.onAfterProcessImage(assertLog(sut, //
+								"Auto|HIGH|Till:2020-01-01T02:00:00|Floor:UNDEFINED->150|Ambient:UNDEFINED->160|0 W"))) //
+
+				.next(new TestCase() //
+						.timeleap(clock, 61, MINUTES) //
+						.onAfterProcessImage(assertLog(sut, //
+								"Auto|LOW|NoSchedule|Floor:UNDEFINED->210|Ambient:UNDEFINED->220|0 W")));
+	}
+
+	@Test
+	public void testAutoWrong() throws Exception {
+		final var clock = createDummyClock();
+		final var io = new DummyInputOutput("io0");
+		final var sut = new RoomHeatingControllerImpl(clock);
+		new ControllerTest(sut) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("floorThermometer", new DummyThermometer("temp0")) //
+				.addReference("ambientThermometer", new DummyThermometer("temp1")) //
+				.addReference("floorRelayComponents", List.of(io)) //
+				.addReference("infraredRelayComponents", List.of(io)) //
+				.activate(MyConfig.create() //
+						.setId("ctrl0") //
+						.setMode(AUTOMATIC) //
+						.setSchedule("") //
+						.setFloorThermometerId("temp0") //
+						.setAmbientThermometerId("temp1") //
+						.setFloorRelays("io0/InputOutput0") //
+						.setInfraredRelays("io0/InputOutput2") //
+						.build())
+				.next(new TestCase() //
+						.onAfterProcessImage(assertLog(sut, //
+								"Auto|LOW|NoSchedule|Floor:UNDEFINED->UNDEFINED|Ambient:UNDEFINED->UNDEFINED|UNDEFINED")));
+	}
+
+	@Test
+	public void testOff() throws Exception {
+		final var clock = createDummyClock();
+		final var io = new DummyInputOutput("io0");
+		final var sut = new RoomHeatingControllerImpl(clock);
+		new ControllerTest(sut) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("floorThermometer", new DummyThermometer("temp0")) //
+				.addReference("ambientThermometer", new DummyThermometer("temp1")) //
+				.addReference("floorRelayComponents", List.of(io)) //
+				.addReference("infraredRelayComponents", List.of(io)) //
+				.activate(MyConfig.create() //
+						.setId("ctrl0") //
+						.setMode(OFF) //
+						.setSchedule("") //
+						.setFloorThermometerId("temp0") //
+						.setAmbientThermometerId("temp1") //
+						.setFloorRelays("io0/InputOutput0") //
+						.setInfraredRelays("io0/InputOutput2") //
+						.build())
+				.next(new TestCase() //
+						.onAfterProcessImage(assertLog(sut, "Off")));
+	}
+
+	private static ThrowingRunnable<Exception> assertLog(RoomHeatingControllerImpl sut, String message) {
+		return () -> assertEquals(message, sut.debugLog());
+	}
+}
diff --git a/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/UtilsTest.java b/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/UtilsTest.java
new file mode 100644
index 00000000000..200e1297cc7
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/test/io/openems/edge/controller/heating/room/UtilsTest.java
@@ -0,0 +1,76 @@
+package io.openems.edge.controller.heating.room;
+
+import static io.openems.edge.controller.heating.room.Utils.getNextHighPeriod;
+import static org.junit.Assert.assertEquals;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+
+import io.openems.common.jscalendar.JSCalendar;
+
+public class UtilsTest {
+
+	@Test
+	public void test() {
+		var schedule = JSCalendar.Task.fromStringOrEmpty("""
+				[
+				   {
+				      "@type":"Task",
+				      "start":"05:30:00",
+				      "duration":"PT2H30M",
+				      "recurrenceRules":[
+				         {
+				            "frequency":"weekly",
+				            "byDay":[
+				               "mo",
+				               "tu",
+				               "we",
+				               "th",
+				               "fr"
+				            ]
+				         }
+				      ]
+				   },
+				   {
+				      "@type":"Task",
+				      "start":"14:00:00",
+				      "duration":"PT10H",
+				      "recurrenceRules":[
+				         {
+				            "frequency":"weekly",
+				            "byDay":[
+				               "mo",
+				               "tu",
+				               "we",
+				               "th",
+				               "fr"
+				            ]
+				         }
+				      ]
+				   },
+				   {
+				      "@type":"Task",
+				      "start":"08:00:00",
+				      "duration":"PT16H",
+				      "recurrenceRules":[
+				         {
+				            "frequency":"weekly",
+				            "byDay":[
+				               "sa",
+				               "su"
+				            ]
+				         }
+				      ]
+				   }
+				]""", j -> j);
+
+		assertEquals("HighPeriod[from=2025-01-06T04:30:00Z, to=2025-01-06T07:00:00Z]", getNextHighPeriod(//
+				ZonedDateTime.of(2025, 1, 6, 5, 29, 0, 0, ZoneId.of("Europe/Berlin")), schedule).toString());
+		assertEquals("HighPeriod[from=2025-01-06T04:30:00Z, to=2025-01-06T07:00:00Z]", getNextHighPeriod(//
+				ZonedDateTime.of(2025, 1, 6, 5, 31, 0, 0, ZoneId.of("Europe/Berlin")), schedule).toString());
+		assertEquals("HighPeriod[from=2025-01-06T13:00:00Z, to=2025-01-06T23:00:00Z]", getNextHighPeriod(//
+				ZonedDateTime.of(2025, 1, 6, 9, 0, 0, 0, ZoneId.of("Europe/Berlin")), schedule).toString());
+	}
+}
diff --git a/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java b/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java
index 92e6b4a26c1..9e633ff4d8c 100644
--- a/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java
+++ b/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java
@@ -1,8 +1,10 @@
 package io.openems.edge.io.test;
 
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static io.openems.edge.common.test.TestUtils.withValue;
+
 import java.util.stream.Stream;
 
-import io.openems.common.channel.AccessMode;
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.BooleanReadChannel;
 import io.openems.edge.common.channel.BooleanWriteChannel;
@@ -21,25 +23,25 @@ public class DummyInputOutput extends AbstractDummyOpenemsComponent<DummyInputOu
 
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		INPUT_OUTPUT0(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT1(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT2(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT3(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT4(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT5(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT6(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT7(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT8(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE)), //
+				.accessMode(READ_WRITE)), //
 		INPUT_OUTPUT9(Doc.of(OpenemsType.BOOLEAN) //
-				.accessMode(AccessMode.READ_WRITE));
+				.accessMode(READ_WRITE));
 
 		private final Doc doc;
 
@@ -63,7 +65,7 @@ public DummyInputOutput(String id) {
 				ChannelId.values() //
 		);
 		this.digitalOutputChannels = Stream.of(ChannelId.values()) //
-				.filter(channelId -> channelId.doc().getAccessMode() == AccessMode.READ_WRITE) //
+				.filter(channelId -> channelId.doc().getAccessMode() == READ_WRITE) //
 				.map(this::channel) //
 				.toArray(BooleanWriteChannel[]::new);
 	}
@@ -83,4 +85,114 @@ public BooleanReadChannel[] digitalInputChannels() {
 		return this.digitalOutputChannels;
 	}
 
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT0}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput0(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT0, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT1}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput1(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT1, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT2}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput2(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT2, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT3}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput3(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT3, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT4}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput4(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT4, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT5}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput5(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT5, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT6}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput6(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT6, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT7}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput7(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT7, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT8}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput8(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT8, value);
+		return this.self();
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#INPUT_OUTPUT9}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final DummyInputOutput withInputOutput9(boolean value) {
+		withValue(this, DummyInputOutput.ChannelId.INPUT_OUTPUT9, value);
+		return this.self();
+	}
+
 }
diff --git a/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java b/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java
index 3b23f9ace6d..b324aee4b3b 100644
--- a/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java
+++ b/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java
@@ -1,5 +1,7 @@
 package io.openems.edge.onewire.thermometer;
 
+import static io.openems.common.channel.Debounce.TRUE_VALUES_IN_A_ROW_TO_SET_TRUE;
+
 import io.openems.common.channel.Level;
 import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -8,7 +10,8 @@
 public interface OneWireThermometer extends Thermometer, OpenemsComponent {
 
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
-		COMMUNICATION_FAILED(Doc.of(Level.FAULT));
+		COMMUNICATION_FAILED(Doc.of(Level.FAULT) //
+				.debounce(5, TRUE_VALUES_IN_A_ROW_TO_SET_TRUE));
 
 		private final Doc doc;
 
diff --git a/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/AbstractDummyThermometer.java b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/AbstractDummyThermometer.java
new file mode 100644
index 00000000000..f72645d5271
--- /dev/null
+++ b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/AbstractDummyThermometer.java
@@ -0,0 +1,26 @@
+package io.openems.edge.thermometer.test;
+
+import static io.openems.edge.common.test.TestUtils.withValue;
+
+import io.openems.edge.common.test.AbstractDummyOpenemsComponent;
+import io.openems.edge.thermometer.api.Thermometer;
+
+public abstract class AbstractDummyThermometer<SELF extends AbstractDummyThermometer<?>>
+		extends AbstractDummyOpenemsComponent<SELF> implements Thermometer {
+
+	protected AbstractDummyThermometer(String id, io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
+			io.openems.edge.common.channel.ChannelId[]... furtherInitialChannelIds) {
+		super(id, firstInitialChannelIds, furtherInitialChannelIds);
+	}
+
+	/**
+	 * Set {@link Thermometer.ChannelId#TEMPERATURE}.
+	 *
+	 * @param value the value
+	 * @return myself
+	 */
+	public final SELF withTemperature(int value) {
+		withValue(this, Thermometer.ChannelId.TEMPERATURE, value);
+		return this.self();
+	}
+}
diff --git a/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/DummyThermometer.java b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/DummyThermometer.java
new file mode 100644
index 00000000000..712183bc675
--- /dev/null
+++ b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/DummyThermometer.java
@@ -0,0 +1,23 @@
+package io.openems.edge.thermometer.test;
+
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.thermometer.api.Thermometer;
+
+/**
+ * Provides a simple, simulated {@link Thermometer} component that can be used
+ * together with the OpenEMS Component test framework.
+ */
+public class DummyThermometer extends AbstractDummyThermometer<DummyThermometer>
+		implements Thermometer, OpenemsComponent {
+
+	public DummyThermometer(String id) {
+		super(id, //
+				OpenemsComponent.ChannelId.values(), //
+				Thermometer.ChannelId.values());
+	}
+
+	@Override
+	protected final DummyThermometer self() {
+		return this;
+	}
+}
diff --git a/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/package-info.java b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/package-info.java
new file mode 100644
index 00000000000..7406f956cc7
--- /dev/null
+++ b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/test/package-info.java
@@ -0,0 +1,3 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.bundle.Export
+package io.openems.edge.thermometer.test;

From 9ac0069dc0b1c2f421618322d3d2a0ad75ed6f4c Mon Sep 17 00:00:00 2001
From: Hiromasa Ihara <iharahiromasa@gmail.com>
Date: Tue, 7 Jan 2025 22:26:39 +0900
Subject: [PATCH 36/49] UI: configure default language in src/environments
 (#2756)

---
 ui/src/app/shared/type/language.ts          | 2 +-
 ui/src/environments/index.ts                | 1 +
 ui/src/themes/openems/environments/theme.ts | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts
index 693a81d2b6e..76b005a782a 100644
--- a/ui/src/app/shared/type/language.ts
+++ b/ui/src/app/shared/type/language.ts
@@ -42,7 +42,7 @@ export class Language {
     public static readonly JA: Language = new Language("Japanese", "ja", "ja", ja, localJA);
 
     public static readonly ALL = [Language.DE, Language.EN, Language.CZ, Language.NL, Language.ES, Language.FR, Language.JA];
-    public static readonly DEFAULT = Language.DE;
+    public static readonly DEFAULT = Language.getByKey(environment.defaultLanguage);
 
     constructor(
         public readonly title: string,
diff --git a/ui/src/environments/index.ts b/ui/src/environments/index.ts
index a5790f059f5..d1505479fb6 100644
--- a/ui/src/environments/index.ts
+++ b/ui/src/environments/index.ts
@@ -11,6 +11,7 @@ export interface Environment {
     readonly uiTitle: string;
     readonly edgeShortName: string;
     readonly edgeLongName: string;
+    readonly defaultLanguage: string;
 
     readonly url: string;
     readonly backend: DefaultTypes.Backend;
diff --git a/ui/src/themes/openems/environments/theme.ts b/ui/src/themes/openems/environments/theme.ts
index d771eb259d7..68374dc6273 100644
--- a/ui/src/themes/openems/environments/theme.ts
+++ b/ui/src/themes/openems/environments/theme.ts
@@ -6,6 +6,7 @@ export const theme = {
     uiTitle: "OpenEMS UI",
     edgeShortName: "OpenEMS",
     edgeLongName: "Open Energy Management System",
+    defaultLanguage: "de",
 
     docsUrlPrefix: "https://github.com/OpenEMS/openems/blob/develop/",
     links: {

From a660a40235db89708859371d8633e8ff4ebc912e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 14:54:35 +0100
Subject: [PATCH 37/49] Bump com.squareup.okio:okio-jvm from 3.9.1 to 3.10.0 in
 /cnf (#2951)

* Bump com.squareup.okio:okio-jvm from 3.9.1 to 3.10.0 in /cnf

Bumps [com.squareup.okio:okio-jvm](https://github.com/square/okio) from 3.9.1 to 3.10.0.
- [Release notes](https://github.com/square/okio/releases)
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okio/compare/3.9.1...3.10.0)

---
updated-dependencies:
- dependency-name: com.squareup.okio:okio-jvm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update bndrun + fix Language could be null

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                                      | 2 +-
 io.openems.backend.application/BackendApp.bndrun | 2 +-
 io.openems.edge.application/EdgeApp.bndrun       | 2 +-
 ui/src/app/shared/type/language.ts               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 191ff3f5c56..1e55346ce95 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -61,7 +61,7 @@
 			<!-- Used by com.squareup.okhttp3: okhttp -->
 			<groupId>com.squareup.okio</groupId>
 			<artifactId>okio-jvm</artifactId>
-			<version>3.9.1</version>
+			<version>3.10.0</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.influxdb: influxdb-client -->
diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
index 2f9caaea57f..c199efdc835 100644
--- a/io.openems.backend.application/BackendApp.bndrun
+++ b/io.openems.backend.application/BackendApp.bndrun
@@ -65,7 +65,7 @@
 	com.google.gson;version='[2.11.0,2.11.1)',\
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
-	com.squareup.okio;version='[3.9.1,3.9.2)',\
+	com.squareup.okio;version='[3.10.0,3.10.1)',\
 	com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
 	io.openems.backend.alerting;version=snapshot,\
 	io.openems.backend.application;version=snapshot,\
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 63598ac0cd9..941c4bd969f 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -209,7 +209,7 @@
 	com.google.gson;version='[2.11.0,2.11.1)',\
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
-	com.squareup.okio;version='[3.9.1,3.9.2)',\
+	com.squareup.okio;version='[3.10.0,3.10.1)',\
 	com.sun.jna;version='[5.16.0,5.16.1)',\
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\
diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts
index 76b005a782a..6d1e022059e 100644
--- a/ui/src/app/shared/type/language.ts
+++ b/ui/src/app/shared/type/language.ts
@@ -42,7 +42,7 @@ export class Language {
     public static readonly JA: Language = new Language("Japanese", "ja", "ja", ja, localJA);
 
     public static readonly ALL = [Language.DE, Language.EN, Language.CZ, Language.NL, Language.ES, Language.FR, Language.JA];
-    public static readonly DEFAULT = Language.getByKey(environment.defaultLanguage);
+    public static readonly DEFAULT = Language.getByKey(environment.defaultLanguage) as Language;
 
     constructor(
         public readonly title: string,

From fea6ba30e09afab4e71710e186e5a9c09be2ede9 Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Tue, 7 Jan 2025 15:00:07 +0100
Subject: [PATCH 38/49] UI: fix component.update View (#2958)

Fix word wrapping
---
 ui/src/global.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/global.scss b/ui/src/global.scss
index 9e8063f82d6..50915dddbaa 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -82,7 +82,7 @@ formly-field-ion-radio {
             white-space: initial;
 
             small {
-                white-space: initial;
+                white-space: nowrap;
             }
         }
 

From 4e7cb892a2cd9d15b2ef93bd6a4a6bf0d8264f05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:05:17 +0100
Subject: [PATCH 39/49] Bump @typescript-eslint/types in /ui in the eslint
 group (#2952)

Bumps the eslint group in /ui with 1 update: [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/types).


Updates `@typescript-eslint/types` from 8.19.0 to 8.19.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/types/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.19.1/packages/types)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/types"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json | 73 +++++++++++++++++++++++++++++++++++++++++---
 ui/package.json      |  2 +-
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 98a1ea01792..955bd1e8a1d 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -84,7 +84,7 @@
         "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^8.19.0",
         "@typescript-eslint/parser": "^8.19.0",
-        "@typescript-eslint/types": "^8.19.0",
+        "@typescript-eslint/types": "^8.19.1",
         "eslint": "^9.17.0",
         "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-check-file": "^2.8.0",
@@ -6767,6 +6767,19 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
@@ -6785,6 +6798,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz",
@@ -6810,9 +6836,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
-      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.1.tgz",
+      "integrity": "sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6849,6 +6875,19 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz",
@@ -6873,6 +6912,19 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz",
@@ -6891,6 +6943,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
diff --git a/ui/package.json b/ui/package.json
index 1de4641ae07..89909801cdb 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -79,7 +79,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.19.0",
     "@typescript-eslint/parser": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.0",
+    "@typescript-eslint/types": "^8.19.1",
     "eslint": "^9.17.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",

From c945a98a17b231021db377ebbb1dd77a8f568930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:10:13 +0100
Subject: [PATCH 40/49] Bump @awesome-cordova-plugins/file-opener from 6.13.0
 to 6.14.0 in /ui (#2953)

Bumps [@awesome-cordova-plugins/file-opener](https://github.com/danielsogl/awesome-cordova-plugins) from 6.13.0 to 6.14.0.
- [Release notes](https://github.com/danielsogl/awesome-cordova-plugins/releases)
- [Changelog](https://github.com/danielsogl/awesome-cordova-plugins/blob/master/CHANGELOG.md)
- [Commits](https://github.com/danielsogl/awesome-cordova-plugins/compare/v6.13.0...v6.14.0)

---
updated-dependencies:
- dependency-name: "@awesome-cordova-plugins/file-opener"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json | 8 ++++----
 ui/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 955bd1e8a1d..78b8100968b 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -18,7 +18,7 @@
         "@angular/router": "19.0.5",
         "@angular/service-worker": "19.0.5",
         "@awesome-cordova-plugins/core": "^6.13.0",
-        "@awesome-cordova-plugins/file-opener": "^6.13.0",
+        "@awesome-cordova-plugins/file-opener": "^6.14.0",
         "@capacitor-community/file-opener": "^6.0.1",
         "@capacitor/android": "^6.2.0",
         "@capacitor/app": "^6.0.2",
@@ -777,9 +777,9 @@
       }
     },
     "node_modules/@awesome-cordova-plugins/file-opener": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/file-opener/-/file-opener-6.13.0.tgz",
-      "integrity": "sha512-0+caltmjJf3BuZiklqaSHsxviDiS4znnJj3RiBfoERfPCRa0HIyO8dywH2EhkOMhYQ5g8gBobTTOJQpV/yQhmw==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/file-opener/-/file-opener-6.14.0.tgz",
+      "integrity": "sha512-EN4SfDWs99zN12pbEMk+NjqDEUbZbOe3Eq9ItTJIT7cyIS2PF+w2qT2QmhnBZdmYOqecIngqmjj+3w+zQnEt+w==",
       "dependencies": {
         "@types/cordova": "latest"
       },
diff --git a/ui/package.json b/ui/package.json
index 89909801cdb..59809cac8b6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -13,7 +13,7 @@
     "@angular/router": "19.0.5",
     "@angular/service-worker": "19.0.5",
     "@awesome-cordova-plugins/core": "^6.13.0",
-    "@awesome-cordova-plugins/file-opener": "^6.13.0",
+    "@awesome-cordova-plugins/file-opener": "^6.14.0",
     "@capacitor-community/file-opener": "^6.0.1",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.2",

From 77e755042c449f4f8765d08bf53f55ba2ed50cd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:51:48 +0100
Subject: [PATCH 41/49] Bump @awesome-cordova-plugins/core from 6.13.0 to
 6.14.0 in /ui (#2955)

Bumps [@awesome-cordova-plugins/core](https://github.com/danielsogl/awesome-cordova-plugins) from 6.13.0 to 6.14.0.
- [Release notes](https://github.com/danielsogl/awesome-cordova-plugins/releases)
- [Changelog](https://github.com/danielsogl/awesome-cordova-plugins/blob/master/CHANGELOG.md)
- [Commits](https://github.com/danielsogl/awesome-cordova-plugins/compare/v6.13.0...v6.14.0)

---
updated-dependencies:
- dependency-name: "@awesome-cordova-plugins/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ui/package-lock.json | 8 ++++----
 ui/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 78b8100968b..3042b552307 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -17,7 +17,7 @@
         "@angular/platform-browser-dynamic": "19.0.5",
         "@angular/router": "19.0.5",
         "@angular/service-worker": "19.0.5",
-        "@awesome-cordova-plugins/core": "^6.13.0",
+        "@awesome-cordova-plugins/core": "^6.14.0",
         "@awesome-cordova-plugins/file-opener": "^6.14.0",
         "@capacitor-community/file-opener": "^6.0.1",
         "@capacitor/android": "^6.2.0",
@@ -766,9 +766,9 @@
       }
     },
     "node_modules/@awesome-cordova-plugins/core": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-6.13.0.tgz",
-      "integrity": "sha512-iqa5TU8HcFns/ND18KFrDVo4rGD4d4Gr5bgACFPwfztNCNmCRp+qkhv/xRBstqZ72qYH2oAJnEE1PTUY+IfX7Q==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-6.14.0.tgz",
+      "integrity": "sha512-oJdmzR8DA/dyZnKlXBnjav0ZNTCacGMEWZOxnrnXqr3I7nVEK0Kr2EIJx7CtAIXxFCpEjQQTH7loFur86O3xpw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
diff --git a/ui/package.json b/ui/package.json
index 59809cac8b6..e3ecda3960d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -12,7 +12,7 @@
     "@angular/platform-browser-dynamic": "19.0.5",
     "@angular/router": "19.0.5",
     "@angular/service-worker": "19.0.5",
-    "@awesome-cordova-plugins/core": "^6.13.0",
+    "@awesome-cordova-plugins/core": "^6.14.0",
     "@awesome-cordova-plugins/file-opener": "^6.14.0",
     "@capacitor-community/file-opener": "^6.0.1",
     "@capacitor/android": "^6.2.0",

From 5214d22b3695fcdffa0b96454e7bb14e5b7ec25f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 16:01:12 +0100
Subject: [PATCH 42/49] Bump swiper from 11.1.15 to 11.2.0 in /ui (#2956)

Bumps [swiper](https://github.com/nolimits4web/Swiper) from 11.1.15 to 11.2.0.
- [Release notes](https://github.com/nolimits4web/Swiper/releases)
- [Changelog](https://github.com/nolimits4web/swiper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nolimits4web/Swiper/compare/v11.1.15...v11.2.0)

---
updated-dependencies:
- dependency-name: swiper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json | 8 ++++----
 ui/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 3042b552307..c29da63cbd2 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -51,7 +51,7 @@
         "ngx-spinner": "^17.0.0",
         "roboto-fontface": "^0.10.0",
         "rxjs": "~7.8.1",
-        "swiper": "11.1.15",
+        "swiper": "11.2.0",
         "tslib": "^2.8.1",
         "uuid": "^11.0.3",
         "zone.js": "~0.15.0"
@@ -20116,9 +20116,9 @@
       }
     },
     "node_modules/swiper": {
-      "version": "11.1.15",
-      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.1.15.tgz",
-      "integrity": "sha512-IzWeU34WwC7gbhjKsjkImTuCRf+lRbO6cnxMGs88iVNKDwV+xQpBCJxZ4bNH6gSrIbbyVJ1kuGzo3JTtz//CBw==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.2.0.tgz",
+      "integrity": "sha512-rjjAKgDEs+grR2eQshVDCcE4KNPC7CI294nfcbV9gE8WCsLdvOYXDeZKUYevqAZZp8j5hE7kpT3dAGVKFBWlxQ==",
       "funding": [
         {
           "type": "patreon",
diff --git a/ui/package.json b/ui/package.json
index e3ecda3960d..48373a8142f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -46,7 +46,7 @@
     "ngx-spinner": "^17.0.0",
     "roboto-fontface": "^0.10.0",
     "rxjs": "~7.8.1",
-    "swiper": "11.1.15",
+    "swiper": "11.2.0",
     "tslib": "^2.8.1",
     "uuid": "^11.0.3",
     "zone.js": "~0.15.0"

From 86c43a260561cc6193e3529d8285b5a46b3f2b5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:37:53 +0100
Subject: [PATCH 43/49] Bump uuid from 11.0.3 to 11.0.5 in /ui (#2957)

* Bump uuid from 11.0.3 to 11.0.4 in /ui

Bumps [uuid](https://github.com/uuidjs/uuid) from 11.0.3 to 11.0.4.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v11.0.3...v11.0.4)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update package.json

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 ui/package-lock.json | 9 +++++----
 ui/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index c29da63cbd2..45fe2fcb69a 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -53,7 +53,7 @@
         "rxjs": "~7.8.1",
         "swiper": "11.2.0",
         "tslib": "^2.8.1",
-        "uuid": "^11.0.3",
+        "uuid": "^11.0.5",
         "zone.js": "~0.15.0"
       },
       "devDependencies": {
@@ -21071,13 +21071,14 @@
       }
     },
     "node_modules/uuid": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",
-      "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==",
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz",
+      "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
+      "license": "MIT",
       "bin": {
         "uuid": "dist/esm/bin/uuid"
       }
diff --git a/ui/package.json b/ui/package.json
index 48373a8142f..6e1ef467a74 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -48,7 +48,7 @@
     "rxjs": "~7.8.1",
     "swiper": "11.2.0",
     "tslib": "^2.8.1",
-    "uuid": "^11.0.3",
+    "uuid": "^11.0.5",
     "zone.js": "~0.15.0"
   },
   "devDependencies": {

From 49bccb81acd1c49303456577ee0603b88dad4388 Mon Sep 17 00:00:00 2001
From: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Date: Mon, 13 Jan 2025 17:29:13 +0100
Subject: [PATCH 44/49] UI: fix formly form styles (#2962)

fixing styles permanently for component-update and component-install and all other components, which are using the default formlyfield type input
---
 .../components/formly/form-field.wrapper.html |  5 ----
 .../components/formly/form-field.wrapper.ts   |  7 +++++
 .../app/shared/components/formly/input.html   | 13 ++++++--
 ui/src/app/shared/components/formly/input.ts  | 30 +++++++++++++++++++
 ui/src/app/user/user.component.html           |  3 +-
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/ui/src/app/shared/components/formly/form-field.wrapper.html b/ui/src/app/shared/components/formly/form-field.wrapper.html
index 18ebda3222c..e01f45a4ce3 100644
--- a/ui/src/app/shared/components/formly/form-field.wrapper.html
+++ b/ui/src/app/shared/components/formly/form-field.wrapper.html
@@ -1,9 +1,4 @@
 <ion-item [lines]="to.itemLines" [disabled]="props.readonly">
-    <ion-label [position]="to.labelPosition" style="max-width:none">
-        <span>{{ to.label }}</span>
-        <span *ngIf="to.required && to.hideRequiredMarker !== true">*</span>
-        <span *ngIf="to.description"><br /><small> {{ to.description }} </small></span>
-    </ion-label>
     <ng-template #fieldComponent></ng-template>
 </ion-item>
 <ion-item lines="none" *ngIf="showError">
diff --git a/ui/src/app/shared/components/formly/form-field.wrapper.ts b/ui/src/app/shared/components/formly/form-field.wrapper.ts
index b4bb24fc97d..71ea84f9036 100644
--- a/ui/src/app/shared/components/formly/form-field.wrapper.ts
+++ b/ui/src/app/shared/components/formly/form-field.wrapper.ts
@@ -6,5 +6,12 @@ import { FieldWrapper } from "@ngx-formly/core";
     templateUrl: "./form-field.wrapper.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
     standalone: false,
+    styles: [`
+    :host {
+        formly-field-ion-toggle, formly-field-ion-checkbox{
+            width: 100%;
+        }
+    }
+    `],
 })
 export class FormlyWrapperFormFieldComponent extends FieldWrapper { }
diff --git a/ui/src/app/shared/components/formly/input.html b/ui/src/app/shared/components/formly/input.html
index f85472cc915..49f9db44c50 100644
--- a/ui/src/app/shared/components/formly/input.html
+++ b/ui/src/app/shared/components/formly/input.html
@@ -1,9 +1,16 @@
 <ion-input *ngIf="props.type === 'number'; else noNumberInput" placeholder="{{props.placeholder}}"
     style="width:100%; float:right; text-align: right" [type]="props.type || 'text'" [formControl]="formControl"
-    [min]="props.min">
+    [min]="props.min" [label]="props.label">
 </ion-input>
 <ng-template #noNumberInput>
-    <ion-input placeholder="{{props.placeholder}}" style="width:100%; float:right; text-align: right"
-        [type]="props.type || 'text'" [formControl]="formControl">
+    <ion-input placeholder="{{props.placeholder}}" [type]="props.type || 'text'" [formControl]="formControl"
+        style="text-align: right" labelPlacement="start" justify="space-between">
+        <div style="text-align: left;">
+            <ion-label [position]="to.labelPosition">
+                <span>{{ to.label }}</span>
+                <span *ngIf="to.required && to.hideRequiredMarker !== true">*</span>
+                <span *ngIf="to.description"><br /><small>{{ to.description }}</small></span>
+            </ion-label>
+        </div>
     </ion-input>
 </ng-template>
diff --git a/ui/src/app/shared/components/formly/input.ts b/ui/src/app/shared/components/formly/input.ts
index 8635fb6bc79..4b3dcaf4647 100644
--- a/ui/src/app/shared/components/formly/input.ts
+++ b/ui/src/app/shared/components/formly/input.ts
@@ -5,5 +5,35 @@ import { FieldType } from "@ngx-formly/core";
     selector: "formly-input-section",
     templateUrl: "./input.html",
     standalone: false,
+    styles: [`
+    :host {
+        min-width: fit-content;
+
+        .label-text-wrapper{
+            .label-text{
+                overflow: visible;
+            }
+        }
+
+        .native-wrapper{
+            max-width: max-content !important;
+            width: max-content;
+            min-width: 20%;
+
+            @media (width <= 576px) {
+                text-align: right;
+            }
+        }
+
+        ion-label{
+            text-align: left;
+        }
+
+        ion-label>span,
+        ion-label>span>small {
+            white-space: initial;
+        }
+}
+`],
 })
 export class InputTypeComponent extends FieldType { }
diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html
index 7a6f64e37c4..e4ff14e18ec 100644
--- a/ui/src/app/user/user.component.html
+++ b/ui/src/app/user/user.component.html
@@ -166,8 +166,7 @@
                 </ion-item>
               </div>
               <ion-item lines="none">
-                <ion-checkbox (ionChange)="toggleDebugMode($event)" [(ngModel)]="environment.debugMode"
-                  label="Debug-Mode" justify="space-between">Debug-Mode
+                <ion-checkbox (ionChange)="toggleDebugMode($event)" [(ngModel)]="environment.debugMode">Debug-Mode
                 </ion-checkbox>
               </ion-item>
               <ion-note class="ion-padding" *ngIf="environment.backend === 'OpenEMS Edge'">

From 5828abb1abc058b3283a82ffda041f05526d60ed Mon Sep 17 00:00:00 2001
From: Hannes <hallerjo97@gmail.com>
Date: Mon, 13 Jan 2025 17:31:07 +0100
Subject: [PATCH 45/49] UI: Component Install Real-Time Filtering in Search Bar
 (#2963)

---
 ui/src/app/edge/settings/component/install/index.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/edge/settings/component/install/index.component.html b/ui/src/app/edge/settings/component/install/index.component.html
index 7724f09a979..c3a24abed0d 100644
--- a/ui/src/app/edge/settings/component/install/index.component.html
+++ b/ui/src/app/edge/settings/component/install/index.component.html
@@ -1,6 +1,6 @@
 <ion-content>
   <ion-searchbar style="--background: var(--ion-color-searchbar-background); color:var(--ion-color-searchbar-text);"
-    (ionChange)="updateFilter($event.detail.value)"></ion-searchbar>
+    (ionInput)="updateFilter($event.detail.value)"></ion-searchbar>
   <ion-list>
     <ng-container *ngFor="let entry of list">
       <ion-item-group>

From 26e83c58b5dac1bf035059887cee4d8cb299433b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:25:12 +0100
Subject: [PATCH 46/49] Bump the eslint group in /ui with 2 updates (#2967)

Bumps the eslint group in /ui with 2 updates: [@stylistic/eslint-plugin](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/types).


Updates `@stylistic/eslint-plugin` from 2.12.1 to 2.13.0
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v2.13.0/packages/eslint-plugin)

Updates `@typescript-eslint/types` from 8.19.1 to 8.20.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/types/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.20.0/packages/types)

---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@typescript-eslint/types"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ui/package-lock.json | 16 ++++++++--------
 ui/package.json      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 45fe2fcb69a..85eee50a49b 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -73,7 +73,7 @@
         "@ionic/angular-toolkit": "^12.1.1",
         "@ionic/cli": "^7.2.0",
         "@schematics/angular": "^19.0.6",
-        "@stylistic/eslint-plugin": "^2.12.1",
+        "@stylistic/eslint-plugin": "^2.13.0",
         "@types/jasmine": "~5.1.5",
         "@types/jasminewd2": "~2.0.13",
         "@types/json-schema": "^7.0.15",
@@ -84,7 +84,7 @@
         "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^8.19.0",
         "@typescript-eslint/parser": "^8.19.0",
-        "@typescript-eslint/types": "^8.19.1",
+        "@typescript-eslint/types": "^8.20.0",
         "eslint": "^9.17.0",
         "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-check-file": "^2.8.0",
@@ -6269,9 +6269,9 @@
       }
     },
     "node_modules/@stylistic/eslint-plugin": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.12.1.tgz",
-      "integrity": "sha512-fubZKIHSPuo07FgRTn6S4Nl0uXPRPYVNpyZzIDGfp7Fny6JjNus6kReLD7NI380JXi4HtUTSOZ34LBuNPO1XLQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.13.0.tgz",
+      "integrity": "sha512-RnO1SaiCFHn666wNz2QfZEFxvmiNRqhzaMXHXxXXKt+MEP7aajlPxUSMIQpKAaJfverpovEYqjBOXDq6dDcaOQ==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^8.13.0",
@@ -6836,9 +6836,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.1.tgz",
-      "integrity": "sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.20.0.tgz",
+      "integrity": "sha512-cqaMiY72CkP+2xZRrFt3ExRBu0WmVitN/rYPZErA80mHjHx/Svgp8yfbzkJmDoQ/whcytOPO9/IZXnOc+wigRA==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/ui/package.json b/ui/package.json
index 6e1ef467a74..61328fae770 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -68,7 +68,7 @@
     "@ionic/angular-toolkit": "^12.1.1",
     "@ionic/cli": "^7.2.0",
     "@schematics/angular": "^19.0.6",
-    "@stylistic/eslint-plugin": "^2.12.1",
+    "@stylistic/eslint-plugin": "^2.13.0",
     "@types/jasmine": "~5.1.5",
     "@types/jasminewd2": "~2.0.13",
     "@types/json-schema": "^7.0.15",
@@ -79,7 +79,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.19.0",
     "@typescript-eslint/parser": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.1",
+    "@typescript-eslint/types": "^8.20.0",
     "eslint": "^9.17.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",

From 2b3b51b632890982f785d60d2d0b20dfcdc2ddbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:30:31 +0100
Subject: [PATCH 47/49] Bump swiper from 11.2.0 to 11.2.1 in /ui (#2968)

Bumps [swiper](https://github.com/nolimits4web/Swiper) from 11.2.0 to 11.2.1.
- [Release notes](https://github.com/nolimits4web/Swiper/releases)
- [Changelog](https://github.com/nolimits4web/swiper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nolimits4web/Swiper/compare/v11.2.0...v11.2.1)

---
updated-dependencies:
- dependency-name: swiper
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ui/package-lock.json | 8 ++++----
 ui/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 85eee50a49b..480e69cdbce 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -51,7 +51,7 @@
         "ngx-spinner": "^17.0.0",
         "roboto-fontface": "^0.10.0",
         "rxjs": "~7.8.1",
-        "swiper": "11.2.0",
+        "swiper": "11.2.1",
         "tslib": "^2.8.1",
         "uuid": "^11.0.5",
         "zone.js": "~0.15.0"
@@ -20116,9 +20116,9 @@
       }
     },
     "node_modules/swiper": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.2.0.tgz",
-      "integrity": "sha512-rjjAKgDEs+grR2eQshVDCcE4KNPC7CI294nfcbV9gE8WCsLdvOYXDeZKUYevqAZZp8j5hE7kpT3dAGVKFBWlxQ==",
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.2.1.tgz",
+      "integrity": "sha512-62G69+iQRIfUqTmJkWpZDcX891Ra8O9050ckt1/JI2H+0483g+gq0m7gINecDqMtDh2zt5dK+uzBRxGhGOOvQA==",
       "funding": [
         {
           "type": "patreon",
diff --git a/ui/package.json b/ui/package.json
index 61328fae770..84e59c36ecf 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -46,7 +46,7 @@
     "ngx-spinner": "^17.0.0",
     "roboto-fontface": "^0.10.0",
     "rxjs": "~7.8.1",
-    "swiper": "11.2.0",
+    "swiper": "11.2.1",
     "tslib": "^2.8.1",
     "uuid": "^11.0.5",
     "zone.js": "~0.15.0"

From 76d76f5589805ce6c9eb92948d472d8df8c4f173 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:42:23 +0100
Subject: [PATCH 48/49] Bump com.squareup.okio:okio-jvm from 3.10.0 to 3.10.2
 in /cnf (#2965)

* Bump com.squareup.okio:okio-jvm from 3.10.0 to 3.10.2 in /cnf

Bumps [com.squareup.okio:okio-jvm](https://github.com/square/okio) from 3.10.0 to 3.10.2.
- [Release notes](https://github.com/square/okio/releases)
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okio/compare/3.10.0...3.10.2)

---
updated-dependencies:
- dependency-name: com.squareup.okio:okio-jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update bndrun

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
---
 cnf/pom.xml                                      | 2 +-
 io.openems.backend.application/BackendApp.bndrun | 2 +-
 io.openems.edge.application/EdgeApp.bndrun       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnf/pom.xml b/cnf/pom.xml
index 1e55346ce95..ee11cade058 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -61,7 +61,7 @@
 			<!-- Used by com.squareup.okhttp3: okhttp -->
 			<groupId>com.squareup.okio</groupId>
 			<artifactId>okio-jvm</artifactId>
-			<version>3.10.0</version>
+			<version>3.10.2</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.influxdb: influxdb-client -->
diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
index c199efdc835..4aba9af9ccc 100644
--- a/io.openems.backend.application/BackendApp.bndrun
+++ b/io.openems.backend.application/BackendApp.bndrun
@@ -65,7 +65,7 @@
 	com.google.gson;version='[2.11.0,2.11.1)',\
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
-	com.squareup.okio;version='[3.10.0,3.10.1)',\
+	com.squareup.okio;version='[3.10.2,3.10.3)',\
 	com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
 	io.openems.backend.alerting;version=snapshot,\
 	io.openems.backend.application;version=snapshot,\
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 941c4bd969f..a3dd56769d5 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -209,7 +209,7 @@
 	com.google.gson;version='[2.11.0,2.11.1)',\
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
-	com.squareup.okio;version='[3.10.0,3.10.1)',\
+	com.squareup.okio;version='[3.10.2,3.10.3)',\
 	com.sun.jna;version='[5.16.0,5.16.1)',\
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\

From 79650cb4096775798ddb0c72ef50f23f99790e78 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Thu, 16 Jan 2025 21:54:22 +0100
Subject: [PATCH 49/49] FEMS Backports 2025-01-16 (#2969)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Edge
  - JsonUtils: Update switch cases with pattern matching
  - HttpBridge: add detailed Logger
    - Moved DebugMode to Common
    - Added DebugMode to BridgeHttp
    - Added parameter of type DebugMode to NetworkEndpointFetcher
    - Added Detailed log of result in fetchEndpoint if DebugMode is DETAILED
    - Set DebugMode to DETAILED in HardyBarthEvcsImpl if debug is true in config
  - Sum + ESS: update Modbus table descriptions
    - Adds and changes descriptions of the modbus tables
  - KEBA: fix issue with SessionEnergy
    - Add KEBA specific R2State-enum (for "Report 2")
    - KEBA: drop CHARGING_REJECTED
    - SessionEnergy is set to 0 on UNPLUGGED event
  - Modbus-Api-Controller: add RTU and unify controllers to abstract superclass
    - Implementation of ModbusRTU
    - Refactoring of ModbusTCP to avoid redundant classes
    - Implementation of ModbusRTU App
    - Added "Download Protocol" button for ModbusRtu
  - AppCenter Home: NA-Protection changed text
    - changed na-protection text
  - IO Weidmüller: Added UR20_16DI_P module
  - Symmetric Battery Inverter: add cabinet temperature channel
    - Added a "TEMPERATURE_CABINET" channel in the Battery inverter interface.
  - HardyBarth: temporary fix for `null` responses
    - This fixes an issue with interrupted charging sessions due to `null` values.
    - added check for null values in HardyBarthReadUtils
    - The first 3 null values are ignored and no values are written in these cycles
    - Afterwards null values are written in channels as usual
  - AppCenter: add estimated configuration endpoint for IBN
    - Added endpoint to retrieve estimated installation configuration
  - AppCenter: Meta App + Update Component via apps
    - Added core app for meta component
    - Added Logic for updating component config via their apps
  - EmergencyReserveFromGrid: start charging without delay from ramp
    - Added check with previous state that ignores ramp for 1 cycle

- UI
  - Prepare Login Improvements
  - Added template to override the default formly behaviour bugs
  - fix styling of `negative-values` and `positive-values` info
---
 .../openems/backend/metadata/odoo/Config.java |   1 +
 .../backend/metadata/odoo/MetadataOdoo.java   |   1 +
 .../common/oem/DummyOpenemsEdgeOem.java       |   2 +
 .../io/openems/common/types}/DebugMode.java   |   2 +-
 .../io/openems/common/utils/JsonUtils.java    | 232 +++-----
 .../io/openems/common/utils/StreamUtils.java  |  25 +
 .../api/SymmetricBatteryInverter.java         |  33 ++
 .../edge/bridge/http/BridgeHttpImpl.java      |  16 +-
 .../bridge/http/NetworkEndpointFetcher.java   |  14 +-
 .../edge/bridge/http/api/BridgeHttp.java      |   3 +
 .../edge/bridge/http/api/EndpointFetcher.java |   4 +-
 .../bridge/http/dummy/DummyBridgeHttp.java    |   6 +
 .../http/dummy/DummyEndpointFetcher.java      |   5 +-
 io.openems.edge.bridge.onewire/bnd.bnd        |   2 +-
 .../common/component/ComponentManager.java    |  15 +
 .../src/io/openems/edge/common/sum/Sum.java   |  45 +-
 .../common/test/DummyComponentManager.java    |  16 +
 io.openems.edge.controller.api.modbus/bnd.bnd |   5 +-
 .../api/modbus/AbstractModbusApi.java         | 484 ++++++++++++++++
 .../api/modbus/AbstractModbusConfig.java      | 108 ++++
 .../api/modbus/AbstractModbusRtuApi.java      | 100 ++++
 .../api/modbus/AbstractModbusTcpApi.java      | 515 +-----------------
 .../{ModbusTcpApi.java => ModbusApi.java}     |   4 +-
 .../controller/api/modbus/MyProcessImage.java |   6 +-
 .../api/modbus/readonly/rtu/Config.java       |  52 ++
 .../rtu/ControllerApiModbusRtuReadOnly.java   |  23 +
 .../ControllerApiModbusRtuReadOnlyImpl.java   | 107 ++++
 .../api/modbus/readonly/{ => tcp}/Config.java |   4 +-
 .../ControllerApiModbusTcpReadOnly.java       |   2 +-
 .../ControllerApiModbusTcpReadOnlyImpl.java   |  32 +-
 .../api/modbus/readwrite/rtu/Config.java      |  52 ++
 .../rtu/ControllerApiModbusRtuReadWrite.java  |  50 ++
 .../ControllerApiModbusRtuReadWriteImpl.java  | 141 +++++
 .../modbus/readwrite/{ => tcp}/Config.java    |   4 +-
 .../ControllerApiModbusTcpReadWrite.java      |   2 +-
 .../ControllerApiModbusTcpReadWriteImpl.java  |  37 +-
 ...ontrollerApiModbusRtuReadOnlyImplTest.java |  32 ++
 .../api/modbus/readonly/rtu/MyConfig.java     | 147 +++++
 ...ontrollerApiModbusTcpReadOnlyImplTest.java |   2 +-
 .../modbus/readonly/{ => tcp}/MyConfig.java   |   2 +-
 ...ntrollerApiModbusRtuReadWriteImplTest.java |  30 +
 .../api/modbus/readwrite/rtu/MyConfig.java    | 147 +++++
 ...ntrollerApiModbusTcpReadWriteImplTest.java |  18 +-
 .../modbus/readwrite/{ => tcp}/MyConfig.java  |   2 +-
 .../statemachine/Context.java                 |   9 +
 .../statemachine/ForceChargeGridHandler.java  |   3 +-
 .../statemachine/StateMachine.java            |   1 +
 ...erEssEmergencyCapacityReserveImplTest.java |  12 +-
 .../org.eclipse.core.resources.prefs          |   2 +
 io.openems.edge.core/bnd.bnd                  |   3 +-
 .../openems/edge/app/api/ModbusApiProps.java  | 188 +++++++
 .../edge/app/api/ModbusRtuApiReadOnly.java    | 191 +++++++
 .../edge/app/api/ModbusRtuApiReadWrite.java   | 197 +++++++
 .../edge/app/api/ModbusTcpApiProps.java       |  51 --
 .../edge/app/api/ModbusTcpApiReadOnly.java    |  12 +-
 .../edge/app/api/ModbusTcpApiReadWrite.java   |  35 +-
 .../src/io/openems/edge/app/core/AppMeta.java | 178 ++++++
 .../core/appmanager/AbstractOpenemsApp.java   |  61 +++
 .../AbstractOpenemsAppWithProps.java          |  20 +
 .../openems/edge/core/appmanager/AppDef.java  | 107 +++-
 .../edge/core/appmanager/AppManagerImpl.java  | 218 +++++++-
 .../edge/core/appmanager/OpenemsApp.java      |  30 +
 .../core/appmanager/OpenemsAppCategory.java   |   5 +
 .../dependency/AppManagerAppHelper.java       |  19 +
 .../dependency/AppManagerAppHelperImpl.java   |  41 ++
 .../aggregatetask/AggregateTask.java          |  32 ++
 .../ComponentAggregateTaskImpl.java           |  42 ++
 ...PersistencePredictorAggregateTaskImpl.java |  45 ++
 .../SchedulerAggregateTaskImpl.java           |  38 ++
 ...edulerByCentralOrderAggregateTaskImpl.java |  42 ++
 .../StaticIpAggregateTaskImpl.java            |  44 ++
 .../edge/core/appmanager/flag/Flags.java      |   2 +
 .../jsonrpc/GetEstimatedConfiguration.java    | 125 +++++
 .../appmanager/jsonrpc/UpdateAppConfig.java   | 102 ++++
 .../core/appmanager/translation_de.properties |  33 +-
 .../core/appmanager/translation_en.properties |  33 +-
 .../ComponentManagerImpl.java                 |  19 +
 .../io/openems/edge/app/TestPermissions.java  | 169 ++++++
 .../app/api/TestModbusTcpApiReadWrite.java    |  12 +-
 .../AppPropertyPermissionsTest.java           |  82 +++
 .../io/openems/edge/core/appmanager/Apps.java |  33 ++
 .../edge/core/appmanager/DummyApp.java        |  26 +-
 .../appmanager/DummyAppManagerAppHelper.java  |   7 +
 .../DummyPseudoComponentManager.java          |  12 +
 .../UpdateComponentDirectlyTest.java          |  48 ++
 .../edge/edge2edge/ess/Edge2EdgeEss.java      |   8 +-
 .../edge/ess/api/ManagedSymmetricEss.java     |   6 +
 .../io/openems/edge/ess/api/SymmetricEss.java |  23 +-
 .../evcs/hardybarth/HardyBarthReadUtils.java  |  51 +-
 .../hardybarth/EvcsHardyBarthImplTest.java    | 219 ++++++++
 .../keba/kecontact/EvcsKebaKeContact.java     |  10 +-
 .../keba/kecontact/{Plug.java => R2Plug.java} |  27 +-
 .../edge/evcs/keba/kecontact/R2State.java     |  56 ++
 .../edge/evcs/keba/kecontact/ReadHandler.java |  99 +++-
 .../kecontact/EvcsKebaKeContactImplTest.java  |   8 +-
 .../evcs/keba/kecontact/ReadHandlerTest.java  |  39 ++
 .../io/weidmueller/IoWeidmuellerUr20.java     |   2 +-
 .../io/weidmueller/IoWeidmuellerUr20Impl.java |  14 +-
 .../edge/io/weidmueller/URemoteModule.java    |   2 +-
 .../IoWeidmuellerUr20ImplTest.java            |   2 +-
 .../ModbusTcpApi/overview/overview.html       |  38 +-
 .../storagechartoverview.component.html       |  14 +-
 .../Controller/ModbusTcpApi/modal/modal.ts    |   4 +-
 .../formly-safe-input-modal.component.html    |   2 +-
 .../settings/profile/profile.component.html   |  10 +-
 .../settings/profile/profile.component.ts     |   4 +-
 ui/src/app/index/login.component.ts           |   4 +
 .../shared/components/edge/edgeconfig.spec.ts |  12 +
 .../app/shared/components/edge/edgeconfig.ts  |   2 +
 .../components/formly/form-field.wrapper.ts   |  12 +-
 .../formly/formly-select/formly-select.ts     |  33 ++
 .../formly/input-serial-number-wrapper.html   |  33 +-
 .../app/shared/components/formly/input.html   |  11 +-
 ui/src/app/shared/components/formly/input.ts  |   3 +-
 ui/src/app/shared/shared.module.ts            |   3 +
 ui/src/global.scss                            |  16 +
 116 files changed, 4637 insertions(+), 989 deletions(-)
 rename {io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo => io.openems.common/src/io/openems/common/types}/DebugMode.java (88%)
 create mode 100644 io.openems.common/src/io/openems/common/utils/StreamUtils.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/{ModbusTcpApi.java => ModbusApi.java} (97%)
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/{ => tcp}/Config.java (93%)
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/{ => tcp}/ControllerApiModbusTcpReadOnly.java (87%)
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/{ => tcp}/ControllerApiModbusTcpReadOnlyImpl.java (74%)
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java
 create mode 100644 io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/{ => tcp}/Config.java (94%)
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/{ => tcp}/ControllerApiModbusTcpReadWrite.java (97%)
 rename io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/{ => tcp}/ControllerApiModbusTcpReadWriteImpl.java (86%)
 create mode 100644 io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java
 create mode 100644 io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java
 rename io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/{ => tcp}/ControllerApiModbusTcpReadOnlyImplTest.java (93%)
 rename io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/{ => tcp}/MyConfig.java (96%)
 create mode 100644 io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java
 create mode 100644 io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java
 rename io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/{ => tcp}/ControllerApiModbusTcpReadWriteImplTest.java (72%)
 rename io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/{ => tcp}/MyConfig.java (97%)
 create mode 100644 io.openems.edge.core/src/io/openems/edge/app/api/ModbusApiProps.java
 create mode 100644 io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadOnly.java
 create mode 100644 io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadWrite.java
 delete mode 100644 io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiProps.java
 create mode 100644 io.openems.edge.core/src/io/openems/edge/app/core/AppMeta.java
 create mode 100644 io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetEstimatedConfiguration.java
 create mode 100644 io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppConfig.java
 create mode 100644 io.openems.edge.core/test/io/openems/edge/app/TestPermissions.java
 create mode 100644 io.openems.edge.core/test/io/openems/edge/core/appmanager/AppPropertyPermissionsTest.java
 create mode 100644 io.openems.edge.core/test/io/openems/edge/core/appmanager/UpdateComponentDirectlyTest.java
 rename io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/{Plug.java => R2Plug.java} (53%)
 create mode 100644 io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2State.java
 create mode 100644 io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadHandlerTest.java
 create mode 100644 ui/src/app/shared/components/formly/formly-select/formly-select.ts

diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/Config.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/Config.java
index 8512870c35e..22712118e26 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/Config.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/Config.java
@@ -4,6 +4,7 @@
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 import io.openems.backend.metadata.odoo.odoo.Protocol;
+import io.openems.common.types.DebugMode;
 
 @ObjectClassDefinition(//
 		name = "Metadata.Odoo", //
diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/MetadataOdoo.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/MetadataOdoo.java
index 9f28bc32346..c4e0d1c1549 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/MetadataOdoo.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/MetadataOdoo.java
@@ -71,6 +71,7 @@
 import io.openems.common.oem.OpenemsBackendOem;
 import io.openems.common.session.Language;
 import io.openems.common.session.Role;
+import io.openems.common.types.DebugMode;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.types.EdgeConfigDiff;
 import io.openems.common.types.SemanticVersion;
diff --git a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
index f5327adf50d..93c6e17ef6e 100644
--- a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
+++ b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
@@ -78,6 +78,8 @@ public SystemUpdateParams getSystemUpdateParams() {
 			.put("App.TimeOfUseTariff.Tibber", "") //
 			.put("App.Api.ModbusTcp.ReadOnly", "") //
 			.put("App.Api.ModbusTcp.ReadWrite", "") //
+			.put("App.Api.ModbusRtu.ReadOnly", "") //
+			.put("App.Api.ModbusRtu.ReadWrite", "") //
 			.put("App.Api.RestJson.ReadOnly", "") //
 			.put("App.Api.RestJson.ReadWrite", "") //
 			.put("App.Timedata.InfluxDb", "")//
diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/DebugMode.java b/io.openems.common/src/io/openems/common/types/DebugMode.java
similarity index 88%
rename from io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/DebugMode.java
rename to io.openems.common/src/io/openems/common/types/DebugMode.java
index 66c334c44c9..a2b1469fbb8 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/DebugMode.java
+++ b/io.openems.common/src/io/openems/common/types/DebugMode.java
@@ -1,4 +1,4 @@
-package io.openems.backend.metadata.odoo;
+package io.openems.common.types;
 
 public enum DebugMode {
 
diff --git a/io.openems.common/src/io/openems/common/utils/JsonUtils.java b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
index 954e55fa99d..68329dbc164 100644
--- a/io.openems.common/src/io/openems/common/utils/JsonUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
@@ -23,7 +23,6 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
-import com.google.common.collect.Sets;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -445,7 +444,7 @@ public static class JsonArrayCollector implements Collector<JsonElement, JsonArr
 
 		@Override
 		public Set<Characteristics> characteristics() {
-			return Sets.<Characteristics>newHashSet().stream().collect(Sets.toImmutableEnumSet());
+			return Set.of();
 		}
 
 		@Override
@@ -461,7 +460,7 @@ public BiConsumer<JsonArrayBuilder, JsonElement> accumulator() {
 		@Override
 		public BinaryOperator<JsonArrayBuilder> combiner() {
 			return (t, u) -> {
-				u.build().forEach(j -> t.add(j));
+				u.build().forEach(t::add);
 				return t;
 			};
 		}
@@ -604,7 +603,6 @@ public static JsonPrimitive getAsPrimitive(JsonElement jElement, String memberNa
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link JsonPrimitive} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<JsonPrimitive> getAsOptionalPrimitive(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toPrimitive(toSubElement(jElement, memberName)));
@@ -634,7 +632,6 @@ public static JsonElement getSubElement(JsonElement jElement, String memberName)
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link JsonElement} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<JsonElement> getOptionalSubElement(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toSubElement(jElement, memberName));
@@ -677,7 +674,6 @@ public static JsonObject getAsJsonObject(JsonElement jElement, String memberName
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link JsonObject} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<JsonObject> getAsOptionalJsonObject(JsonElement jElement) {
 		return Optional.ofNullable(toJsonObject(jElement));
@@ -690,7 +686,6 @@ public static Optional<JsonObject> getAsOptionalJsonObject(JsonElement jElement)
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link JsonObject} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<JsonObject> getAsOptionalJsonObject(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toJsonObject(toSubElement(jElement, memberName)));
@@ -733,7 +728,6 @@ public static JsonArray getAsJsonArray(JsonElement jElement, String memberName)
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link JsonArray} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<JsonArray> getAsOptionalJsonArray(JsonElement jElement) {
 		return Optional.ofNullable(toJsonArray(jElement));
@@ -746,7 +740,6 @@ public static Optional<JsonArray> getAsOptionalJsonArray(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link JsonArray} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<JsonArray> getAsOptionalJsonArray(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toJsonArray(toSubElement(jElement, memberName)));
@@ -789,7 +782,6 @@ public static String getAsString(JsonElement jElement, String memberName) throws
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link String} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<String> getAsOptionalString(JsonElement jElement) {
 		return Optional.ofNullable(toString(toPrimitive(jElement)));
@@ -802,7 +794,6 @@ public static Optional<String> getAsOptionalString(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link String} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<String> getAsOptionalString(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toString(toPrimitive(toSubElement(jElement, memberName))));
@@ -851,7 +842,7 @@ public static String[] getAsStringArray(JsonArray json) throws OpenemsNamedExcep
 	public static boolean getAsBoolean(JsonElement jElement) throws OpenemsNamedException {
 		var value = toBoolean(toPrimitive(jElement));
 		if (value != null) {
-			return value.booleanValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_BOOLEAN.exception(jElement.toString().replace("%", "%%"));
 	}
@@ -867,7 +858,7 @@ public static boolean getAsBoolean(JsonElement jElement) throws OpenemsNamedExce
 	public static boolean getAsBoolean(JsonElement jElement, String memberName) throws OpenemsNamedException {
 		var value = toBoolean(toPrimitive(toSubElement(jElement, memberName)));
 		if (value != null) {
-			return value.booleanValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_BOOLEAN_MEMBER.exception(memberName, jElement.toString().replace("%", "%%"));
 	}
@@ -877,7 +868,6 @@ public static boolean getAsBoolean(JsonElement jElement, String memberName) thro
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Boolean} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement) {
 		return Optional.ofNullable(toBoolean(toPrimitive(jElement)));
@@ -890,7 +880,6 @@ public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Boolean} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toBoolean(toPrimitive(toSubElement(jElement, memberName))));
@@ -906,7 +895,7 @@ public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement, Strin
 	public static short getAsShort(JsonElement jElement) throws OpenemsNamedException {
 		var value = toShort(toPrimitive(jElement));
 		if (value != null) {
-			return value.shortValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_SHORT.exception(jElement.toString().replace("%", "%%"));
 	}
@@ -932,7 +921,6 @@ public static short getAsShort(JsonElement jElement, String memberName) throws O
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Short} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Short> getAsOptionalShort(JsonElement jElement) {
 		return Optional.ofNullable(toShort(toPrimitive(jElement)));
@@ -945,7 +933,6 @@ public static Optional<Short> getAsOptionalShort(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Boolean} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Short> getAsOptionalShort(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toShort(toPrimitive(toSubElement(jElement, memberName))));
@@ -961,7 +948,7 @@ public static Optional<Short> getAsOptionalShort(JsonElement jElement, String me
 	public static int getAsInt(JsonElement jElement) throws OpenemsNamedException {
 		var value = toInt(toPrimitive(jElement));
 		if (value != null) {
-			return value.intValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_INTEGER.exception(jElement.toString().replace("%", "%%"));
 	}
@@ -1002,7 +989,6 @@ public static int getAsInt(JsonArray jArray, int index) throws OpenemsNamedExcep
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Integer} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Integer> getAsOptionalInt(JsonElement jElement) {
 		return Optional.ofNullable(toInt(toPrimitive(jElement)));
@@ -1015,7 +1001,6 @@ public static Optional<Integer> getAsOptionalInt(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Integer} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Integer> getAsOptionalInt(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toInt(toPrimitive(toSubElement(jElement, memberName))));
@@ -1031,7 +1016,7 @@ public static Optional<Integer> getAsOptionalInt(JsonElement jElement, String me
 	public static long getAsLong(JsonElement jElement) throws OpenemsNamedException {
 		var value = toLong(toPrimitive(jElement));
 		if (value != null) {
-			return value.longValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_LONG.exception(jElement.toString().replace("%", "%%"));
 	}
@@ -1057,7 +1042,6 @@ public static long getAsLong(JsonElement jElement, String memberName) throws Ope
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Long} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Long> getAsOptionalLong(JsonElement jElement) {
 		return Optional.ofNullable(toLong(toPrimitive(jElement)));
@@ -1069,7 +1053,6 @@ public static Optional<Long> getAsOptionalLong(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Long} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Long> getAsOptionalLong(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toLong(toPrimitive(toSubElement(jElement, memberName))));
@@ -1085,7 +1068,7 @@ public static Optional<Long> getAsOptionalLong(JsonElement jElement, String memb
 	public static float getAsFloat(JsonElement jElement) throws OpenemsNamedException {
 		var value = toFloat(toPrimitive(jElement));
 		if (value != null) {
-			return value.floatValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_FLOAT.exception(jElement.toString().replace("%", "%%"));
 	}
@@ -1111,7 +1094,6 @@ public static float getAsFloat(JsonElement jElement, String memberName) throws O
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Float} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Float> getAsOptionalFloat(JsonElement jElement) {
 		return Optional.ofNullable(toFloat(toPrimitive(jElement)));
@@ -1123,7 +1105,6 @@ public static Optional<Float> getAsOptionalFloat(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Float} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Float> getAsOptionalFloat(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toFloat(toPrimitive(toSubElement(jElement, memberName))));
@@ -1139,7 +1120,7 @@ public static Optional<Float> getAsOptionalFloat(JsonElement jElement, String me
 	public static double getAsDouble(JsonElement jElement) throws OpenemsNamedException {
 		var value = toDouble(toPrimitive(jElement));
 		if (value != null) {
-			return value.doubleValue();
+			return value;
 		}
 		throw OpenemsError.JSON_NO_DOUBLE.exception(jElement.toString().replace("%", "%%"));
 	}
@@ -1165,7 +1146,6 @@ public static double getAsDouble(JsonElement jElement, String memberName) throws
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Double} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Double> getAsOptionalDouble(JsonElement jElement) {
 		return Optional.ofNullable(toDouble(toPrimitive(jElement)));
@@ -1178,7 +1158,6 @@ public static Optional<Double> getAsOptionalDouble(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Double} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Double> getAsOptionalDouble(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(toDouble(toPrimitive(toSubElement(jElement, memberName))));
@@ -1228,7 +1207,6 @@ public static <E extends Enum<E>> E getAsEnum(Class<E> enumType, JsonElement jEl
 	 * @param enumType the class of the {@link Enum}
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Enum} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static <E extends Enum<E>> Optional<E> getAsOptionalEnum(Class<E> enumType, JsonElement jElement) {
 		return Optional.ofNullable(toEnum(enumType, toString(toPrimitive(jElement))));
@@ -1242,7 +1220,6 @@ public static <E extends Enum<E>> Optional<E> getAsOptionalEnum(Class<E> enumTyp
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Enum} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static <E extends Enum<E>> Optional<E> getAsOptionalEnum(Class<E> enumType, JsonElement jElement,
 			String memberName) {
@@ -1285,7 +1262,6 @@ public static Inet4Address getAsInet4Address(JsonElement jElement, String member
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link Inet4Address} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Inet4Address> getAsOptionalInet4Address(JsonElement jElement) {
 		return Optional.ofNullable(InetAddressUtils.parseOrNull(toString(toPrimitive(jElement))));
@@ -1298,7 +1274,6 @@ public static Optional<Inet4Address> getAsOptionalInet4Address(JsonElement jElem
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link Inet4Address} value
-	 * @throws OpenemsNamedException on error
 	 */
 	public static Optional<Inet4Address> getAsOptionalInet4Address(JsonElement jElement, String memberName) {
 		return Optional.ofNullable(//
@@ -1345,7 +1320,6 @@ public static UUID getAsUUID(JsonElement jElement, String memberName) throws Ope
 	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Optional} {@link UUID} value
-	 * @throws OpenemsNamedException on error
 	 */
 	// CHECKSTYLE:OFF
 	public static Optional<UUID> getAsOptionalUUID(JsonElement jElement) {
@@ -1359,7 +1333,6 @@ public static Optional<UUID> getAsOptionalUUID(JsonElement jElement) {
 	 * @param jElement   the {@link JsonElement}
 	 * @param memberName the name of the member
 	 * @return the {@link Optional} {@link UUID} value
-	 * @throws OpenemsNamedException on error
 	 */
 	// CHECKSTYLE:OFF
 	public static Optional<UUID> getAsOptionalUUID(JsonElement jElement, String memberName) {
@@ -1379,7 +1352,7 @@ public static Object getAsBestType(JsonElement j) throws OpenemsNamedException {
 		try {
 			if (j.isJsonArray()) {
 				var jA = (JsonArray) j;
-				if (jA.size() == 0) {
+				if (jA.isEmpty()) {
 					return new Object[0];
 				}
 				// identify the array type (boolean, int or String)
@@ -1453,132 +1426,88 @@ public static Object getAsBestType(JsonElement j) throws OpenemsNamedException {
 	 * @return the {@link JsonElement}
 	 */
 	public static JsonElement getAsJsonElement(Object value) {
-		// null
-		if (value == null) {
-			return JsonNull.INSTANCE;
-		}
 		// optional
-		if (value instanceof Optional<?>) {
-			if (!((Optional<?>) value).isPresent()) {
+		if (value instanceof Optional<?> opt) {
+			if (opt.isEmpty()) {
 				return JsonNull.INSTANCE;
 			}
-			value = ((Optional<?>) value).get();
-		}
-		if (value instanceof Number) {
-			/*
-			 * Number
-			 */
-			return new JsonPrimitive((Number) value);
-		}
-		if (value instanceof String) {
-			/*
-			 * String
-			 */
-			return new JsonPrimitive((String) value);
-		}
-		if (value instanceof Boolean) {
-			/*
-			 * Boolean
-			 */
-			return new JsonPrimitive((Boolean) value);
-		}
-		if (value instanceof Inet4Address) {
-			/*
-			 * Inet4Address
-			 */
-			return new JsonPrimitive(((Inet4Address) value).getHostAddress());
-		}
-		if (value instanceof JsonElement) {
-			/*
-			 * JsonElement
-			 */
-			return (JsonElement) value;
-		} else if (value instanceof boolean[]) {
-			/*
-			 * boolean-Array
-			 */
+			value = opt.get();
+		}
+
+		return switch (value) {
+		case null -> JsonNull.INSTANCE;
+		case Number n -> new JsonPrimitive(n);
+		case String s -> new JsonPrimitive(s);
+		case Boolean b -> new JsonPrimitive(b);
+		case Inet4Address inet -> new JsonPrimitive(inet.getHostAddress());
+		case JsonElement json -> json;
+		case boolean[] bool -> {
 			var js = new JsonArray();
-			for (boolean b : (boolean[]) value) {
+			for (boolean b : bool) {
 				js.add(new JsonPrimitive(b));
 			}
-			return js;
-		} else if (value instanceof short[]) {
-			/*
-			 * short-Array
-			 */
+			yield js;
+		}
+		case short[] shorts -> {
 			var js = new JsonArray();
-			for (short s : (short[]) value) {
+			for (short s : shorts) {
 				js.add(new JsonPrimitive(s));
 			}
-			return js;
-		} else if (value instanceof int[]) {
-			/*
-			 * int-Array
-			 */
+			yield js;
+		}
+		case int[] ints -> {
 			var js = new JsonArray();
-			for (int i : (int[]) value) {
+			for (int i : ints) {
 				js.add(new JsonPrimitive(i));
 			}
-			return js;
-		} else if (value instanceof long[]) {
-			/*
-			 * long-Array
-			 */
+			yield js;
+		}
+		case long[] longs -> {
 			var js = new JsonArray();
-			for (long l : (long[]) value) {
+			for (long l : longs) {
 				js.add(new JsonPrimitive(l));
 			}
-			return js;
-		} else if (value instanceof float[]) {
-			/*
-			 * float-Array
-			 */
+			yield js;
+		}
+		case float[] floats -> {
 			var js = new JsonArray();
-			for (float f : (float[]) value) {
+			for (float f : floats) {
 				js.add(new JsonPrimitive(f));
 			}
-			return js;
-		} else if (value instanceof double[]) {
-			/*
-			 * double-Array
-			 */
+			yield js;
+		}
+		case double[] doubles -> {
 			var js = new JsonArray();
-			for (double d : (double[]) value) {
-				js.add(new JsonPrimitive(d));
+			for (double f : doubles) {
+				js.add(new JsonPrimitive(f));
 			}
-			return js;
-		} else if (value instanceof String[]) {
-			/*
-			 * String-Array
-			 */
+			yield js;
+		}
+		case String[] strings -> {
 			var js = new JsonArray();
-			var v = (String[]) value;
-			if (v.length == 1 && v[0].isEmpty()) {
+			if (strings.length == 1 && strings[0].isEmpty()) {
 				// special case: String-Array with one entry which is an empty String. Return an
 				// empty JsonArray.
-				return js;
+				yield js;
 			}
-			for (String s : v) {
+			for (String s : strings) {
 				js.add(new JsonPrimitive(s));
 			}
-			return js;
-		} else if (value instanceof Object[]) {
-			/*
-			 * Object-Array
-			 */
+			yield js;
+		}
+		case Object[] objects -> {
 			var js = new JsonArray();
-			for (Object o : (Object[]) value) {
+			for (Object o : objects) {
 				js.add(JsonUtils.getAsJsonElement(o));
 			}
-			return js;
-		} else {
-			/*
-			 * Use toString()-method
-			 */
-			JsonUtils.LOG.warn("Converter for [" + value + "]" + " of type [" + value.getClass().getSimpleName()
-					+ "] to JSON is not implemented.");
-			return new JsonPrimitive(value.toString());
+			yield js;
 		}
+		default -> {
+			JsonUtils.LOG.warn("Converter for [{}] of type [{}] to JSON is not implemented.", //
+					value, value.getClass().getSimpleName());
+			yield new JsonPrimitive(value.toString());
+		}
+		};
 	}
 
 	/**
@@ -1631,11 +1560,11 @@ public static Object getAsType(Class<?> type, JsonElement j) throws NotImplement
 				 */
 				return j.getAsJsonArray();
 			} else if (type.isArray()) {
-				/**
+				/*
 				 * Asking for Array
 				 */
 				if (Long.class.isAssignableFrom(type.getComponentType())) {
-					/**
+					/*
 					 * Asking for ArrayOfLong
 					 */
 					if (j.isJsonArray()) {
@@ -1671,22 +1600,15 @@ public static <T> T getAsType(OpenemsType type, JsonElement j) throws OpenemsNam
 		}
 
 		if (j.isJsonPrimitive()) {
-			switch (type) {
-			case BOOLEAN:
-				return (T) Boolean.valueOf(JsonUtils.getAsBoolean(j));
-			case DOUBLE:
-				return (T) Double.valueOf(JsonUtils.getAsDouble(j));
-			case FLOAT:
-				return (T) Float.valueOf(JsonUtils.getAsFloat(j));
-			case INTEGER:
-				return (T) Integer.valueOf(JsonUtils.getAsInt(j));
-			case LONG:
-				return (T) Long.valueOf(JsonUtils.getAsLong(j));
-			case SHORT:
-				return (T) Short.valueOf(JsonUtils.getAsShort(j));
-			case STRING:
-				return (T) JsonUtils.getAsString(j);
-			}
+			return switch (type) {
+			case BOOLEAN -> (T) Boolean.valueOf(JsonUtils.getAsBoolean(j));
+			case DOUBLE -> (T) Double.valueOf(JsonUtils.getAsDouble(j));
+			case FLOAT -> (T) Float.valueOf(JsonUtils.getAsFloat(j));
+			case INTEGER -> (T) Integer.valueOf(JsonUtils.getAsInt(j));
+			case LONG -> (T) Long.valueOf(JsonUtils.getAsLong(j));
+			case SHORT -> (T) Short.valueOf(JsonUtils.getAsShort(j));
+			case STRING -> (T) JsonUtils.getAsString(j);
+			};
 		}
 
 		if (j.isJsonObject() || j.isJsonArray()) {
@@ -1715,7 +1637,7 @@ public static <T> T getAsType(OpenemsType type, JsonElement j) throws OpenemsNam
 	 * @return an Object of the given type
 	 */
 	public static Object getAsType(Optional<Class<?>> typeOptional, JsonElement j) throws NotImplementedException {
-		if (!typeOptional.isPresent()) {
+		if (typeOptional.isEmpty()) {
 			throw new NotImplementedException(
 					"Type of Channel was not set: " + (j == null ? "UNDEFINED" : j.getAsString()));
 		}
@@ -1880,7 +1802,7 @@ public static String prettyToString(JsonElement j) {
 	public static boolean isEmptyJsonObject(JsonElement j) {
 		if (j != null && j.isJsonObject()) {
 			var object = j.getAsJsonObject();
-			return object.size() == 0;
+			return object.isEmpty();
 		}
 
 		return false;
@@ -1895,7 +1817,7 @@ public static boolean isEmptyJsonObject(JsonElement j) {
 	public static boolean isEmptyJsonArray(JsonElement j) {
 		if (j != null && j.isJsonArray()) {
 			var array = j.getAsJsonArray();
-			return array.size() == 0;
+			return array.isEmpty();
 		}
 
 		return false;
@@ -1920,7 +1842,7 @@ public static boolean isNumber(JsonElement j) {
 	 */
 	public static Stream<JsonElement> stream(JsonArray jsonArray) {
 		return IntStream.range(0, jsonArray.size()) //
-				.mapToObj(index -> jsonArray.get(index));
+				.mapToObj(jsonArray::get);
 	}
 
 	private static JsonObject toJsonObject(JsonElement jElement) {
diff --git a/io.openems.common/src/io/openems/common/utils/StreamUtils.java b/io.openems.common/src/io/openems/common/utils/StreamUtils.java
new file mode 100644
index 00000000000..9a831452028
--- /dev/null
+++ b/io.openems.common/src/io/openems/common/utils/StreamUtils.java
@@ -0,0 +1,25 @@
+package io.openems.common.utils;
+
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Stream;
+
+public class StreamUtils {
+
+	/**
+	 * Converts a Dictionary to a Stream of Map entries.
+	 *
+	 * @param dictionary the Dictionary to be converted
+	 * @param <K>        the type of keys in the Dictionary
+	 * @param <V>        the type of values in the Dictionary
+	 * @return a Stream containing all the key-value pairs from the Dictionary as
+	 *         Map entries
+	 */
+	public static <K, V> Stream<Entry<K, V>> dictionaryToStream(Dictionary<K, V> dictionary) {
+		Enumeration<K> keys = dictionary.keys();
+		return Collections.list(keys).stream().map(key -> Map.entry(key, dictionary.get(key)));
+	}
+}
diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
index 32aa035b4f1..8e731a87612 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
@@ -135,6 +135,20 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		DC_MAX_VOLTAGE(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.VOLT) //
 				.persistencePriority(PersistencePriority.HIGH) //
+		), //
+
+		/**
+		 * Inverter Cabinet Temperature.
+		 * 
+		 * <ul>
+		 * <li>Interface: SymmetricBatteryInverter
+		 * <li>Type: Integer
+		 * <li>Unit: C
+		 * </ul>
+		 */
+		TEMPERATURE_CABINET(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.DEGREE_CELSIUS) //
+				.persistencePriority(PersistencePriority.HIGH) //
 		);
 
 		private final Doc doc;
@@ -463,4 +477,23 @@ public default void _setDcMaxVoltage(Integer value) {
 	public default void _setDcMaxVoltage(int value) {
 		this.getDcMaxVoltageChannel().setNextValue(value);
 	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#TEMPERATURE_CABINET}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getTemperatureCabinetChannel() {
+		return this.channel(ChannelId.TEMPERATURE_CABINET);
+	}
+
+	/**
+	 * Gets the Inverters Cabinet temperature in [C]. See
+	 * {@link ChannelId#TEMPERATURE_CABINET}.
+	 *
+	 * @return the Channel {@link Value}
+	 */
+	public default Value<Integer> getTemperatureCabinet() {
+		return this.getTemperatureCabinetChannel().value();
+	}
 }
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java
index 460236c183c..4cf1838b0a2 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java
@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.openems.common.types.DebugMode;
 import io.openems.common.utils.FunctionUtils;
 import io.openems.edge.bridge.http.api.BridgeHttp;
 import io.openems.edge.bridge.http.api.BridgeHttpExecutor;
@@ -145,6 +146,8 @@ public void shutdown() {
 
 	private final Set<TimeEndpointCountdown> timeEndpoints = ConcurrentHashMap.newKeySet();
 
+	private DebugMode debugMode = DebugMode.OFF;
+
 	@Activate
 	public BridgeHttpImpl(//
 			@Reference final CycleSubscriber cycleSubscriber, //
@@ -170,6 +173,11 @@ public void deactivate() {
 		this.timeEndpoints.clear();
 	}
 
+	@Override
+	public void setDebugMode(DebugMode debugMode) {
+		this.debugMode = debugMode;
+	}
+
 	@Override
 	public CycleEndpoint subscribeCycle(CycleEndpoint endpoint) {
 		Objects.requireNonNull(endpoint, "CycleEndpoint is not allowed to be null!");
@@ -202,7 +210,7 @@ public CompletableFuture<HttpResponse<String>> request(Endpoint endpoint) {
 		final var future = new CompletableFuture<HttpResponse<String>>();
 		this.pool.execute(() -> {
 			try {
-				final var result = this.urlFetcher.fetchEndpoint(endpoint);
+				final var result = this.urlFetcher.fetchEndpoint(endpoint, this.debugMode);
 				future.complete(result);
 			} catch (HttpError e) {
 				future.completeExceptionally(e);
@@ -252,7 +260,8 @@ private void handleEvent(Event event) {
 	private Runnable createTask(CycleEndpointCountdown endpointItem) {
 		return () -> {
 			try {
-				final var result = this.urlFetcher.fetchEndpoint(endpointItem.getCycleEndpoint().endpoint().get());
+				final var result = this.urlFetcher.fetchEndpoint(endpointItem.getCycleEndpoint().endpoint().get(),
+						this.debugMode);
 				endpointItem.getCycleEndpoint().onResult().accept(result);
 			} catch (HttpError e) {
 				endpointItem.getCycleEndpoint().onError().accept(e);
@@ -275,7 +284,8 @@ private Runnable createTask(TimeEndpointCountdown endpointCountdown) {
 			HttpResponse<String> result = null;
 			HttpError error = null;
 			try {
-				result = this.urlFetcher.fetchEndpoint(endpointCountdown.getTimeEndpoint().endpoint().get());
+				result = this.urlFetcher.fetchEndpoint(endpointCountdown.getTimeEndpoint().endpoint().get(),
+						this.debugMode);
 				endpointCountdown.getTimeEndpoint().onResult().accept(result);
 			} catch (HttpError e) {
 				endpointCountdown.getTimeEndpoint().onError().accept(e);
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java
index 3a751cd7ffc..9add30c9497 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java
@@ -10,9 +10,13 @@
 import java.net.URI;
 
 import org.osgi.service.component.annotations.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import io.openems.common.types.DebugMode;
 import io.openems.common.types.HttpStatus;
 import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint;
+import io.openems.edge.bridge.http.dummy.DummyEndpointFetcher;
 import io.openems.edge.bridge.http.api.EndpointFetcher;
 import io.openems.edge.bridge.http.api.HttpError;
 import io.openems.edge.bridge.http.api.HttpResponse;
@@ -20,8 +24,10 @@
 @Component
 public class NetworkEndpointFetcher implements EndpointFetcher {
 
+	private final Logger log = LoggerFactory.getLogger(DummyEndpointFetcher.class);
+
 	@Override
-	public HttpResponse<String> fetchEndpoint(final Endpoint endpoint) throws HttpError {
+	public HttpResponse<String> fetchEndpoint(final Endpoint endpoint, DebugMode mode) throws HttpError {
 		try {
 			var url = URI.create(endpoint.url()).toURL();
 			var con = (HttpURLConnection) url.openConnection();
@@ -53,6 +59,12 @@ public HttpResponse<String> fetchEndpoint(final Endpoint endpoint) throws HttpEr
 			if (status.isError()) {
 				throw new HttpError.ResponseError(status, body);
 			}
+			if (mode.equals(DebugMode.DETAILED)) {
+				this.log.debug("Fetched Endpoint for request: " + endpoint.url() + "\n" //
+						+ "method: " + endpoint.method().name() + "\n" //
+						+ "result: " + body //
+				);
+			}
 			return new HttpResponse<>(status, body);
 		} catch (IOException e) {
 			throw new HttpError.UnknownError(e);
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java
index 52e198f75f8..d3cbf4352e9 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java
@@ -10,6 +10,7 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.function.ThrowingFunction;
+import io.openems.common.types.DebugMode;
 import io.openems.common.utils.JsonUtils;
 
 /**
@@ -73,6 +74,8 @@ public record Endpoint(//
 
 	}
 
+	public void setDebugMode(DebugMode debugMode);
+
 	/**
 	 * Fetches the url once with {@link HttpMethod#GET}.
 	 * 
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java
index c2467110749..e0d1bb54235 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java
@@ -1,6 +1,7 @@
 package io.openems.edge.bridge.http.api;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.types.DebugMode;
 import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint;
 
 public interface EndpointFetcher {
@@ -9,10 +10,11 @@ public interface EndpointFetcher {
 	 * Creates a {@link Runnable} to execute a request with the given parameters.
 	 * 
 	 * @param endpoint the {@link Endpoint} to fetch
+	 * @param mode     the {@link DebugMode}
 	 * 
 	 * @return the result of the {@link Endpoint}
 	 * @throws OpenemsNamedException on error
 	 */
-	public HttpResponse<String> fetchEndpoint(Endpoint endpoint) throws HttpError;
+	public HttpResponse<String> fetchEndpoint(Endpoint endpoint, DebugMode mode) throws HttpError;
 
 }
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java
index 99040297ca2..647c1d3e6be 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java
@@ -6,6 +6,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 
+import io.openems.common.types.DebugMode;
 import io.openems.edge.bridge.http.api.BridgeHttp;
 import io.openems.edge.bridge.http.api.HttpResponse;
 
@@ -55,4 +56,9 @@ public Collection<TimeEndpoint> removeTimeEndpointIf(Predicate<TimeEndpoint> con
 		return emptyList();
 	}
 
+	@Override
+	public void setDebugMode(DebugMode debugMode) {
+		// do nothing
+	}
+
 }
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java
index 907c714f0d5..269148dd1a9 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java
@@ -7,6 +7,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.function.ThrowingFunction;
+import io.openems.common.types.DebugMode;
 import io.openems.common.utils.FunctionUtils;
 import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint;
 import io.openems.edge.bridge.http.api.EndpointFetcher;
@@ -29,7 +30,8 @@ public record DummyHandler(//
 
 	@Override
 	public HttpResponse<String> fetchEndpoint(//
-			final Endpoint endpoint //
+			final Endpoint endpoint, //
+			DebugMode mode //
 	) throws HttpError {
 		try {
 			for (final var iterator = this.urlHandler.iterator(); iterator.hasNext();) {
@@ -89,5 +91,4 @@ public void addSingleUseEndpointHandler(ThrowingFunction<Endpoint, HttpResponse<
 	public void setOnTaskFinished(Runnable onTaskFinished) {
 		this.onTaskFinished = onTaskFinished == null ? FunctionUtils::doNothing : onTaskFinished;
 	}
-
 }
diff --git a/io.openems.edge.bridge.onewire/bnd.bnd b/io.openems.edge.bridge.onewire/bnd.bnd
index e61cf21d959..017e4a82b22 100644
--- a/io.openems.edge.bridge.onewire/bnd.bnd
+++ b/io.openems.edge.bridge.onewire/bnd.bnd
@@ -12,8 +12,8 @@ Export-Package: \
 	com.dalsemi.onewire.application.tag,\
 	com.dalsemi.onewire.container,\
 	com.dalsemi.onewire.debug,\
-	io.openems.edge.bridge.onewire,\
 	com.dalsemi.onewire.utils,\
+	io.openems.edge.bridge.onewire,\
 	gnu.io
 
 Include-Resource: \
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
index ea444764b63..9ea55060009 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
@@ -2,6 +2,7 @@
 
 import java.time.Clock;
 import java.util.List;
+import java.util.Map;
 
 import org.osgi.framework.BundleContext;
 
@@ -173,6 +174,20 @@ public default void _setDefaultConfigurationFailed(boolean value) {
 	@Override
 	public Clock getClock();
 
+	/**
+	 * Gets the component properties by its component id.
+	 * 
+	 * @param componentId the id of the component
+	 * @return the properties or a empty map if none found
+	 * @implNote this method is preferred to use when only the properties of an
+	 *           component are of interest. Because of OSGi delivering the component
+	 *           updates asynchronously and if a component update happens the config
+	 *           update may not reflect immediately to the config of the
+	 *           implementation of that component but this method uses the direct
+	 *           configuration in the service registration.
+	 */
+	public Map<String, Object> getComponentProperties(String componentId);
+
 	/**
 	 * Gets all enabled OpenEMS-Components.
 	 * 
diff --git a/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java b/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
index b065cb50c18..c42c686cdc2 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
@@ -398,7 +398,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		CONSUMPTION_ACTIVE_POWER(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Active power of the electrical consumption")), //
 		/**
 		 * Consumption: Active Power L1.
 		 *
@@ -413,7 +414,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		CONSUMPTION_ACTIVE_POWER_L1(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Active power of the electrical consumption on phase L1")), //
 		/**
 		 * Consumption: Active Power L2.
 		 *
@@ -428,7 +430,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		CONSUMPTION_ACTIVE_POWER_L2(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Active power of the electrical consumption on phase L2")), //
 		/**
 		 * Consumption: Active Power L3.
 		 *
@@ -443,7 +446,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		CONSUMPTION_ACTIVE_POWER_L3(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Active power of the electrical consumption on phase L3")), //
 		/**
 		 * Consumption: Maximum Ever Active Power.
 		 *
@@ -456,7 +460,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		CONSUMPTION_MAX_ACTIVE_POWER(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Maximum measured active power of the electrical consumpton")), //
 		/**
 		 * Unmanaged Consumption: Active Power.
 		 *
@@ -521,7 +526,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		ESS_ACTIVE_CHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of the AC-side storage charging incl. excess PV generation at the hybrid inverter")), //
 		/**
 		 * Ess: Active Discharge Energy.
 		 *
@@ -533,7 +539,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		ESS_ACTIVE_DISCHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of the AC-side storage discharge incl. excess PV generation at the hybrid inverter")), //
 		/**
 		 * Ess: DC Discharge Energy.
 		 *
@@ -545,7 +552,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		ESS_DC_DISCHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated DC electrical energy of the storage discharging")), //
 		/**
 		 * Ess: DC Charge Energy.
 		 *
@@ -557,7 +565,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		ESS_DC_CHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated DC electrical energy of the storage charging")), //
 		/**
 		 * Grid: Buy-from-grid Energy ("Production").
 		 *
@@ -569,7 +578,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		GRID_BUY_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of grid consumption")), //
 		/**
 		 * Grid: Sell-to-grid Energy ("Consumption").
 		 *
@@ -581,7 +591,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		GRID_SELL_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of grid feed-in")), //
 		/**
 		 * Production: Energy.
 		 *
@@ -592,7 +603,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		PRODUCTION_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of DC- and AC-side generators, e.g. photovoltaics")), //
 		/**
 		 * Production: AC Energy.
 		 *
@@ -604,7 +616,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		PRODUCTION_AC_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of AC-side generators")), //
 		/**
 		 * Production: DC Energy.
 		 *
@@ -616,7 +629,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		PRODUCTION_DC_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy of DC-side generators")), //
 		/**
 		 * Consumption: Energy.
 		 *
@@ -628,7 +642,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		CONSUMPTION_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
 				.unit(Unit.CUMULATED_WATT_HOURS) //
-				.persistencePriority(PersistencePriority.VERY_HIGH)), //
+				.persistencePriority(PersistencePriority.VERY_HIGH) //
+				.text("Accumulated electrical energy consumption")), //
 
 		/**
 		 * Is there any Component Info/Warning/Fault that is getting ignored/hidden
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
index fe893c48292..45bf636acd1 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
@@ -7,8 +7,12 @@
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -29,6 +33,7 @@
 import io.openems.common.jsonrpc.response.GetEdgeConfigResponse;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.utils.JsonUtils;
+import io.openems.common.utils.StreamUtils;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -271,4 +276,15 @@ public void setConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
 		this.configurationAdmin = configurationAdmin;
 	}
 
+	@Override
+	public Map<String, Object> getComponentProperties(String componentId) {
+		try {
+			var component = this.getComponent(componentId);
+			return StreamUtils.dictionaryToStream(component.getComponentContext().getProperties())//
+					.collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+		} catch (OpenemsNamedException e) {
+			return Collections.emptyMap();
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/bnd.bnd b/io.openems.edge.controller.api.modbus/bnd.bnd
index 87fd5d5a4a8..aaaa2848a5c 100644
--- a/io.openems.edge.controller.api.modbus/bnd.bnd
+++ b/io.openems.edge.controller.api.modbus/bnd.bnd
@@ -5,14 +5,15 @@ Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
-	com.ghgande.j2mod;version=2.5.5,\
+	com.ghgande.j2mod,\
 	io.openems.common,\
+	io.openems.edge.bridge.modbus,\
 	io.openems.edge.common,\
 	io.openems.edge.controller.api,\
 	io.openems.edge.controller.api.common,\
 	io.openems.edge.ess.api,\
 	io.openems.edge.timedata.api,\
-	io.openems.wrapper.fastexcel
+	io.openems.wrapper.fastexcel,\
 
 -testpath: \
 	${testpath}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java
new file mode 100644
index 00000000000..6ffd1472af7
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java
@@ -0,0 +1,484 @@
+package io.openems.edge.controller.api.modbus;
+
+import java.util.List;
+import java.util.TreeMap;
+import java.util.Map.Entry;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.utils.ConfigUtils;
+import io.openems.common.utils.FunctionUtils;
+import io.openems.common.worker.AbstractWorker;
+import io.openems.edge.common.channel.Channel;
+import io.openems.edge.common.channel.WriteChannel;
+import io.openems.edge.common.component.AbstractOpenemsComponent;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.jsonapi.JsonApiBuilder;
+import io.openems.edge.common.jsonapi.JsonrpcEndpointGuard;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.common.modbusslave.ModbusRecord;
+import io.openems.edge.common.modbusslave.ModbusRecordChannel;
+import io.openems.edge.common.modbusslave.ModbusRecordCycleValue;
+import io.openems.edge.common.modbusslave.ModbusRecordString16;
+import io.openems.edge.common.modbusslave.ModbusRecordUint16BlockLength;
+import io.openems.edge.common.modbusslave.ModbusRecordUint16Hash;
+import io.openems.edge.common.modbusslave.ModbusSlave;
+import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.api.common.ApiWorker;
+import io.openems.edge.controller.api.common.Status;
+import io.openems.edge.controller.api.common.WriteObject;
+import io.openems.edge.controller.api.common.WritePojo;
+import io.openems.edge.controller.api.common.ApiWorker.WriteHandler;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxRequest;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxResponse;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolRequest;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolResponse;
+
+public abstract class AbstractModbusApi extends AbstractOpenemsComponent
+		implements ModbusApi, ComponentJsonApi, Controller {
+
+	public static final int UNIT_ID = 1;
+	public static final int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 5;
+
+	/**
+	 * Holds the link between Modbus start address of a Component and the
+	 * Component-ID.
+	 */
+	protected final TreeMap<Integer, String> components = new TreeMap<>();
+	protected final TreeMap<Integer, ModbusRecord> records = new TreeMap<>();
+	protected volatile List<ModbusSlave> _components = new CopyOnWriteArrayList<>();
+	protected List<OpenemsComponent> invalidComponents = new CopyOnWriteArrayList<>();
+	protected final Logger log = LoggerFactory.getLogger(AbstractModbusApi.class);
+	protected final MyProcessImage processImage;
+
+	/**
+	 * Holds the link between Modbus address and ModbusRecord.
+	 */
+	protected final ApiWorker apiWorker = new ApiWorker(this,
+			new WriteHandler(this.handleWrites(), this::setOverrideStatus, this.handleTimeouts()));
+
+	private AbstractModbusConfig config;
+
+	protected AbstractModbusApi(io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
+			io.openems.edge.common.channel.ChannelId[][] furtherInitialChannelIds) {
+		super(firstInitialChannelIds, furtherInitialChannelIds);
+		this.processImage = new MyProcessImage(this);
+	}
+
+	protected void activate(ComponentContext context, ConfigurationAdmin cm, AbstractModbusConfig config)
+			throws OpenemsException {
+		this.config = config;
+		super.activate(context, config.id(), config.alias(), config.enabled());
+
+		final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds());
+		OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
+
+		this.apiWorker.setTimeoutSeconds(config.apiTimeout());
+
+		if (!this.isEnabled()) {
+			return;
+		}
+
+		this.startApiWorker.activate(config.id());
+
+	}
+
+	protected void modified(ComponentContext context, ConfigurationAdmin cm, AbstractModbusConfig config)
+			throws OpenemsException {
+		super.modified(context, config.id(), config.alias(), config.enabled());
+
+		final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds());
+		OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
+
+		if (this.config.equals(config)) {
+			return;
+		}
+
+		this.config = config;
+
+		this.apiWorker.setTimeoutSeconds(config.apiTimeout());
+
+		if (!this.isEnabled()) {
+			this.startApiWorker.deactivate();
+			return;
+		}
+
+		this.startApiWorker.modified(config.id());
+
+	}
+
+	@Override
+	protected void deactivate() {
+		this.startApiWorker.deactivate();
+		super.deactivate();
+
+		// wait until modbus slave was completely closed
+		try {
+			Thread.sleep(10000);
+		} catch (InterruptedException e) {
+			this.log.warn(e.getMessage());
+		}
+	}
+
+	protected void onStarted() {
+		AbstractModbusApi.this.logInfo(this.log, "ModbusApi started.");
+	}
+
+	protected Consumer<Entry<WriteChannel<?>, WriteObject>> handleWrites() {
+		return FunctionUtils::doNothing;
+	}
+
+	protected void setOverrideStatus(Status status) {
+		// do nothing
+	}
+
+	protected Runnable handleTimeouts() {
+		return FunctionUtils::doNothing;
+	}
+
+	protected abstract com.ghgande.j2mod.modbus.slave.ModbusSlave createSlave() throws ModbusException;
+
+	private final AbstractWorker startApiWorker = new AbstractWorker() {
+
+		private static final int DEFAULT_WAIT_TIME = 5000; // 5 seconds
+
+		private final Logger log = LoggerFactory.getLogger(AbstractWorker.class);
+
+		protected com.ghgande.j2mod.modbus.slave.ModbusSlave slave = null;
+
+		protected AbstractModbusConfig currentConfig = null;
+
+		@Override
+		protected void forever() throws ModbusException {
+			if (this.slave == null) {
+				try {
+					// start new server
+					this.currentConfig = AbstractModbusApi.this.config;
+					this.slave = AbstractModbusApi.this.createSlave();
+					this.slave.addProcessImage(UNIT_ID, AbstractModbusApi.this.processImage);
+					this.slave.open();
+					if (isEnabled()) {
+						AbstractModbusApi.this.onStarted();
+						AbstractModbusApi.this._setUnableToStart(false);
+					}
+				} catch (ModbusException e) {
+					ModbusSlaveFactory.close(this.slave);
+					AbstractModbusApi.this.logError(this.log, "Unable to start Modbus-Api: " + e.getMessage());
+					AbstractModbusApi.this._setUnableToStart(true);
+				}
+
+			} else {
+				// regular check for errors
+				String error = this.slave.getError();
+				if (error != null) {
+					AbstractModbusApi.this.logError(this.log, "Unable to start Modbus-Api: " + error);
+					AbstractModbusApi.this._setUnableToStart(true);
+					this.stopSlave();
+				} else if (!this.currentConfig.equals(AbstractModbusApi.this.config)) {
+					this.stopSlave();
+				}
+			}
+		}
+
+		private void stopSlave() {
+			ModbusSlaveFactory.close(this.slave);
+			this.slave = null;
+		}
+
+		@Override
+		protected int getCycleTime() {
+			return DEFAULT_WAIT_TIME;
+		}
+
+	};
+
+	@Override
+	public void run() throws OpenemsNamedException {
+		if (!this.isEnabled()) {
+			return;
+		}
+
+		this.updateCycleValues();
+		this.apiWorker.run();
+	}
+
+	/**
+	 * Called by addComponent/removeComponent. Initializes the ModbusRecords, once
+	 * all Components are available. Fault-State otherwise.
+	 */
+	protected synchronized void updateComponents() {
+		var config = this.config;
+
+		if (config == null) {
+			return;
+		}
+		if (config.componentIds().length > this._components.size()) {
+			if (this.getComponentNoModbusApiFaultChannel().getNextValue().get() != true) {
+				this._setComponentMissingFault(true); // Either this or that fault
+			}
+			return;
+		}
+		this._setComponentMissingFault(false);
+
+		this.initializeModbusRecords(this.config.metaComponent(), this.config.componentIds());
+	}
+
+	protected synchronized void addComponent(OpenemsComponent component) {
+		if (!(component instanceof ModbusSlave)) {
+			this.logError(this.log, "Component [" + component.id() + "] does not implement ModbusSlave");
+			this.invalidComponents.add(component);
+			this._setComponentNoModbusApiFault(true);
+			return;
+		}
+		this._components.add((ModbusSlave) component);
+		this.updateComponents();
+	}
+
+	protected synchronized void removeComponent(OpenemsComponent component) {
+		this._components.remove(component);
+		if (this.invalidComponents.remove(component)) {
+			if (this.invalidComponents.isEmpty()) {
+				this._setComponentNoModbusApiFault(false);
+			}
+			return;
+		}
+		this.updateComponents();
+	}
+
+	/**
+	 * Once every cycle: update the values for each registered
+	 * {@link ModbusRecordCycleValue}.
+	 */
+	@SuppressWarnings("unchecked")
+	protected void updateCycleValues() {
+		this.records.values() //
+				.stream() //
+				.filter(r -> r instanceof ModbusRecordCycleValue) //
+				.map(r -> (ModbusRecordCycleValue<OpenemsComponent>) r) //
+				.forEach(r -> {
+					OpenemsComponent component = this.getPossiblyDisabledComponent(r.getComponentId());
+					if (component != null && component.isEnabled()) {
+						r.updateValue(component);
+					} else {
+						r.updateValue(null);
+					}
+				});
+	}
+
+	@Override
+	protected void logDebug(Logger log, String message) {
+		super.logDebug(log, message);
+	}
+
+	@Override
+	protected void logInfo(Logger log, String message) {
+		super.logInfo(log, message);
+	}
+
+	@Override
+	protected void logWarn(Logger log, String message) {
+		super.logWarn(log, message);
+	}
+
+	/**
+	 * Gets the AccessMode.
+	 *
+	 * @return the {@link AccessMode}
+	 */
+	protected abstract AccessMode getAccessMode();
+
+	/**
+	 * Gets the Component. Be aware, that it might be 'disabled'.
+	 *
+	 * @param componentId the Component-ID
+	 *
+	 * @return the {@link ModbusSlave} Component; possibly null
+	 */
+	protected ModbusSlave getPossiblyDisabledComponent(String componentId) {
+		if (componentId == null) {
+			return null;
+		}
+		if (componentId == Meta.SINGLETON_COMPONENT_ID) {
+			return this.config.metaComponent();
+		}
+		return this._components.stream() //
+				.filter(c -> componentId.equals(c.id())) //
+				.findFirst() //
+				.orElse(null);
+	}
+
+	/**
+	 * Adds a Record to the process image at the given address.
+	 *
+	 * @param address   the address
+	 * @param record    the record
+	 * @param component the OpenEMS Component
+	 * @return the next address after this record
+	 */
+	private int addRecordToProcessImage(int address, ModbusRecord record, OpenemsComponent component) {
+		record.setComponentId(component.id());
+
+		// Handle writes to the Channel; limited to ModbusRecordChannels
+		if (record instanceof ModbusRecordChannel) {
+			var r = (ModbusRecordChannel) record;
+			r.onWriteValue(value -> {
+				Channel<?> readChannel = component.channel(r.getChannelId());
+				if (!(readChannel instanceof WriteChannel)) {
+					this.logWarn(this.log, "Unable to write to Read-Only-Channel [" + readChannel.address() + "]");
+					return;
+				}
+				WriteChannel<?> channel = (WriteChannel<?>) readChannel;
+				this.apiWorker.addValue(channel, new WritePojo(value));
+			});
+		}
+
+		this.records.put(address, record);
+		return address + record.getType().getWords();
+	}
+
+	/**
+	 * Initialize Modbus-Records for all configured Component-IDs.
+	 *
+	 * @param metaComponent the {@link Meta} component
+	 * @param componentIds  the configured Component-IDs.
+	 */
+	private void initializeModbusRecords(Meta metaComponent, String[] componentIds) {
+		this.records.clear();
+		// Add generic header
+		this.records.put(0, new ModbusRecordUint16Hash(0, "OpenEMS"));
+		var nextAddress = 1;
+
+		// add Meta-Component
+		nextAddress = this.addMetaComponentToProcessImage(nextAddress, metaComponent);
+
+		// add remaining components; sorted by configured componentIds
+		for (String id : componentIds) {
+			// find next component in order
+			var component = this.getPossiblyDisabledComponent(id);
+			if (component == null) { // This should never happen
+				this.logWarn(this.log, "Required Component [" + id + "] " //
+						+ "is not available. Component may not implement ModbusSlave or is not active.");
+				continue;
+			}
+
+			nextAddress = this.addComponentToProcessImage(nextAddress, component);
+		}
+	}
+
+	/**
+	 * Adds the Meta-Component to the Process Image.
+	 *
+	 * @param startAddress the start-address
+	 * @param component    the {@link Meta} component
+	 * @return the next start-address
+	 */
+	private int addMetaComponentToProcessImage(int startAddress, Meta component) {
+		var table = component.getModbusSlaveTable(this.getAccessMode());
+
+		// add the Component-Model Length
+		var nextAddress = this.addRecordToProcessImage(startAddress,
+				new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
+
+		// add Records
+		for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
+			for (ModbusRecord record : natureTable.getModbusRecords()) {
+				this.addRecordToProcessImage(nextAddress + record.getOffset(), record, component);
+			}
+		}
+		return startAddress + table.getLength();
+	}
+
+	/**
+	 * Adds a Component to the Process Image.
+	 *
+	 * @param startAddress the start-address
+	 * @param component    the OpenEMS Component
+	 * @return the next start-address
+	 */
+	private int addComponentToProcessImage(int startAddress, ModbusSlave component) {
+		this.components.put(startAddress, component.alias());
+		var table = component.getModbusSlaveTable(this.getAccessMode());
+
+		// add the Component-ID and Component-Model Length
+		var nextAddress = this.addRecordToProcessImage(startAddress,
+				new ModbusRecordString16(-1, "Component-ID", component.id()), component);
+		this.addRecordToProcessImage(nextAddress,
+				new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
+		nextAddress = startAddress + 20;
+		var nextNatureAddress = nextAddress;
+
+		// add all Nature-Tables
+		for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
+			// add the Interface Hash-Code and Length
+			nextAddress = this.addRecordToProcessImage(nextNatureAddress,
+					new ModbusRecordUint16Hash(-1, natureTable.getNatureName()), component);
+			nextAddress = this.addRecordToProcessImage(nextAddress,
+					new ModbusRecordUint16BlockLength(-1, natureTable.getNatureName(), (short) natureTable.getLength()),
+					component);
+
+			// add Records
+			for (ModbusRecord record : natureTable.getModbusRecords()) {
+				this.addRecordToProcessImage(nextNatureAddress + 2 + record.getOffset(), record, component);
+			}
+
+			nextNatureAddress = nextNatureAddress += natureTable.getLength();
+		}
+
+		// calculate next address after this component
+		return startAddress + table.getLength();
+	}
+
+	@Override
+	public void buildJsonApiRoutes(JsonApiBuilder builder) {
+		builder.handleRequest(GetModbusProtocolRequest.METHOD, def -> {
+			def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
+		}, call -> {
+			return new GetModbusProtocolResponse(call.getRequest().getId(), this.records);
+		});
+		builder.handleRequest(GetModbusProtocolExportXlsxRequest.METHOD, def -> {
+			def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
+		}, call -> {
+			return new GetModbusProtocolExportXlsxResponse(call.getRequest().getId(), this.components, this.records);
+		});
+	}
+
+	private JsonrpcEndpointGuard componentMissingGuard() {
+		return call -> {
+			if (this.getComponentMissingFault().get() == true) {
+				throw new OpenemsException(this.getComponentMissingFaultChannel().channelDoc().getText());
+			}
+		};
+	}
+
+	private JsonrpcEndpointGuard componentNoModbusApiGuard() {
+		return call -> {
+			if (this.getComponentNoModbusApiFault().get() == true) {
+				throw new OpenemsException(this.getComponentNoModbusApiFaultChannel().channelDoc().getText());
+			}
+		};
+	}
+
+	/**
+	 * Format a given channelAddress to a ChannelId.
+	 * 
+	 * @param channel WriteChannel
+	 * @return component_channelId as String
+	 */
+	public static String formatChannelName(WriteChannel<?> channel) {
+		return channel.getComponent().id() + "_" + channel.channelId().name();
+	}
+
+}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java
new file mode 100644
index 00000000000..a9792bd4199
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java
@@ -0,0 +1,108 @@
+package io.openems.edge.controller.api.modbus;
+
+import java.util.Arrays;
+
+import io.openems.edge.common.meta.Meta;
+
+public abstract class AbstractModbusConfig {
+	private final String id;
+	private final String alias;
+	private final boolean enabled;
+	private final Meta metaComponent;
+	private final String[] componentIds;
+	private final int apiTimeout;
+	private final int maxConcurrentConnections;
+
+	public AbstractModbusConfig(String id, String alias, boolean enabled, Meta metaComponent, String[] componentIds,
+			int apiTimeout, int maxConcurrentConnections) {
+		this.id = id;
+		this.alias = alias;
+		this.enabled = enabled;
+		this.metaComponent = metaComponent;
+		this.componentIds = componentIds;
+		this.apiTimeout = apiTimeout;
+		this.maxConcurrentConnections = maxConcurrentConnections;
+	}
+
+	/**
+	 * Returns a unique ID for this OpenEMS component.
+	 *
+	 * @return the unique ID
+	 */
+	public String id() {
+		return this.id;
+	}
+
+	/**
+	 * Returns a unique ID for this OpenEMS component.
+	 *
+	 * @return the unique ID
+	 */
+	public String alias() {
+		return this.alias;
+	}
+	
+	/**
+	 * Is this controller enabled?.
+	 *
+	 * @return boolean
+	 */
+	public boolean enabled() {
+		return this.enabled;
+	}
+
+	/**
+	 * Returns a metaComponent.
+	 *
+	 * @return the metaComponent
+	 */
+	public Meta metaComponent() {
+		return this.metaComponent;
+	}
+
+	/**
+	 * Returns an array of component ids.
+	 *
+	 * @return the componentIds
+	 */
+	public String[] componentIds() {
+		return this.componentIds;
+	}
+
+	/**
+	 * Returns the api timeout.
+	 *
+	 * @return the apiTimeout
+	 */
+	public int apiTimeout() {
+		return this.apiTimeout;
+	}
+
+	/**
+	 * Returns the max number of concurrent connections.
+	 *
+	 * @return the maxConcurrentConnections
+	 */
+	public int maxConcurrentConnections() {
+		return this.maxConcurrentConnections;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (other == null || getClass() != other.getClass()) {
+			return false;
+		}
+		AbstractModbusConfig config = (AbstractModbusConfig) other;
+		return this.enabled == config.enabled //
+				&& this.apiTimeout == config.apiTimeout //
+				&& this.maxConcurrentConnections == config.maxConcurrentConnections 
+				&& this.id.equals(config.id) //
+				&& this.alias.equals(config.alias) 
+				&& this.metaComponent.equals(config.metaComponent) //
+				&& Arrays.equals(this.componentIds, config.componentIds);
+	}
+
+}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java
new file mode 100644
index 00000000000..b93209a5702
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java
@@ -0,0 +1,100 @@
+package io.openems.edge.controller.api.modbus;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.controller.api.Controller;
+
+public abstract class AbstractModbusRtuApi extends AbstractModbusApi
+		implements ModbusApi, Controller, OpenemsComponent, ComponentJsonApi {
+
+	public AbstractModbusRtuApi(String implementationName,
+			io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
+			io.openems.edge.common.channel.ChannelId[]... furtherInitialChannelIds) {
+		super(firstInitialChannelIds, furtherInitialChannelIds);
+	}
+
+	public static class RtuConfig extends AbstractModbusConfig {
+		private final String portName;
+		private final int baudRate;
+		private final int databits;
+		private final Stopbit stopbits;
+		private final Parity parity;
+
+		public RtuConfig(String id, String alias, boolean enabled, Meta metaComponent, String[] componentIds,
+				int apiTimeout, String portName, int baudRate, int databits, Stopbit stopbits, Parity parity,
+				int maxConcurrentConnections) {
+			super(id, alias, enabled, metaComponent, componentIds, apiTimeout, maxConcurrentConnections);
+			this.portName = portName;
+			this.baudRate = baudRate;
+			this.databits = databits;
+			this.stopbits = stopbits;
+			this.parity = parity;
+		}
+
+		/**
+		 * Returns the portName.
+		 *
+		 * @return the portName
+		 */
+		public String portName() {
+			return this.portName;
+		}
+
+		/**
+		 * Returns the baudRate.
+		 *
+		 * @return the baudRate
+		 */
+		public int baudRate() {
+			return this.baudRate;
+		}
+
+		/**
+		 * Returns the databits.
+		 *
+		 * @return databits
+		 */
+		public int databits() {
+			return this.databits;
+		}
+
+		/**
+		 * Returns the stopbits.
+		 *
+		 * @return the stopbits
+		 */
+		public Stopbit stopbits() {
+			return this.stopbits;
+		}
+
+		/**
+		 * Returns the parity.
+		 *
+		 * @return the parity
+		 */
+		public Parity parity() {
+			return this.parity;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (!super.equals(other)) {
+				return false;
+			}
+			if (!(other instanceof RtuConfig)) {
+				return false;
+			}
+			RtuConfig config = (RtuConfig) other;
+			return this.baudRate == config.baudRate //
+					&& this.databits == config.databits //
+					&& this.stopbits == config.stopbits //
+					&& this.parity == config.parity //
+					&& this.portName.equals(config.portName);
+		}
+
+	}
+
+}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
index 7aff8bc95ec..066ae09248f 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
@@ -1,531 +1,44 @@
 package io.openems.edge.controller.api.modbus;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Consumer;
-
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ghgande.j2mod.modbus.ModbusException;
-import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
-
-import io.openems.common.channel.AccessMode;
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.common.exceptions.OpenemsException;
-import io.openems.common.utils.ConfigUtils;
-import io.openems.common.worker.AbstractWorker;
-import io.openems.edge.common.channel.Channel;
-import io.openems.edge.common.channel.WriteChannel;
-import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.jsonapi.ComponentJsonApi;
-import io.openems.edge.common.jsonapi.JsonApiBuilder;
-import io.openems.edge.common.jsonapi.JsonrpcEndpointGuard;
 import io.openems.edge.common.meta.Meta;
-import io.openems.edge.common.modbusslave.ModbusRecord;
-import io.openems.edge.common.modbusslave.ModbusRecordChannel;
-import io.openems.edge.common.modbusslave.ModbusRecordCycleValue;
-import io.openems.edge.common.modbusslave.ModbusRecordString16;
-import io.openems.edge.common.modbusslave.ModbusRecordUint16BlockLength;
-import io.openems.edge.common.modbusslave.ModbusRecordUint16Hash;
-import io.openems.edge.common.modbusslave.ModbusSlave;
-import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
 import io.openems.edge.controller.api.Controller;
-import io.openems.edge.controller.api.common.ApiWorker;
-import io.openems.edge.controller.api.common.ApiWorker.WriteHandler;
-import io.openems.edge.controller.api.common.Status;
-import io.openems.edge.controller.api.common.WriteObject;
-import io.openems.edge.controller.api.common.WritePojo;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxRequest;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxResponse;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolRequest;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolResponse;
 
-public abstract class AbstractModbusTcpApi extends AbstractOpenemsComponent
-		implements ModbusTcpApi, Controller, OpenemsComponent, ComponentJsonApi {
+public abstract class AbstractModbusTcpApi extends AbstractModbusApi
+		implements ModbusApi, Controller, OpenemsComponent {
 
-	public static final int UNIT_ID = 1;
 	public static final int DEFAULT_PORT = 502;
-	public static final int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 5;
-
-	/**
-	 * Holds the link between Modbus address and ModbusRecord.
-	 */
-	protected final TreeMap<Integer, ModbusRecord> records = new TreeMap<>();
-	protected final ApiWorker apiWorker = new ApiWorker(this,
-			new WriteHandler(this.handleWrites(), this::setOverrideStatus, this.handleTimeouts()));
-	private final Logger log = LoggerFactory.getLogger(AbstractModbusTcpApi.class);
-	private final MyProcessImage processImage;
-	private final String implementationName;
-
-	/**
-	 * Holds the link between Modbus start address of a Component and the
-	 * Component-ID.
-	 */
-	private final TreeMap<Integer, String> components = new TreeMap<>();
-
-	private ConfigRecord config;
-	private List<OpenemsComponent> invalidComponents = new CopyOnWriteArrayList<>();
-
-	protected synchronized void addComponent(OpenemsComponent component) {
-		if (!(component instanceof ModbusSlave)) {
-			this.logError(this.log, "Component [" + component.id() + "] does not implement ModbusSlave");
-			this.invalidComponents.add(component);
-			this._setComponentNoModbusApiFault(true);
-			return;
-		}
-		this._components.add((ModbusSlave) component);
-		this.updateComponents();
-	}
-
-	protected abstract Consumer<Entry<WriteChannel<?>, WriteObject>> handleWrites();
-
-	protected abstract void setOverrideStatus(Status status);
-
-	protected abstract Runnable handleTimeouts();
-
-	protected synchronized void removeComponent(OpenemsComponent component) {
-		this._components.remove(component);
-		if (this.invalidComponents.remove(component)) {
-			if (this.invalidComponents.isEmpty()) {
-				this._setComponentNoModbusApiFault(false);
-			}
-			return;
-		}
-		this.updateComponents();
-	}
-
-	private volatile List<ModbusSlave> _components = new CopyOnWriteArrayList<>();
 
 	public AbstractModbusTcpApi(String implementationName,
 			io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
 			io.openems.edge.common.channel.ChannelId[]... furtherInitialChannelIds) {
 		super(firstInitialChannelIds, furtherInitialChannelIds);
-		this.implementationName = implementationName;
-		this.processImage = new MyProcessImage(this);
-	}
-
-	protected void activate(ComponentContext context, ConfigurationAdmin cm, ConfigRecord config)
-			throws OpenemsException {
-		super.activate(context, config.id(), config.alias(), config.enabled());
-		this.handleActivate(config, cm, config.id());
-	}
-
-	protected void modified(ComponentContext context, ConfigurationAdmin cm, ConfigRecord config)
-			throws OpenemsException {
-		super.modified(context, config.id(), config.alias(), config.enabled());
-
-		// update filter for 'Components'; allow disable components
-		final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds);
-		OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
-
-		// Config (relevant for API) was not modified
-		if (this.config.equals(config)) {
-			return;
-		}
-
-		ModbusSlaveFactory.close();
-
-		// Activate with new config
-		this.handleModified(config, cm, config.id());
-	}
-
-	private void handleActivate(ConfigRecord config, ConfigurationAdmin cm, String id) {
-		// configuration settings
-		this.config = config;
-
-		// update filter for 'Components'; allow disable components
-		final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds);
-		OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
-
-		this.apiWorker.setTimeoutSeconds(config.apiTimeout);
-
-		if (!this.isEnabled()) {
-			// abort if disabled
-			return;
-		}
-
-		// Start Modbus-Server
-		this.startApiWorker.activate(id);
-
-		this.updateComponents();
-	}
-
-	private void handleModified(ConfigRecord config, ConfigurationAdmin cm, String id) {
-		// configuration settings
-		this.config = config;
-
-		this.apiWorker.setTimeoutSeconds(config.apiTimeout);
-
-		if (!this.isEnabled()) {
-			// abort if disabled
-			this.startApiWorker.deactivate();
-			return;
-		}
-
-		// Modify Modbus-Server
-		this.startApiWorker.modified(id);
-
-		this.updateComponents();
-	}
-
-	/**
-	 * Called by addComponent/removeComponent. Initializes the ModbusRecords, once
-	 * all Components are available. Fault-State otherwise.
-	 */
-	private synchronized void updateComponents() {
-		// Check if all Components are available
-		var config = this.config;
-		if (config == null) {
-			return;
-		}
-		if (config.componentIds.length > this._components.size()) {
-			if (this.getComponentNoModbusApiFaultChannel().getNextValue().get() != Boolean.TRUE) {
-				this._setComponentMissingFault(true); // Either this or that fault
-			}
-			return;
-		}
-		this._setComponentMissingFault(false);
-
-		// Initialize Modbus Records
-		this.initializeModbusRecords(this.config.metaComponent, this.config.componentIds);
-	}
-
-	@Override
-	protected void deactivate() {
-
-		this.startApiWorker.deactivate();
-		ModbusSlaveFactory.close();
-		super.deactivate();
-
-		// wait until modbus slave was completely closed
-		try {
-			Thread.sleep(10000);
-		} catch (InterruptedException e) {
-			this.log.warn(e.getMessage());
-		}
-	}
-
-	private final AbstractWorker startApiWorker = new AbstractWorker() {
-
-		private static final int DEFAULT_WAIT_TIME = 5000; // 5 seconds
-
-		private final Logger log = LoggerFactory.getLogger(AbstractWorker.class);
-
-		private com.ghgande.j2mod.modbus.slave.ModbusSlave slave = null;
-
-		@Override
-		protected void forever() {
-			var port = AbstractModbusTcpApi.this.config.port;
-			if (this.slave == null) {
-				try {
-					// start new server
-					this.slave = ModbusSlaveFactory.createTCPSlave(port,
-							AbstractModbusTcpApi.this.config.maxConcurrentConnections);
-					this.slave.addProcessImage(UNIT_ID, AbstractModbusTcpApi.this.processImage);
-					if (isEnabled()) {
-						this.slave.open();
-						AbstractModbusTcpApi.this.logInfo(this.log,
-								AbstractModbusTcpApi.this.implementationName + " started " //
-										+ "on port [" + port + "] with UnitId [" + AbstractModbusTcpApi.UNIT_ID + "].");
-					}
-				} catch (ModbusException e) {
-					ModbusSlaveFactory.close();
-					AbstractModbusTcpApi.this.logError(this.log,
-							"Unable to start " + AbstractModbusTcpApi.this.implementationName + " on port [" + port
-									+ "]: " + e.getMessage());
-					AbstractModbusTcpApi.this._setUnableToStart(true);
-				}
-
-			} else {
-				// regular check for errors
-				var error = this.slave.getError();
-				if (error == null) {
-					AbstractModbusTcpApi.this._setUnableToStart(false);
-
-				} else {
-					AbstractModbusTcpApi.this.logError(this.log,
-							"Unable to start Modbus/TCP Api on port [" + port + "]: " + error);
-					AbstractModbusTcpApi.this._setUnableToStart(true);
-					this.slave = null;
-					// stop server
-					ModbusSlaveFactory.close();
-				}
-			}
-		}
-
-		@Override
-		protected int getCycleTime() {
-			return DEFAULT_WAIT_TIME;
-		}
-
-	};
-
-	/**
-	 * Initialize Modbus-Records for all configured Component-IDs.
-	 *
-	 * @param metaComponent the {@link Meta} component
-	 * @param componentIds  the configured Component-IDs.
-	 */
-	private void initializeModbusRecords(Meta metaComponent, String[] componentIds) {
-		// Add generic header
-		this.records.clear();
-		this.records.put(0, new ModbusRecordUint16Hash(0, "OpenEMS"));
-		var nextAddress = 1;
-
-		// add Meta-Component
-		nextAddress = this.addMetaComponentToProcessImage(nextAddress, metaComponent);
-
-		// add remaining components; sorted by configured componentIds
-		for (String id : componentIds) {
-			// find next component in order
-			var component = this.getPossiblyDisabledComponent(id);
-			if (component == null) { // This should never happen
-				this.logWarn(this.log, "Required Component [" + id + "] " //
-						+ "is not available. Component may not implement ModbusSlave or is not active.");
-				continue;
-			}
-
-			// add component to process image
-			nextAddress = this.addComponentToProcessImage(nextAddress, component);
-		}
-	}
-
-	/**
-	 * Adds the Meta-Component to the Process Image.
-	 *
-	 * @param startAddress the start-address
-	 * @param component    the {@link Meta} component
-	 * @return the next start-address
-	 */
-	private int addMetaComponentToProcessImage(int startAddress, Meta component) {
-		var table = component.getModbusSlaveTable(this.getAccessMode());
-
-		// add the Component-Model Length
-		var nextAddress = this.addRecordToProcessImage(startAddress,
-				new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
-
-		// add Records
-		for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
-			for (ModbusRecord record : natureTable.getModbusRecords()) {
-				this.addRecordToProcessImage(nextAddress + record.getOffset(), record, component);
-			}
-		}
-		return startAddress + table.getLength();
 	}
 
-	/**
-	 * Adds a Component to the Process Image.
-	 *
-	 * @param startAddress the start-address
-	 * @param component    the OpenEMS Component
-	 * @return the next start-address
-	 */
-	private int addComponentToProcessImage(int startAddress, ModbusSlave component) {
-		this.components.put(startAddress, component.alias());
-		var table = component.getModbusSlaveTable(this.getAccessMode());
-
-		// add the Component-ID and Component-Model Length
-		var nextAddress = this.addRecordToProcessImage(startAddress,
-				new ModbusRecordString16(-1, "Component-ID", component.id()), component);
-		this.addRecordToProcessImage(nextAddress,
-				new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
-		nextAddress = startAddress + 20;
-		var nextNatureAddress = nextAddress;
+	public class TcpConfig extends AbstractModbusConfig {
+		private final int port;
 
-		// add all Nature-Tables
-		for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
-			// add the Interface Hash-Code and Length
-			nextAddress = this.addRecordToProcessImage(nextNatureAddress,
-					new ModbusRecordUint16Hash(-1, natureTable.getNatureName()), component);
-			nextAddress = this.addRecordToProcessImage(nextAddress,
-					new ModbusRecordUint16BlockLength(-1, natureTable.getNatureName(), (short) natureTable.getLength()),
-					component);
-
-			// add Records
-			for (ModbusRecord record : natureTable.getModbusRecords()) {
-				this.addRecordToProcessImage(nextNatureAddress + 2 + record.getOffset(), record, component);
-			}
-
-			nextNatureAddress = nextNatureAddress += natureTable.getLength();
+		public TcpConfig(String id, String alias, boolean enabled, Meta metaComponent, String[] componentIds,
+				int apiTimeout, int port, int maxConcurrentConnections) {
+			super(id, alias, enabled, metaComponent, componentIds, apiTimeout, maxConcurrentConnections);
+			this.port = port;
 		}
 
-		// calculate next address after this component
-		return startAddress + table.getLength();
-	}
-
-	/**
-	 * Adds a Record to the process image at the given address.
-	 *
-	 * @param address   the address
-	 * @param record    the record
-	 * @param component the OpenEMS Component
-	 * @return the next address after this record
-	 */
-	private int addRecordToProcessImage(int address, ModbusRecord record, OpenemsComponent component) {
-		record.setComponentId(component.id());
-
-		// Handle writes to the Channel; limited to ModbusRecordChannels
-		if (record instanceof ModbusRecordChannel) {
-			var r = (ModbusRecordChannel) record;
-			r.onWriteValue(value -> {
-				Channel<?> readChannel = component.channel(r.getChannelId());
-				if (!(readChannel instanceof WriteChannel)) {
-					this.logWarn(this.log, "Unable to write to Read-Only-Channel [" + readChannel.address() + "]");
-					return;
-				}
-				WriteChannel<?> channel = (WriteChannel<?>) readChannel;
-				this.apiWorker.addValue(channel, new WritePojo(value));
-			});
+		public int getPort() {
+			return this.port;
 		}
 
-		this.records.put(address, record);
-		return address + record.getType().getWords();
-	}
-
-	@Override
-	public void run() throws OpenemsNamedException {
-		// Enabled?
-		if (!this.isEnabled()) {
-			return;
-		}
-
-		this.updateCycleValues();
-		this.apiWorker.run();
-	}
-
-	@SuppressWarnings("unchecked")
-	/**
-	 * Once every cycle: update the values for each registered
-	 * {@link ModbusRecordCycleValue}.
-	 */
-	private void updateCycleValues() {
-		this.records.values() //
-				.stream() //
-				.filter(r -> r instanceof ModbusRecordCycleValue) //
-				.map(r -> (ModbusRecordCycleValue<OpenemsComponent>) r) //
-				.forEach(r -> {
-					OpenemsComponent component = this.getPossiblyDisabledComponent(r.getComponentId());
-					if (component != null && component.isEnabled()) {
-						r.updateValue(component);
-					} else {
-						r.updateValue(null);
-					}
-				});
-	}
-
-	@Override
-	protected void logDebug(Logger log, String message) {
-		super.logDebug(log, message);
-	}
-
-	@Override
-	protected void logInfo(Logger log, String message) {
-		super.logInfo(log, message);
-	}
-
-	@Override
-	protected void logWarn(Logger log, String message) {
-		super.logWarn(log, message);
-	}
-
-	@Override
-	public void buildJsonApiRoutes(JsonApiBuilder builder) {
-		builder.handleRequest(GetModbusProtocolRequest.METHOD, def -> {
-			def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
-		}, call -> {
-			return new GetModbusProtocolResponse(call.getRequest().getId(), this.records);
-		});
-		builder.handleRequest(GetModbusProtocolExportXlsxRequest.METHOD, def -> {
-			def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
-		}, call -> {
-			return new GetModbusProtocolExportXlsxResponse(call.getRequest().getId(), this.components, this.records);
-		});
-	}
-
-	private JsonrpcEndpointGuard componentMissingGuard() {
-		return call -> {
-			if (this.getComponentMissingFault().get() == Boolean.TRUE) {
-				throw new OpenemsException(this.getComponentMissingFaultChannel().channelDoc().getText());
-			}
-		};
-	}
-
-	private JsonrpcEndpointGuard componentNoModbusApiGuard() {
-		return call -> {
-			if (this.getComponentNoModbusApiFault().get() == Boolean.TRUE) {
-				throw new OpenemsException(this.getComponentNoModbusApiFaultChannel().channelDoc().getText());
-			}
-		};
-	}
-
-	/**
-	 * Gets the AccessMode.
-	 *
-	 * @return the {@link AccessMode}
-	 */
-	protected abstract AccessMode getAccessMode();
-
-	/**
-	 * Gets the Component. Be aware, that it might be 'disabled'.
-	 *
-	 * @param componentId the Component-ID
-	 *
-	 * @return the {@link ModbusSlave} Component; possibly null
-	 */
-	protected ModbusSlave getPossiblyDisabledComponent(String componentId) {
-		if (componentId == null) {
-			return null;
-		}
-		if (componentId == Meta.SINGLETON_COMPONENT_ID) {
-			return this.config.metaComponent;
-		}
-		return this._components.stream() //
-				.filter(c -> componentId.equals(c.id())) //
-				.findFirst() //
-				.orElse(null);
-	}
-
-	public static record ConfigRecord(String id, String alias, boolean enabled, Meta metaComponent,
-			String[] componentIds, int apiTimeout, int port, int maxConcurrentConnections) {
-
 		@Override
 		public boolean equals(Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (other == null) {
+			if (!super.equals(other)) {
 				return false;
 			}
-			if (!(other instanceof ConfigRecord)) {
+			if (!(other instanceof TcpConfig)) {
 				return false;
 			}
-			ConfigRecord config = (ConfigRecord) other;
-
-			if (config.id.equals(this.id) && config.alias.equals(this.alias) //
-					&& config.enabled == this.enabled && config.metaComponent.equals(this.metaComponent) //
-					&& Arrays.equals(config.componentIds, this.componentIds) //
-					&& config.apiTimeout == this.apiTimeout && config.port == this.port //
-					&& config.maxConcurrentConnections == this.maxConcurrentConnections) {
-				return true;
-			}
-			return false;
+			TcpConfig config = (TcpConfig) other;
+			return this.port == config.port;
 		}
-	}
 
-	/**
-	 * Format a given channelAddress to a ChannelId.
-	 * 
-	 * @param channel WriteChannel
-	 * @return component_channelId as String
-	 */
-	public static String formatChannelName(WriteChannel<?> channel) {
-		return channel.getComponent().id() + "_" + channel.channelId().name();
 	}
 }
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusTcpApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusApi.java
similarity index 97%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusTcpApi.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusApi.java
index da838a2d947..c7357b08c1d 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusTcpApi.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusApi.java
@@ -7,11 +7,11 @@
 import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.OpenemsComponent;
 
-public interface ModbusTcpApi extends OpenemsComponent {
+public interface ModbusApi extends OpenemsComponent {
 
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		UNABLE_TO_START(Doc.of(Level.FAULT) //
-				.text("Unable to start Modbus/TCP-Api Server")), //
+				.text("Unable to start ModbusTCP/RTU-Api Server")), //
 		COMPONENT_NO_MODBUS_API_FAULT(Doc.of(Level.FAULT) //
 				.text("A configured Component does not support Modbus-API")), //
 		COMPONENT_MISSING_FAULT(Doc.of(Level.FAULT) //
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
index cbc587a8c4f..e155ba3576f 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
@@ -19,15 +19,15 @@
 import io.openems.edge.common.modbusslave.ModbusRecordUint16Reserved;
 
 /**
- * This implementation answers Modbus-TCP Slave requests.
+ * This implementation answers Modbus-TCP/RTU Slave requests.
  */
 public class MyProcessImage implements ProcessImage {
 
 	private final Logger log = LoggerFactory.getLogger(MyProcessImage.class);
 
-	protected final AbstractModbusTcpApi parent;
+	protected final AbstractModbusApi parent;
 
-	protected MyProcessImage(AbstractModbusTcpApi parent) {
+	protected MyProcessImage(AbstractModbusApi parent) {
 		this.parent = parent;
 	}
 
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java
new file mode 100644
index 00000000000..d2ca0403017
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java
@@ -0,0 +1,52 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+
+@ObjectClassDefinition(//
+		name = "Controller Api Modbus/RTU Read-Only", //
+		description = "This controller provides a read-only Modbus/RTU api.")
+@interface Config {
+
+	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+	String id() default "ctrlApiModbusRtu0";
+
+	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+	String alias() default "ModbusRtu Read-Only";
+
+	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+	boolean enabled() default true;
+
+	@AttributeDefinition(name = "Port-Name", description = "The name of the serial port - e.g. '/dev/ttyUSB0' or 'COM3'")
+	String portName() default "/dev/ttyUSB0";
+
+	@AttributeDefinition(name = "Component-IDs", description = "Components that should be made available via Modbus.")
+	String[] component_ids() default { "_sum" };
+
+	@AttributeDefinition(name = "Api-Timeout", description = "Sets the timeout in seconds for updates on Channels set by this Api.")
+	int apiTimeout() default 60;
+
+	@AttributeDefinition(name = "Max concurrent connections", description = "Sets the maximum number of concurrent connections via Modbus.")
+	int maxConcurrentConnections() default AbstractModbusRtuApi.DEFAULT_MAX_CONCURRENT_CONNECTIONS;
+	
+	@AttributeDefinition(name = "Components target filter", description = "This is auto-generated by 'Component-IDs'.")
+	String Component_target() default "(enabled=true)";
+	
+	@AttributeDefinition(name = "Baudrate", description = "The baudrate - e.g. 9600, 19200, 38400, 57600 or 115200")
+	int baudRate() default 9600;
+
+	@AttributeDefinition(name = "Databits", description = "The number of databits - e.g. 8")
+	int databits() default 8;
+
+	@AttributeDefinition(name = "Stopbits", description = "The number of stopbits - '1', '1.5' or '2'")
+	Stopbit stopbits() default Stopbit.ONE;
+
+	@AttributeDefinition(name = "Parity", description = "The parity - 'none', 'even', 'odd', 'mark' or 'space'")
+	Parity parity() default Parity.NONE;
+
+	String webconsole_configurationFactory_nameHint() default "Controller Api Modbus/RTU Read-Write [{id}]";
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java
new file mode 100644
index 00000000000..3695fe79585
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java
@@ -0,0 +1,23 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.component.OpenemsComponent;
+
+public interface ControllerApiModbusRtuReadOnly extends OpenemsComponent {
+
+	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+		;
+
+		private final Doc doc;
+
+		private ChannelId(Doc doc) {
+			this.doc = doc;
+		}
+
+		@Override
+		public Doc doc() {
+			return this.doc;
+		}
+	}
+}
+
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java
new file mode 100644
index 00000000000..2a6d065a9b1
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java
@@ -0,0 +1,107 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+
+import com.ghgande.j2mod.modbus.Modbus;
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlave;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
+import com.ghgande.j2mod.modbus.util.SerialParameters;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+		name = "Controller.Api.ModbusRtu.ReadOnly", //
+		immediate = true, //
+		configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class ControllerApiModbusRtuReadOnlyImpl extends AbstractModbusRtuApi
+		implements ControllerApiModbusRtuReadOnly, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi {
+
+	@Reference
+	private Meta metaComponent = null;
+
+	@Reference
+	private ConfigurationAdmin cm;
+
+	private RtuConfig config;
+
+	public ControllerApiModbusRtuReadOnlyImpl() {
+		super("Modbus/RTU-Api Read-Only", //
+				OpenemsComponent.ChannelId.values(), //
+				Controller.ChannelId.values(), //
+				ModbusApi.ChannelId.values(), //
+				ControllerApiModbusRtuReadOnly.ChannelId.values() //
+		);
+	}
+
+	@Override
+	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
+	protected void addComponent(OpenemsComponent component) {
+		super.addComponent(component);
+	}
+
+	protected void removeComponent(OpenemsComponent component) {
+		super.removeComponent(component);
+	}
+
+	@Activate
+	private void activate(ComponentContext context, Config config) throws OpenemsException {
+		this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), 0 /* no timeout */, config.portName(), config.baudRate(), config.databits(),
+				config.stopbits(), config.parity(), config.maxConcurrentConnections());
+		super.activate(context, this.cm, this.config);
+	}
+
+	@Modified
+	private void modified(ComponentContext context, Config config) throws OpenemsException {
+		this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), 0 /* no timeout */, config.portName(), config.baudRate(), config.databits(),
+				config.stopbits(), config.parity(), config.maxConcurrentConnections());
+		super.modified(context, this.cm, this.config);
+	}
+
+	@Override
+	@Deactivate
+	protected void deactivate() {
+		super.deactivate();
+	}
+
+	@Override
+	protected ModbusSlave createSlave() throws ModbusException {
+		SerialParameters params = new SerialParameters();
+		params.setPortName(this.config.portName());
+		params.setBaudRate(this.config.baudRate());
+		params.setDatabits(this.config.databits());
+		params.setStopbits(this.config.stopbits().getValue());
+		params.setParity(this.config.parity().getValue());
+		params.setEncoding(Modbus.SERIAL_ENCODING_RTU);
+		params.setEcho(false);
+		return ModbusSlaveFactory.createSerialSlave(params);
+	}
+
+	@Override
+	protected AccessMode getAccessMode() {
+		return AccessMode.READ_ONLY;
+	}
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/Config.java
similarity index 93%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/Config.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/Config.java
index 56c67020d85..e8947eea421 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/Config.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/Config.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
 
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -14,7 +14,7 @@
 	String id() default "ctrlApiModbusTcp0";
 
 	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
-	String alias() default "";
+	String alias() default "ModbusTcp Read-Only";
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnly.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnly.java
similarity index 87%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnly.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnly.java
index 52bb94c3b2e..cb31ba9d8d4 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnly.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnly.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
 
 import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.component.OpenemsComponent;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImpl.java
similarity index 74%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImpl.java
index 6f7e36683f8..9924a333487 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImpl.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
 
 import java.util.Map.Entry;
 import java.util.function.Consumer;
@@ -16,9 +16,12 @@
 import org.osgi.service.metatype.annotations.Designate;
 
 import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlave;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
 
 import io.openems.common.channel.AccessMode;
 import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.utils.FunctionUtils;
 import io.openems.edge.common.channel.WriteChannel;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.jsonapi.ComponentJsonApi;
@@ -27,7 +30,7 @@
 import io.openems.edge.controller.api.common.Status;
 import io.openems.edge.controller.api.common.WriteObject;
 import io.openems.edge.controller.api.modbus.AbstractModbusTcpApi;
-import io.openems.edge.controller.api.modbus.ModbusTcpApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -36,14 +39,16 @@
 		configurationPolicy = ConfigurationPolicy.REQUIRE //
 )
 public class ControllerApiModbusTcpReadOnlyImpl extends AbstractModbusTcpApi
-		implements ControllerApiModbusTcpReadOnly, ModbusTcpApi, Controller, OpenemsComponent, ComponentJsonApi {
+		implements ControllerApiModbusTcpReadOnly, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi {
 
-	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
+	@Reference
 	private Meta metaComponent = null;
 
 	@Reference
 	private ConfigurationAdmin cm;
 
+	private TcpConfig config;
+
 	@Override
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
 	protected void addComponent(OpenemsComponent component) {
@@ -58,16 +63,16 @@ public ControllerApiModbusTcpReadOnlyImpl() {
 		super("Modbus/TCP-Api Read-Only", //
 				OpenemsComponent.ChannelId.values(), //
 				Controller.ChannelId.values(), //
-				ModbusTcpApi.ChannelId.values(), //
+				ModbusApi.ChannelId.values(), //
 				ControllerApiModbusTcpReadOnly.ChannelId.values() //
 		);
 	}
 
 	@Activate
 	private void activate(ComponentContext context, Config config) throws ModbusException, OpenemsException {
-		super.activate(context, this.cm,
-				new ConfigRecord(config.id(), config.alias(), config.enabled(), this.metaComponent,
-						config.component_ids(), 0 /* no timeout */, config.port(), config.maxConcurrentConnections()));
+		this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), 0 /* no timeout */, config.port(), config.maxConcurrentConnections());
+		super.activate(context, this.cm, this.config);
 	}
 
 	@Override
@@ -83,8 +88,7 @@ protected AccessMode getAccessMode() {
 
 	@Override
 	protected Consumer<Entry<WriteChannel<?>, WriteObject>> handleWrites() {
-		return entry -> {
-		};
+		return FunctionUtils::doNothing;
 	}
 
 	@Override
@@ -93,7 +97,11 @@ protected void setOverrideStatus(Status status) {
 
 	@Override
 	protected Runnable handleTimeouts() {
-		return () -> {
-		};
+		return FunctionUtils::doNothing;
+	}
+
+	@Override
+	protected ModbusSlave createSlave() throws ModbusException {
+		return ModbusSlaveFactory.createTCPSlave(this.config.getPort(), this.config.maxConcurrentConnections());
 	}
 }
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java
new file mode 100644
index 00000000000..380d24fb662
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java
@@ -0,0 +1,52 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+
+@ObjectClassDefinition(//
+		name = "Controller Api Modbus/RTU Read-Write", //
+		description = "This controller provides a read-write Modbus/RTU api.")
+@interface Config {
+
+	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+	String id() default "ctrlApiModbusRtu0";
+
+	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+	String alias() default "ModbusRtu Read-Write";
+
+	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+	boolean enabled() default true;
+
+	@AttributeDefinition(name = "Port-Name", description = "The name of the serial port - e.g. '/dev/ttyUSB0' or 'COM3'")
+	String portName() default "/dev/ttyUSB0";
+
+	@AttributeDefinition(name = "Component-IDs", description = "Components that should be made available via Modbus.")
+	String[] component_ids() default { "_sum" };
+
+	@AttributeDefinition(name = "Api-Timeout", description = "Sets the timeout in seconds for updates on Channels set by this Api.")
+	int apiTimeout() default 60;
+
+	@AttributeDefinition(name = "Max concurrent connections", description = "Sets the maximum number of concurrent connections via Modbus.")
+	int maxConcurrentConnections() default AbstractModbusRtuApi.DEFAULT_MAX_CONCURRENT_CONNECTIONS;
+	
+	@AttributeDefinition(name = "Components target filter", description = "This is auto-generated by 'Component-IDs'.")
+	String Component_target() default "(enabled=true)";
+	
+	@AttributeDefinition(name = "Baudrate", description = "The baudrate - e.g. 9600, 19200, 38400, 57600 or 115200")
+	int baudRate() default 9600;
+
+	@AttributeDefinition(name = "Databits", description = "The number of databits - e.g. 8")
+	int databits() default 8;
+
+	@AttributeDefinition(name = "Stopbits", description = "The number of stopbits - '1', '1.5' or '2'")
+	Stopbit stopbits() default Stopbit.ONE;
+
+	@AttributeDefinition(name = "Parity", description = "The parity - 'none', 'even', 'odd', 'mark' or 'space'")
+	Parity parity() default Parity.NONE;
+
+	String webconsole_configurationFactory_nameHint() default "Controller Api Modbus/RTU Read-Write [{id}]";
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java
new file mode 100644
index 00000000000..85280084c66
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java
@@ -0,0 +1,50 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import io.openems.common.channel.Unit;
+import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.StringReadChannel;
+import io.openems.edge.common.component.OpenemsComponent;
+
+public interface ControllerApiModbusRtuReadWrite extends OpenemsComponent {
+
+	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+		API_WORKER_LOG(Doc.of(OpenemsType.STRING) //
+				.text("Logs Write-Commands via ApiWorker")), //
+		DEBUG_SET_ACTIVE_POWER_EQUALS(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.WATT)), //
+		DEBUG_SET_ACTIVE_POWER_GREATER_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.WATT)), //
+		DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.WATT)), //
+		DEBUG_SET_REACTIVE_POWER_EQUALS(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.VOLT_AMPERE_REACTIVE)), //
+		DEBUG_SET_REACTIVE_POWER_GREATER_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.VOLT_AMPERE_REACTIVE)), //
+		DEBUG_SET_REACTIVE_POWER_LESS_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+				.unit(Unit.VOLT_AMPERE_REACTIVE)), //
+
+		;
+
+		private final Doc doc;
+
+		private ChannelId(Doc doc) {
+			this.doc = doc;
+		}
+
+		@Override
+		public Doc doc() {
+			return this.doc;
+		}
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#API_WORKER_LOG}.
+	 *
+	 * @return the Channel
+	 */
+	public default StringReadChannel getApiWorkerLogChannel() {
+		return this.channel(ChannelId.API_WORKER_LOG);
+	}
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java
new file mode 100644
index 00000000000..7cfd34c5840
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java
@@ -0,0 +1,141 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+
+import com.ghgande.j2mod.modbus.Modbus;
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlave;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
+import com.ghgande.j2mod.modbus.util.SerialParameters;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
+import io.openems.edge.common.modbusslave.ModbusSlaveTable;
+import io.openems.edge.common.modbusslave.ModbusType;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+		name = "Controller.Api.ModbusRtu.ReadWrite", //
+		immediate = true, //
+		configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class ControllerApiModbusRtuReadWriteImpl extends AbstractModbusRtuApi
+		implements ControllerApiModbusRtuReadWrite, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi,
+		io.openems.edge.common.modbusslave.ModbusSlave {
+
+	@Reference
+	private Meta metaComponent = null;
+
+	@Reference
+	private ConfigurationAdmin cm;
+	
+	private RtuConfig config;
+
+	@Reference
+	private ComponentManager componentManager;
+
+	public ControllerApiModbusRtuReadWriteImpl() {
+		super("Modbus/RTU-Api Read-Write", //
+				OpenemsComponent.ChannelId.values(), //
+				Controller.ChannelId.values(), //
+				ModbusApi.ChannelId.values(), //
+				ControllerApiModbusRtuReadWrite.ChannelId.values() //
+		);
+		this.apiWorker.setLogChannel(this.getApiWorkerLogChannel());
+	}
+
+	@Override
+	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
+	protected void addComponent(OpenemsComponent component) {
+		super.addComponent(component);
+	}
+
+	@Override
+	protected void removeComponent(OpenemsComponent component) {
+		super.removeComponent(component);
+	}
+
+	@Activate
+	private void activate(ComponentContext context, Config config) throws OpenemsException {
+		this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), config.apiTimeout(), config.portName(), config.baudRate(), config.databits(),
+				config.stopbits(), config.parity(), config.maxConcurrentConnections());
+		super.activate(context, this.cm, this.config);
+	}
+
+	@Modified
+	private void modified(ComponentContext context, Config config) throws OpenemsException {
+		this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), config.apiTimeout(), config.portName(), config.baudRate(), config.databits(),
+				config.stopbits(), config.parity(), config.maxConcurrentConnections());
+		super.modified(context, this.cm, this.config);
+	}
+
+	@Override
+	@Deactivate
+	protected void deactivate() {
+		super.deactivate();
+	}
+
+	@Override
+	protected ModbusSlave createSlave() throws ModbusException {
+		SerialParameters params = new SerialParameters();
+		params.setPortName(this.config.portName());
+		params.setBaudRate(this.config.baudRate());
+		params.setDatabits(this.config.databits());
+		params.setStopbits(this.config.stopbits().getValue());
+		params.setParity(this.config.parity().getValue());
+		params.setEncoding(Modbus.SERIAL_ENCODING_RTU);
+		params.setEcho(false);
+		return ModbusSlaveFactory.createSerialSlave(params);
+	}
+
+	@Override
+	protected AccessMode getAccessMode() {
+		return AccessMode.READ_WRITE;
+	}
+
+	@Override
+	public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
+		return new ModbusSlaveTable(//
+				OpenemsComponent.getModbusSlaveNatureTable(accessMode), //
+				ModbusSlaveNatureTable.of(ControllerApiModbusRtuReadWrite.class, accessMode, 100) //
+						.channel(0, ModbusApi.ChannelId.UNABLE_TO_START, ModbusType.UINT16) //
+						.channel(1, ModbusApi.ChannelId.COMPONENT_MISSING_FAULT, ModbusType.UINT16) //
+						.channel(2, ModbusApi.ChannelId.PROCESS_IMAGE_FAULT, ModbusType.UINT16) //
+						.channel(3, ModbusApi.ChannelId.COMPONENT_NO_MODBUS_API_FAULT, ModbusType.UINT16) //
+						.channel(4, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_ACTIVE_POWER_EQUALS,
+								ModbusType.FLOAT32) //
+						.channel(6, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_ACTIVE_POWER_GREATER_OR_EQUALS,
+								ModbusType.FLOAT32) //
+						.channel(8, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS,
+								ModbusType.FLOAT32) //
+						.channel(10, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_REACTIVE_POWER_EQUALS,
+								ModbusType.FLOAT32) //
+						.channel(12,
+								ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_REACTIVE_POWER_GREATER_OR_EQUALS,
+								ModbusType.FLOAT32) //
+						.channel(14, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_REACTIVE_POWER_LESS_OR_EQUALS,
+								ModbusType.FLOAT32) //
+						.build()); //
+	}
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/Config.java
similarity index 94%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/Config.java
index 9edd49da1bd..efd08feb754 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/Config.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
 
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -14,7 +14,7 @@
 	String id() default "ctrlApiModbusTcp0";
 
 	@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
-	String alias() default "";
+	String alias() default "ModbusTcp Read-Write";
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWrite.java
similarity index 97%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWrite.java
index f39092ee732..47e04f0b476 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWrite.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
 
 import static io.openems.common.channel.PersistencePriority.HIGH;
 import static io.openems.common.channel.Unit.CUMULATED_SECONDS;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImpl.java
similarity index 86%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImpl.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImpl.java
index 6f1a47ad49c..6aff04589ce 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImpl.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
 
 import static io.openems.edge.common.channel.ChannelId.channelIdCamelToUpper;
 import static io.openems.edge.common.channel.ChannelId.channelIdUpperToCamel;
@@ -27,6 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
 
 import io.openems.common.channel.AccessMode;
 import io.openems.common.channel.PersistencePriority;
@@ -48,7 +49,7 @@
 import io.openems.edge.controller.api.common.Status;
 import io.openems.edge.controller.api.common.WriteObject;
 import io.openems.edge.controller.api.modbus.AbstractModbusTcpApi;
-import io.openems.edge.controller.api.modbus.ModbusTcpApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.timedata.api.Timedata;
 import io.openems.edge.timedata.api.TimedataProvider;
@@ -61,7 +62,7 @@
 		configurationPolicy = ConfigurationPolicy.REQUIRE //
 )
 public class ControllerApiModbusTcpReadWriteImpl extends AbstractModbusTcpApi
-		implements ControllerApiModbusTcpReadWrite, ModbusTcpApi, Controller, OpenemsComponent, ComponentJsonApi,
+		implements ControllerApiModbusTcpReadWrite, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi,
 		TimedataProvider, ModbusSlave {
 
 	private final Logger log = LoggerFactory.getLogger(ControllerApiModbusTcpReadWriteImpl.class);
@@ -76,12 +77,14 @@ public class ControllerApiModbusTcpReadWriteImpl extends AbstractModbusTcpApi
 
 	private List<OpenemsComponent> components = new ArrayList<>();
 
+	private TcpConfig config;
+
 	private boolean isActive = false;
 
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
-	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
+	@Reference
 	private Meta metaComponent = null;
 
 	@Reference
@@ -107,7 +110,7 @@ public ControllerApiModbusTcpReadWriteImpl() {
 		super("Modbus/TCP-Api Read-Write", //
 				OpenemsComponent.ChannelId.values(), //
 				Controller.ChannelId.values(), //
-				ModbusTcpApi.ChannelId.values(), //
+				ModbusApi.ChannelId.values(), //
 				ControllerApiModbusTcpReadWrite.ChannelId.values() //
 		);
 		this.apiWorker.setLogChannel(this.getApiWorkerLogChannel());
@@ -115,17 +118,17 @@ public ControllerApiModbusTcpReadWriteImpl() {
 
 	@Activate
 	private void activate(ComponentContext context, Config config) throws ModbusException, OpenemsException {
-		super.activate(context, this.cm,
-				new ConfigRecord(config.id(), config.alias(), config.enabled(), this.metaComponent,
-						config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections()));
+		this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections());
+		super.activate(context, this.cm, this.config);
 		this.applyConfig(config);
 	}
 
 	@Modified
 	private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
-		super.modified(context, this.cm,
-				new ConfigRecord(config.id(), config.alias(), config.enabled(), this.metaComponent,
-						config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections()));
+		this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+				config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections());
+		super.modified(context, this.cm, this.config);
 		this.applyConfig(config);
 	}
 
@@ -245,14 +248,18 @@ protected Integer getChannelValue(String componentId, io.openems.edge.common.cha
 	public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 		return new ModbusSlaveTable(//
 				OpenemsComponent.getModbusSlaveNatureTable(AccessMode.READ_ONLY),
-				ModbusSlaveNatureTable.of(ControllerApiModbusTcpReadWriteImpl.class, AccessMode.READ_ONLY, 300)
-						.cycleValue(0, this.id() + "/  Ess0ActivePowerLimit", Unit.WATT, "", ModbusType.FLOAT32,
+				ModbusSlaveNatureTable.of(ControllerApiModbusTcpReadWrite.class, AccessMode.READ_ONLY, 300)
+						.cycleValue(0, this.id() + "/Ess0ActivePowerLimit", Unit.WATT, "", ModbusType.FLOAT32,
 								t -> this.getChannelValue("ess0",
 										ManagedSymmetricEss.ChannelId.SET_ACTIVE_POWER_EQUALS))
-						.cycleValue(2, this.id() + "/Ess0ReactivePowerLimit", Unit.WATT, "", ModbusType.FLOAT32,
-								t -> this.getChannelValue("ess0",
+						.cycleValue(2, this.id() + "/Ess0ReactivePowerLimit", Unit.VOLT_AMPERE_REACTIVE, "",
+								ModbusType.FLOAT32, t -> this.getChannelValue("ess0",
 										ManagedSymmetricEss.ChannelId.SET_REACTIVE_POWER_EQUALS))
 						.build());
 	}
 
+	@Override
+	protected com.ghgande.j2mod.modbus.slave.ModbusSlave createSlave() throws ModbusException {
+		return ModbusSlaveFactory.createTCPSlave(this.config.getPort(), this.config.maxConcurrentConnections());
+	}
 }
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java
new file mode 100644
index 00000000000..251a9bf8145
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java
@@ -0,0 +1,32 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import org.junit.Test;
+
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.controller.test.ControllerTest;
+
+public class ControllerApiModbusRtuReadOnlyImplTest {
+
+	private static final String CTRL_ID = "ctrl0";
+
+	@Test
+	public void test() throws Exception {
+		new ControllerTest(new ControllerApiModbusRtuReadOnlyImpl()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.activate(MyConfig.create() //
+						.setId(CTRL_ID) //
+						.setEnabled(false) // do not actually start server
+						.setParity(Parity.NONE)
+						.setStopbit(Stopbit.ONE)
+						.setBaudrate(9600) //
+						.setComponentIds() //
+						.setMaxConcurrentConnections(5) //
+						.setPortName("/dev/ttyUSB0") //
+						.build()) //
+				.next(new TestCase()) //
+		;
+	}
+}
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java
new file mode 100644
index 00000000000..4eef1319428
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java
@@ -0,0 +1,147 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.utils.ConfigUtils;
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+	protected static class Builder {
+		private String id;
+		private boolean enabled;
+		private String portName;
+		private String[] componentIds;
+		private int baudrate;
+		private int databits;
+		private Stopbit stopbit;
+		private Parity parity;
+		private int apiTimeout;
+		private int maxConcurrentConnections;
+
+		private Builder() {
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setEnabled(boolean enabled) {
+			this.enabled = enabled;
+			return this;
+		}
+
+		public Builder setPortName(String portName) {
+			this.portName = portName;
+			return this;
+		}
+
+		public Builder setComponentIds(String... componentIds) {
+			this.componentIds = componentIds;
+			return this;
+		}
+
+		public Builder setMaxConcurrentConnections(int maxConcurrentConnections) {
+			this.maxConcurrentConnections = maxConcurrentConnections;
+			return this;
+		}
+		
+		public Builder setBaudrate(int baudrate) {
+			this.baudrate = baudrate;
+			return this;
+		}
+		
+		public Builder setDatabits(int databits) {
+			this.databits = databits;
+			return this;
+		}
+		
+		public Builder setStopbit(Stopbit stopbit) {
+			this.stopbit = stopbit;
+			return this;
+		}
+		
+		public Builder setParity(Parity parity) {
+			this.parity = parity;
+			return this;
+		}
+		
+		public Builder setApiTimeout(int apiTimeout) {
+			this.apiTimeout = apiTimeout;
+			return this;
+		}
+
+		public MyConfig build() {
+			return new MyConfig(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 *
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfig(Builder builder) {
+		super(Config.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public boolean enabled() {
+		return this.builder.enabled;
+	}
+
+	@Override
+	public String portName() {
+		return this.builder.portName;
+	}
+
+	@Override
+	public int apiTimeout() {
+		return this.builder.apiTimeout;
+	}
+
+	@Override
+	public int baudRate() {
+		return this.builder.baudrate;
+	}
+
+	@Override
+	public int databits() {
+		return this.builder.baudrate;
+	}
+
+	@Override
+	public Stopbit stopbits() {
+		return this.builder.stopbit;
+	}
+
+	@Override
+	public Parity parity() {
+		return this.builder.parity;
+	}
+
+	@Override
+	public String[] component_ids() {
+		return this.builder.componentIds;
+	}
+
+	@Override
+	public int maxConcurrentConnections() {
+		return this.builder.maxConcurrentConnections;
+	}
+
+	@Override
+	public String Component_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), false, this.component_ids());
+	}
+	
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImplTest.java
similarity index 93%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImplTest.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImplTest.java
index 6248a9b4e41..dc90cfccd44 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImplTest.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImplTest.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
 
 import static io.openems.edge.controller.api.modbus.AbstractModbusTcpApi.DEFAULT_PORT;
 
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/MyConfig.java
similarity index 96%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/MyConfig.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/MyConfig.java
index 0b9618e3806..428f8b1dd1e 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/MyConfig.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/MyConfig.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
 
 import io.openems.common.test.AbstractComponentConfig;
 import io.openems.common.utils.ConfigUtils;
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java
new file mode 100644
index 00000000000..2a3e244447c
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java
@@ -0,0 +1,30 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import org.junit.Test;
+
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.controller.test.ControllerTest;
+
+public class ControllerApiModbusRtuReadWriteImplTest {
+
+	private static final String CTRL_ID = "ctrl0";
+
+	@Test
+	public void test() throws Exception {
+		new ControllerTest(new ControllerApiModbusRtuReadWriteImpl()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.activate(MyConfig.create() //
+						.setId(CTRL_ID) //
+						.setEnabled(false) // do not actually start server
+						.setParity(Parity.NONE).setStopbit(Stopbit.ONE).setBaudrate(9600) //
+						.setComponentIds() //
+						.setMaxConcurrentConnections(5) //
+						.setPortName("/dev/ttyUSB0") //
+						.build()) //
+				.next(new TestCase()) //
+		;
+	}
+}
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java
new file mode 100644
index 00000000000..6f28ca0db52
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java
@@ -0,0 +1,147 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.utils.ConfigUtils;
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+	protected static class Builder {
+		private String id;
+		private boolean enabled;
+		private String portName;
+		private String[] componentIds;
+		private int baudrate;
+		private int databits;
+		private Stopbit stopbit;
+		private Parity parity;
+		private int apiTimeout;
+		private int maxConcurrentConnections;
+
+		private Builder() {
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setEnabled(boolean enabled) {
+			this.enabled = enabled;
+			return this;
+		}
+
+		public Builder setPortName(String portName) {
+			this.portName = portName;
+			return this;
+		}
+
+		public Builder setComponentIds(String... componentIds) {
+			this.componentIds = componentIds;
+			return this;
+		}
+
+		public Builder setMaxConcurrentConnections(int maxConcurrentConnections) {
+			this.maxConcurrentConnections = maxConcurrentConnections;
+			return this;
+		}
+
+		public Builder setBaudrate(int baudrate) {
+			this.baudrate = baudrate;
+			return this;
+		}
+
+		public Builder setDatabits(int databits) {
+			this.databits = databits;
+			return this;
+		}
+
+		public Builder setStopbit(Stopbit stopbit) {
+			this.stopbit = stopbit;
+			return this;
+		}
+
+		public Builder setParity(Parity parity) {
+			this.parity = parity;
+			return this;
+		}
+
+		public Builder setApiTimeout(int apiTimeout) {
+			this.apiTimeout = apiTimeout;
+			return this;
+		}
+
+		public MyConfig build() {
+			return new MyConfig(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 *
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfig(Builder builder) {
+		super(Config.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public boolean enabled() {
+		return this.builder.enabled;
+	}
+
+	@Override
+	public String portName() {
+		return this.builder.portName;
+	}
+
+	@Override
+	public int apiTimeout() {
+		return this.builder.apiTimeout;
+	}
+
+	@Override
+	public int baudRate() {
+		return this.builder.baudrate;
+	}
+
+	@Override
+	public int databits() {
+		return this.builder.baudrate;
+	}
+
+	@Override
+	public Stopbit stopbits() {
+		return this.builder.stopbit;
+	}
+
+	@Override
+	public Parity parity() {
+		return this.builder.parity;
+	}
+
+	@Override
+	public String[] component_ids() {
+		return this.builder.componentIds;
+	}
+
+	@Override
+	public int maxConcurrentConnections() {
+		return this.builder.maxConcurrentConnections;
+	}
+
+	@Override
+	public String Component_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), false, this.component_ids());
+	}
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImplTest.java
similarity index 72%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImplTest.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImplTest.java
index f87124a5295..7ca3f80aaaa 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImplTest.java
@@ -1,8 +1,8 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
 
 import static io.openems.edge.controller.api.modbus.AbstractModbusTcpApi.DEFAULT_PORT;
-import static io.openems.edge.controller.api.modbus.readwrite.ControllerApiModbusTcpReadWriteImpl.getChannelNameCamel;
-import static io.openems.edge.controller.api.modbus.readwrite.ControllerApiModbusTcpReadWriteImpl.getChannelNameUpper;
+import static io.openems.edge.controller.api.modbus.readwrite.tcp.ControllerApiModbusTcpReadWriteImpl.getChannelNameCamel;
+import static io.openems.edge.controller.api.modbus.readwrite.tcp.ControllerApiModbusTcpReadWriteImpl.getChannelNameUpper;
 import static io.openems.edge.ess.api.ManagedSymmetricEss.ChannelId.SET_ACTIVE_POWER_EQUALS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -53,13 +53,17 @@ public void testAddFalseComponents() throws Exception {
 
 	@Test
 	public void testGetChannelNameUpper() {
-		assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS", getChannelNameUpper("ess0", SET_ACTIVE_POWER_EQUALS));
-		assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS", getChannelNameUpper("Ess0", SET_ACTIVE_POWER_EQUALS));
+		assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS",
+				getChannelNameUpper("ess0", SET_ACTIVE_POWER_EQUALS));
+		assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS",
+				getChannelNameUpper("Ess0", SET_ACTIVE_POWER_EQUALS));
 	}
 
 	@Test
 	public void testGetChannelNameCamel() {
-		assertEquals("Ess0SetActivePowerEquals", getChannelNameCamel("ess0", SET_ACTIVE_POWER_EQUALS));
-		assertEquals("Ess0SetActivePowerEquals", getChannelNameCamel("Ess0", SET_ACTIVE_POWER_EQUALS));
+		assertEquals("Ess0SetActivePowerEquals",
+				getChannelNameCamel("ess0", SET_ACTIVE_POWER_EQUALS));
+		assertEquals("Ess0SetActivePowerEquals",
+				getChannelNameCamel("Ess0", SET_ACTIVE_POWER_EQUALS));
 	}
 }
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/MyConfig.java
similarity index 97%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/MyConfig.java
index 1b761e3d72a..6a6a40a630a 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/MyConfig.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
 
 import io.openems.common.test.AbstractComponentConfig;
 import io.openems.common.utils.ConfigUtils;
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
index 68f2031ba43..588d84b1bdb 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
@@ -24,6 +24,7 @@ public class Context extends AbstractContext<ControllerEssEmergencyCapacityReser
 	private Float targetPower;
 	private float rampPower;
 	private State lastActiveState;
+	private State previousState;
 
 	public Context(ControllerEssEmergencyCapacityReserve emergencyCapacityReserve, Sum sum, Integer maxApparentPower,
 			Integer soc, int reserveSoc, boolean isEssChargeFromGridAllowed) {
@@ -55,6 +56,10 @@ public State getLastActiveState() {
 		return this.lastActiveState == null ? State.UNDEFINED : this.lastActiveState;
 	}
 
+	public State getPreviousState() {
+		return this.previousState == null ? State.UNDEFINED : this.previousState;
+	}
+
 	protected void setRampPower(Double rampPower) {
 		this.rampPower = rampPower == null ? null : rampPower.floatValue();
 	}
@@ -71,4 +76,8 @@ public void setLastActiveState(State state) {
 		this.lastActiveState = state;
 	}
 
+	public void setPreviousState(State state) {
+		this.previousState = state;
+	}
+
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java
index a5d0478a391..db595e67586 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeGridHandler.java
@@ -29,7 +29,8 @@ protected State runAndGetNextState(Context context) throws OpenemsNamedException
 
 		// calculate target and ramp power
 		context.setTargetPower(targetPower);
-		context.setRampPower(context.maxApparentPower * 0.01);
+		context.setRampPower(context.maxApparentPower //
+				* (context.getPreviousState() != State.FORCE_CHARGE_GRID ? 2 : 0.01));
 
 		// SoC is greater or equals then configured reserveSoC or 100
 		if (soc >= reserveSoc + 1 || soc == 100) {
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
index ad0286d4054..c42fbe6677d 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
@@ -82,6 +82,7 @@ public void run(Context context) throws OpenemsNamedException {
 			this.lastActiveState = this.getPreviousState();
 		}
 		context.setLastActiveState(this.lastActiveState);
+		context.setPreviousState(this.getPreviousState());
 		super.run(context);
 	}
 
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
index 2ab88d2be77..30c0e7e27d6 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
@@ -606,20 +606,20 @@ public void testGridChargingOn() throws Exception {
 				)//
 				.next(new TestCase()//
 						.input("ess0", SOC, 18).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
-						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100)//
-						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000) //
 				)//
 				.next(new TestCase()//
 						.input("ess0", SOC, 18)//
 						.output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
-						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000)//
-						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000) //
 				)
 				// From Below
 				.next(new TestCase()//
 						.input("ess0", SOC, 15).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
-						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900)//
-						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900) //
+						.output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1100)//
+						.output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1100) //
 				)
 				// let ramp run its course
 				.next(new TestCase()//
diff --git a/io.openems.edge.core/.settings/org.eclipse.core.resources.prefs b/io.openems.edge.core/.settings/org.eclipse.core.resources.prefs
index 2b7c020688d..345c44953dd 100644
--- a/io.openems.edge.core/.settings/org.eclipse.core.resources.prefs
+++ b/io.openems.edge.core/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
 encoding//src/io/openems/edge/core/appmanager/dependency/translation_de.properties=UTF-8
 encoding//src/io/openems/edge/core/appmanager/translation_de.properties=UTF-8
+encoding//src/io/openems/edge/core/appmanager/translation_en.properties=UTF-8
+encoding//src/io/openems/edge/core/appmanager/validator/translation_de.properties=UTF-8
 encoding/<project>=UTF-8
diff --git a/io.openems.edge.core/bnd.bnd b/io.openems.edge.core/bnd.bnd
index 58ebb64e861..c5001d1d1ae 100644
--- a/io.openems.edge.core/bnd.bnd
+++ b/io.openems.edge.core/bnd.bnd
@@ -5,6 +5,7 @@ Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
+	com.fazecast.jSerialComm,\
 	io.openems.common,\
 	io.openems.edge.common,\
 	io.openems.edge.controller.api,\
@@ -24,4 +25,4 @@ Bundle-Version: 1.0.0.${tstamp}
 -testpath: \
 	${testpath},\
 	io.openems.wrapper.fastexcel,\
-	io.openems.wrapper.opczip
+	io.openems.wrapper.opczip,\
\ No newline at end of file
diff --git a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusApiProps.java b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusApiProps.java
new file mode 100644
index 00000000000..a75928ed63a
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusApiProps.java
@@ -0,0 +1,188 @@
+package io.openems.edge.app.api;
+
+import static io.openems.edge.app.common.props.CommonProps.defaultDef;
+import static io.openems.edge.core.appmanager.formly.enums.InputType.NUMBER;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fazecast.jSerialComm.SerialPort;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonPrimitive;
+
+import io.openems.common.session.Role;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.app.common.props.ComponentProps;
+import io.openems.edge.common.modbusslave.ModbusSlave;
+import io.openems.edge.core.appmanager.AppDef;
+import io.openems.edge.core.appmanager.ComponentManagerSupplier;
+import io.openems.edge.core.appmanager.ComponentUtilSupplier;
+import io.openems.edge.core.appmanager.Nameable;
+import io.openems.edge.core.appmanager.OpenemsApp;
+import io.openems.edge.core.appmanager.TranslationUtil;
+import io.openems.edge.core.appmanager.Type.Parameter.BundleProvider;
+import io.openems.edge.core.appmanager.formly.Exp;
+import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
+import io.openems.edge.core.appmanager.formly.builder.ReorderArrayBuilder.SelectOptionExpressions;
+
+public final class ModbusApiProps {
+
+	/**
+	 * Creates a {@link AppDef} to select {@link ModbusSlave} Components for a
+	 * ModbusApi.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> pickModbusIds() {
+		return AppDef.copyOfGeneric(ComponentProps.pickOrderedArrayIds(ModbusSlave.class, component -> {
+			if ("_meta".equals(component.id())) {
+				return false;
+			}
+			return true;
+		}, (app, property, l, parameter, component) -> {
+			if ("_sum".equals(component.id())) {
+				final var lockedExpression = Exp.currentModelValue(property).asArray() //
+						.elementAt(0).equal(Exp.staticValue(component.id()));
+				return new SelectOptionExpressions(lockedExpression);
+			}
+			return null;
+		}, List.of((app, property, language, parameter) -> {
+			return JsonFormlyUtil.buildText() //
+					.setText(TranslationUtil.getTranslation(parameter.bundle(), "App.Api.Modbus.changeComponentHint"));
+		})), def -> def //
+				.setTranslatedLabel("component.id.plural") //
+		);
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select {@link ModbusSlave} Components for a
+	 * ModbusApi.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> apiTimeout() {
+		return AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("App.Api.apiTimeout.label") //
+				.setTranslatedDescription("App.Api.apiTimeout.description") //
+				.setDefaultValue(60) //
+				.setField(JsonFormlyUtil::buildInputFromNameable, (app, property, l, parameter, field) -> {
+					field.setInputType(NUMBER) //
+							.setMin(0);
+				})); //
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select Port Name for ModbusRTU Api.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> portName() {
+		return AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("App.Api.ModbusRtu.portName.label") //
+				.setTranslatedDescription("App.Api.ModbusRtu.portName.description") //
+				.setDefaultValue((app, property, l, parameter) -> {
+					SerialPort[] ports = SerialPort.getCommPorts();
+					if (ports.length > 0) {
+						return new JsonPrimitive(ports[0].getSystemPortName());
+					}
+					return JsonNull.INSTANCE;
+				}).setField(JsonFormlyUtil::buildSelectFromNameable, (app, property, l, parameter, field) -> {
+					SerialPort[] ports = SerialPort.getCommPorts();
+					var portNames = new ArrayList<String>();
+					for (var port : ports) {
+						portNames.add(port.getSystemPortName());
+					}
+					field.setOptions(portNames);
+				})); //
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select baudrate for ModbusRTU Api.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> baudrate() {
+		return AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("App.Api.ModbusRtu.baudrate.label") //
+				.setTranslatedDescription("App.Api.ModbusRtu.baudrate.description") //
+				.setDefaultValue(9600) //
+				.setField(JsonFormlyUtil::buildInputFromNameable, (app, property, l, parameter, field) -> {
+					field.setInputType(NUMBER) //
+							.setMin(0);
+				})); //
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select Databits for ModbusRTU Api.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> databits() {
+		return AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("App.Api.ModbusRtu.databits.label") //
+				.setTranslatedDescription("App.Api.ModbusRtu.databits.description") //
+				.setDefaultValue(8));
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select Stopbits for ModbusRTU Api.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> stopbits() {
+		return AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("App.Api.ModbusRtu.stopbits.label") //
+				.setTranslatedDescription("App.Api.ModbusRtu.stopbits.description") //
+				.setDefaultValue("ONE") //
+				.setField(JsonFormlyUtil::buildSelectFromNameable, (app, prop, l, params, field) -> {
+					field.setOptions(List.of("ONE", "ONE_POINT_FIVE", "TWO"));
+				}));
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select Parity for ModbusRTU Api.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> parity() {
+		return AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("App.Api.ModbusRtu.parity.label") //
+				.setTranslatedDescription("App.Api.ModbusRtu.parity.description") //
+				.setDefaultValue("NONE") //
+				.setField(JsonFormlyUtil::buildSelectFromNameable, (app, prop, l, params, field) -> {
+					field.setOptions(List.of("NONE", "ODD", "EVEN", "MARK", "SPACE"));
+				}));
+	}
+
+	/**
+	 * Creates a {@link AppDef} to select Component Ids for ModbusApi.
+	 * 
+	 * @param <APP> the type of the {@link OpenemsApp}
+	 * @param componentName the component name
+	 * @return the {@link AppDef}
+	 */
+	public static <APP extends OpenemsApp & ComponentUtilSupplier & ComponentManagerSupplier> AppDef<APP, Nameable, BundleProvider> componentIds(
+			Nameable componentName) {
+		return AppDef.copyOfGeneric(ModbusApiProps.pickModbusIds(), def -> def //
+				.setDefaultValue((app, property, l, parameter) -> {
+					final var jsonArrayBuilder = JsonUtils.buildJsonArray() //
+							.add("_sum");
+
+					return jsonArrayBuilder.build();
+				}) //
+				.bidirectional(componentName, "component.ids", ComponentManagerSupplier::getComponentManager) //
+				.appendIsAllowedToSee(AppDef.ofLeastRole(Role.ADMIN))); //
+
+	}
+
+	private ModbusApiProps() {
+	}
+
+}
diff --git a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadOnly.java b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadOnly.java
new file mode 100644
index 00000000000..35a002711ad
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadOnly.java
@@ -0,0 +1,191 @@
+package io.openems.edge.app.api;
+
+import static io.openems.edge.app.common.props.CommonProps.alias;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+import com.google.common.collect.Lists;
+import com.google.gson.JsonElement;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.oem.OpenemsEdgeOem;
+import io.openems.common.session.Language;
+import io.openems.common.session.Role;
+import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.app.api.ModbusRtuApiReadOnly.Property;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.core.appmanager.AbstractOpenemsApp;
+import io.openems.edge.core.appmanager.AbstractOpenemsAppWithProps;
+import io.openems.edge.core.appmanager.AppConfiguration;
+import io.openems.edge.core.appmanager.AppDef;
+import io.openems.edge.core.appmanager.AppDescriptor;
+import io.openems.edge.core.appmanager.ComponentUtil;
+import io.openems.edge.core.appmanager.ConfigurationTarget;
+import io.openems.edge.core.appmanager.Nameable;
+import io.openems.edge.core.appmanager.OpenemsApp;
+import io.openems.edge.core.appmanager.OpenemsAppCardinality;
+import io.openems.edge.core.appmanager.OpenemsAppCategory;
+import io.openems.edge.core.appmanager.OpenemsAppPermissions;
+import io.openems.edge.core.appmanager.Type;
+import io.openems.edge.core.appmanager.Type.Parameter.BundleParameter;
+import io.openems.edge.core.appmanager.dependency.Tasks;
+import io.openems.edge.core.appmanager.dependency.aggregatetask.SchedulerByCentralOrderConfiguration.SchedulerComponent;
+
+/**
+ * Describes a App for ReadOnly Modbus/RTU Api.
+ *
+ * <pre>
+  {
+    "appId":"App.Api.ModbusRtu.ReadOnly",
+    "alias":"Modbus/RTU-Api Read-Only",
+    "instanceId": UUID,
+    "image": base64,
+    "properties":{
+    	"ACTIVE": true,
+    	"CONTROLLER_ID": "ctrlApiModbusRtu0"
+    },
+    "appDescriptor": {
+    	"websiteUrl": {@link AppDescriptor#getWebsiteUrl()}
+    }
+  }
+ * </pre>
+ */
+@Component(name = "App.Api.ModbusRtu.ReadOnly")
+public class ModbusRtuApiReadOnly extends AbstractOpenemsAppWithProps<ModbusRtuApiReadOnly, Property, BundleParameter>
+		implements OpenemsApp {
+
+	public static enum Property implements Type<Property, ModbusRtuApiReadOnly, BundleParameter>, Nameable {
+		// Component-IDs
+		CONTROLLER_ID(AppDef.componentId("ctrlApiModbusRtu0")), //
+		// Properties
+		ALIAS(alias()), //
+		API_TIMEOUT(ModbusApiProps.apiTimeout() //
+				.setRequired(true)), //
+		COMPONENT_IDS(ModbusApiProps.componentIds(CONTROLLER_ID) //
+				.setRequired(true)), //
+		PORT_NAME(ModbusApiProps.portName() //
+				.setRequired(true)), //
+		BAUDRATE(ModbusApiProps.baudrate() //
+				.setRequired(true)), //
+		DATABITS(ModbusApiProps.databits() //
+				.setRequired(true)),
+		STOPBITS(ModbusApiProps.stopbits() //
+				.setRequired(true)), //
+		PARITY(ModbusApiProps.parity() //
+				.setRequired(true)); //
+
+		private final AppDef<? super ModbusRtuApiReadOnly, ? super Property, ? super BundleParameter> def;
+
+		private Property(AppDef<? super ModbusRtuApiReadOnly, ? super Property, ? super BundleParameter> def) {
+			this.def = def;
+		}
+
+		@Override
+		public Type<Property, ModbusRtuApiReadOnly, BundleParameter> self() {
+			return this;
+		}
+
+		@Override
+		public AppDef<? super ModbusRtuApiReadOnly, ? super Property, ? super BundleParameter> def() {
+			return this.def;
+		}
+
+		@Override
+		public Function<GetParameterValues<ModbusRtuApiReadOnly>, BundleParameter> getParamter() {
+			return Parameter.functionOf(AbstractOpenemsApp::getTranslationBundle);
+		}
+	}
+
+	@Activate
+	public ModbusRtuApiReadOnly(@Reference ComponentManager componentManager, ComponentContext context,
+			@Reference ConfigurationAdmin cm, @Reference ComponentUtil componentUtil) {
+		super(componentManager, context, cm, componentUtil);
+	}
+
+	@Override
+	public AppDescriptor getAppDescriptor(OpenemsEdgeOem oem) {
+		return AppDescriptor.create() //
+				.setWebsiteUrl(oem.getAppWebsiteUrl(this.getAppId())) //
+				.build();
+	}
+
+	@Override
+	public OpenemsAppCategory[] getCategories() {
+		return new OpenemsAppCategory[] { OpenemsAppCategory.API };
+	}
+
+	@Override
+	public OpenemsAppCardinality getCardinality() {
+		return OpenemsAppCardinality.SINGLE;
+	}
+
+	@Override
+	protected ThrowingTriFunction<ConfigurationTarget, Map<Property, JsonElement>, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() {
+		return (t, p, l) -> {
+			final var portName = this.getString(p, Property.PORT_NAME);
+			final var alias = this.getString(p, Property.ALIAS);
+			final var controllerId = this.getId(t, p, Property.CONTROLLER_ID);
+			final var apiTimeout = this.getInt(p, Property.API_TIMEOUT);
+			final var controllerIds = this.getJsonArray(p, Property.COMPONENT_IDS);
+			final var baudrate = this.getInt(p, Property.BAUDRATE);
+			final var databits = this.getInt(p, Property.DATABITS);
+			final var stopbits = this.getString(p, Property.STOPBITS);
+			final var parity = this.getString(p, Property.PARITY);
+
+			// remove self if selected
+			for (var i = 0; i < controllerIds.size(); i++) {
+				if (controllerIds.get(i).getAsString().equals(controllerId)) {
+					controllerIds.remove(i);
+					break;
+				}
+			}
+
+			final var components = Lists.newArrayList(//
+					new EdgeConfig.Component(controllerId, alias, "Controller.Api.ModbusRtu.ReadOnly",
+							JsonUtils.buildJsonObject() //
+									.addProperty("apiTimeout", apiTimeout) //
+									.add("component.ids", controllerIds) //
+									.addProperty("portName", portName) //
+									.addProperty("baudRate", baudrate) //
+									.addProperty("databits", databits) //
+									.addProperty("stopbits", stopbits) //
+									.addProperty("parity", parity) //
+									.build()) //
+			);
+
+			return AppConfiguration.create() //
+					.addTask(Tasks.component(components)) //
+					.addTask(Tasks.schedulerByCentralOrder(//
+							new SchedulerComponent(controllerId, "Controller.Api.ModbusRtu.ReadOnly", this.getAppId()))) //
+					.build();
+		};
+	}
+
+	@Override
+	protected ModbusRtuApiReadOnly getApp() {
+		return this;
+	}
+
+	@Override
+	protected Property[] propertyValues() {
+		return Property.values();
+	}
+
+	@Override
+	public OpenemsAppPermissions getAppPermissions() {
+		return OpenemsAppPermissions.create()//
+				.setCanDelete(Role.ADMIN)//
+				.setCanSee(Role.ADMIN)//
+				.build();
+	}
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadWrite.java b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadWrite.java
new file mode 100644
index 00000000000..12e4fa9f6b2
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusRtuApiReadWrite.java
@@ -0,0 +1,197 @@
+package io.openems.edge.app.api;
+
+import static io.openems.edge.app.common.props.CommonProps.alias;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+import com.google.common.collect.Lists;
+import com.google.gson.JsonElement;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.oem.OpenemsEdgeOem;
+import io.openems.common.session.Language;
+import io.openems.common.session.Role;
+import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.app.api.ModbusRtuApiReadWrite.Property;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.core.appmanager.AbstractOpenemsApp;
+import io.openems.edge.core.appmanager.AbstractOpenemsAppWithProps;
+import io.openems.edge.core.appmanager.AppConfiguration;
+import io.openems.edge.core.appmanager.AppDef;
+import io.openems.edge.core.appmanager.AppDescriptor;
+import io.openems.edge.core.appmanager.ComponentUtil;
+import io.openems.edge.core.appmanager.ConfigurationTarget;
+import io.openems.edge.core.appmanager.OpenemsApp;
+import io.openems.edge.core.appmanager.OpenemsAppCardinality;
+import io.openems.edge.core.appmanager.OpenemsAppCategory;
+import io.openems.edge.core.appmanager.OpenemsAppPermissions;
+import io.openems.edge.core.appmanager.Type;
+import io.openems.edge.core.appmanager.Type.Parameter.BundleParameter;
+import io.openems.edge.core.appmanager.dependency.Tasks;
+import io.openems.edge.core.appmanager.dependency.aggregatetask.SchedulerByCentralOrderConfiguration.SchedulerComponent;
+
+/**
+ * Describes a App for ReadWrite Modbus/Rtu Api.
+ *
+ * <pre>
+  {
+    "appId":"App.Api.ModbusRtu.ReadWrite",
+    "alias":"Modbus/Rtu-Api Read-Write",
+    "instanceId": UUID,
+    "image": base64,
+    "properties":{
+    	"CONTROLLER_ID": "ctrlApiModbusRtu0",
+    	"API_TIMEOUT": 60,
+    	"COMPONENT_IDS": ["_sum", ...]
+    },
+    "dependencies": [
+    	{
+        	"key": "READ_ONLY",
+        	"instanceId": UUID
+    	}
+    ],
+    "appDescriptor": {
+    	"websiteUrl": {@link AppDescriptor#getWebsiteUrl()}
+    }
+  }
+ * </pre>
+ */
+@Component(name = "App.Api.ModbusRtu.ReadWrite")
+public class ModbusRtuApiReadWrite extends AbstractOpenemsAppWithProps<ModbusRtuApiReadWrite, Property, BundleParameter>
+		implements OpenemsApp {
+
+	public static enum Property implements Type<Property, ModbusRtuApiReadWrite, BundleParameter> {
+		// Component-IDs
+		CONTROLLER_ID(AppDef.componentId("ctrlApiModbusRtu0")), //
+		// Properties
+		ALIAS(alias()), //
+		API_TIMEOUT(ModbusApiProps.apiTimeout() //
+				.setRequired(true)), //
+		COMPONENT_IDS(ModbusApiProps.componentIds(CONTROLLER_ID) //
+				.setRequired(true)), //
+		PORT_NAME(ModbusApiProps.portName() //
+				.setRequired(true)), //
+		BAUDRATE(ModbusApiProps.baudrate() //
+				.setRequired(true)), //
+		DATABITS(ModbusApiProps.databits() //
+				.setRequired(true)),
+		STOPBITS(ModbusApiProps.stopbits() //
+				.setRequired(true)), //
+		PARITY(ModbusApiProps.parity() //
+				.setRequired(true)); //
+
+		private final AppDef<? super ModbusRtuApiReadWrite, ? super Property, ? super BundleParameter> def;
+
+		private Property(AppDef<? super ModbusRtuApiReadWrite, ? super Property, ? super BundleParameter> def) {
+			this.def = def;
+		}
+
+		@Override
+		public Type<Property, ModbusRtuApiReadWrite, BundleParameter> self() {
+			return this;
+		}
+
+		@Override
+		public AppDef<? super ModbusRtuApiReadWrite, ? super Property, ? super BundleParameter> def() {
+			return this.def;
+		}
+
+		@Override
+		public Function<GetParameterValues<ModbusRtuApiReadWrite>, BundleParameter> getParamter() {
+			return Parameter.functionOf(AbstractOpenemsApp::getTranslationBundle);
+		}
+	}
+
+	@Activate
+	public ModbusRtuApiReadWrite(@Reference ComponentManager componentManager, ComponentContext context,
+			@Reference ConfigurationAdmin cm, @Reference ComponentUtil componentUtil) {
+		super(componentManager, context, cm, componentUtil);
+	}
+
+	@Override
+	public AppDescriptor getAppDescriptor(OpenemsEdgeOem oem) {
+		return AppDescriptor.create() //
+				.setWebsiteUrl(oem.getAppWebsiteUrl(this.getAppId())) //
+				.build();
+	}
+
+	@Override
+	public OpenemsAppCategory[] getCategories() {
+		return new OpenemsAppCategory[] { OpenemsAppCategory.API };
+	}
+
+	@Override
+	public OpenemsAppCardinality getCardinality() {
+		return OpenemsAppCardinality.SINGLE;
+	}
+
+	@Override
+	protected ThrowingTriFunction<ConfigurationTarget, Map<Property, JsonElement>, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() {
+		return (t, p, l) -> {
+			final var portName = this.getString(p, Property.PORT_NAME);
+			final var controllerId = this.getId(t, p, Property.CONTROLLER_ID);
+			final var apiTimeout = this.getInt(p, Property.API_TIMEOUT);
+			final var controllerIds = this.getJsonArray(p, Property.COMPONENT_IDS);
+			final var baudrate = this.getInt(p, Property.BAUDRATE);
+			final var databits = this.getInt(p, Property.DATABITS);
+			final var stopbits = this.getString(p, Property.STOPBITS);
+			final var parity = this.getString(p, Property.PARITY);
+
+			// remove self if selected
+			for (var i = 0; i < controllerIds.size(); i++) {
+				if (controllerIds.get(i).getAsString().equals(controllerId)) {
+					controllerIds.remove(i);
+					break;
+				}
+			}
+
+			final var components = Lists.newArrayList(//
+					new EdgeConfig.Component(controllerId, this.getName(l), "Controller.Api.ModbusRtu.ReadWrite",
+							JsonUtils.buildJsonObject() //
+									.addProperty("apiTimeout", apiTimeout) //
+									.add("component.ids", controllerIds) //
+									.addProperty("portName", portName) //
+									.addProperty("baudRate", baudrate) //
+									.addProperty("databits", databits) //
+									.addProperty("stopbits", stopbits) //
+									.addProperty("parity", parity) //
+									.build()) //
+			);
+
+			return AppConfiguration.create() //
+					.addTask(Tasks.component(components)) //
+					.addTask(Tasks.schedulerByCentralOrder(//
+							new SchedulerComponent(controllerId, "Controller.Api.ModbusRtu.ReadWrite",
+									this.getAppId()))) //
+					.build();
+		};
+	}
+
+	@Override
+	protected ModbusRtuApiReadWrite getApp() {
+		return this;
+	}
+
+	@Override
+	protected Property[] propertyValues() {
+		return Property.values();
+	}
+
+	@Override
+	public OpenemsAppPermissions getAppPermissions() {
+		return OpenemsAppPermissions.create()//
+				.setCanDelete(Role.ADMIN)//
+				.setCanSee(Role.ADMIN)//
+				.build();
+	}
+
+}
diff --git a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiProps.java b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiProps.java
deleted file mode 100644
index e4266469c4e..00000000000
--- a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiProps.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.openems.edge.app.api;
-
-import java.util.List;
-
-import io.openems.edge.app.common.props.ComponentProps;
-import io.openems.edge.common.modbusslave.ModbusSlave;
-import io.openems.edge.core.appmanager.AppDef;
-import io.openems.edge.core.appmanager.ComponentUtilSupplier;
-import io.openems.edge.core.appmanager.Nameable;
-import io.openems.edge.core.appmanager.OpenemsApp;
-import io.openems.edge.core.appmanager.TranslationUtil;
-import io.openems.edge.core.appmanager.Type.Parameter.BundleProvider;
-import io.openems.edge.core.appmanager.formly.Exp;
-import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
-import io.openems.edge.core.appmanager.formly.builder.ReorderArrayBuilder.SelectOptionExpressions;
-
-public final class ModbusTcpApiProps {
-
-	/**
-	 * Creates a {@link AppDef} to select {@link ModbusSlave} Components for a
-	 * ModbusTcpApi.
-	 * 
-	 * @param <APP> the type of the {@link OpenemsApp}
-	 * @return the {@link AppDef}
-	 */
-	public static <APP extends OpenemsApp & ComponentUtilSupplier> AppDef<APP, Nameable, BundleProvider> pickModbusIds() {
-		return AppDef.copyOfGeneric(ComponentProps.pickOrderedArrayIds(ModbusSlave.class, component -> {
-			if ("_meta".equals(component.id())) {
-				return false;
-			}
-			return true;
-		}, (app, property, l, parameter, component) -> {
-			if ("_sum".equals(component.id())) {
-				final var lockedExpression = Exp.currentModelValue(property).asArray() //
-						.elementAt(0).equal(Exp.staticValue(component.id()));
-				return new SelectOptionExpressions(lockedExpression);
-			}
-			return null;
-		}, List.of((app, property, language, parameter) -> {
-			return JsonFormlyUtil.buildText() //
-					.setText(TranslationUtil.getTranslation(parameter.bundle(),
-							"App.Api.ModbusTcp.changeComponentHint"));
-		})), def -> def //
-				.setTranslatedLabel("component.id.plural") //
-		);
-	}
-
-	private ModbusTcpApiProps() {
-	}
-
-}
diff --git a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadOnly.java b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadOnly.java
index 4298f4ebf23..99fbcba7748 100644
--- a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadOnly.java
+++ b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadOnly.java
@@ -19,7 +19,6 @@
 import io.openems.common.function.ThrowingTriFunction;
 import io.openems.common.oem.OpenemsEdgeOem;
 import io.openems.common.session.Language;
-import io.openems.common.session.Role;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.app.api.ModbusTcpApiReadOnly.Property;
@@ -29,7 +28,6 @@
 import io.openems.edge.core.appmanager.AppConfiguration;
 import io.openems.edge.core.appmanager.AppDef;
 import io.openems.edge.core.appmanager.AppDescriptor;
-import io.openems.edge.core.appmanager.ComponentManagerSupplier;
 import io.openems.edge.core.appmanager.ComponentUtil;
 import io.openems.edge.core.appmanager.ConfigurationTarget;
 import io.openems.edge.core.appmanager.Nameable;
@@ -74,14 +72,8 @@ public static enum Property implements Type<Property, ModbusTcpApiReadOnly, Bund
 							.getComponentIdsByFactory("Controller.Api.ModbusTcp.ReadWrite").size() == 0;
 					return new JsonPrimitive(active);
 				})), //
-		COMPONENT_IDS(AppDef.copyOfGeneric(ModbusTcpApiProps.pickModbusIds(), def -> def //
-				.setDefaultValue((app, property, l, parameter) -> {
-					return JsonUtils.buildJsonArray() //
-							.add("_sum") //
-							.build();
-				}) //
-				.bidirectional(CONTROLLER_ID, "component.ids", ComponentManagerSupplier::getComponentManager) //
-				.appendIsAllowedToSee(AppDef.ofLeastRole(Role.ADMIN)))), //
+		COMPONENT_IDS(ModbusApiProps.componentIds(CONTROLLER_ID) //
+				.setRequired(true)) //
 		;
 
 		private AppDef<? super ModbusTcpApiReadOnly, ? super Property, ? super BundleParameter> def;
diff --git a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadWrite.java b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadWrite.java
index 4aca80fbfd8..3e5fbe09221 100644
--- a/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadWrite.java
+++ b/io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadWrite.java
@@ -1,7 +1,6 @@
 package io.openems.edge.app.api;
 
-import static io.openems.edge.app.common.props.CommonProps.defaultDef;
-import static io.openems.edge.core.appmanager.formly.enums.InputType.NUMBER;
+import static io.openems.edge.app.common.props.CommonProps.alias;
 
 import java.util.Map;
 import java.util.function.Function;
@@ -18,7 +17,6 @@
 import io.openems.common.function.ThrowingTriFunction;
 import io.openems.common.oem.OpenemsEdgeOem;
 import io.openems.common.session.Language;
-import io.openems.common.session.Role;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.app.api.ModbusTcpApiReadWrite.Property;
@@ -28,7 +26,6 @@
 import io.openems.edge.core.appmanager.AppConfiguration;
 import io.openems.edge.core.appmanager.AppDef;
 import io.openems.edge.core.appmanager.AppDescriptor;
-import io.openems.edge.core.appmanager.ComponentManagerSupplier;
 import io.openems.edge.core.appmanager.ComponentUtil;
 import io.openems.edge.core.appmanager.ConfigurationTarget;
 import io.openems.edge.core.appmanager.OpenemsApp;
@@ -39,7 +36,6 @@
 import io.openems.edge.core.appmanager.dependency.DependencyDeclaration;
 import io.openems.edge.core.appmanager.dependency.Tasks;
 import io.openems.edge.core.appmanager.dependency.aggregatetask.SchedulerByCentralOrderConfiguration.SchedulerComponent;
-import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
 
 /**
  * Describes a App for ReadWrite Modbus/TCP Api.
@@ -75,30 +71,11 @@ public static enum Property implements Type<Property, ModbusTcpApiReadWrite, Bun
 		// Component-IDs
 		CONTROLLER_ID(AppDef.componentId("ctrlApiModbusTcp0")), //
 		// Properties
-		API_TIMEOUT(AppDef.copyOfGeneric(defaultDef(), def -> def //
-				.setTranslatedLabel("App.Api.apiTimeout.label") //
-				.setTranslatedDescription("App.Api.apiTimeout.description") //
-				.setDefaultValue(60) //
-				.setRequired(true) //
-				.setField(JsonFormlyUtil::buildInput, (app, property, l, parameter, field) -> {
-					field.setInputType(NUMBER) //
-							.setMin(0);
-				}) //
-		)), //
-		COMPONENT_IDS(AppDef.copyOfGeneric(ModbusTcpApiProps.pickModbusIds(), def -> def //
-				.setDefaultValue((app, property, l, parameter) -> {
-					final var jsonArrayBuilder = JsonUtils.buildJsonArray() //
-							.add("_sum");
-
-					// add ess ids
-					app.getComponentUtil().getEnabledComponentsOfStartingId("ess").stream() //
-							.sorted((o1, o2) -> o1.id().compareTo(o2.id())) //
-							.forEach(ess -> jsonArrayBuilder.add(ess.id()));
-
-					return jsonArrayBuilder.build();
-				}) //
-				.bidirectional(CONTROLLER_ID, "component.ids", ComponentManagerSupplier::getComponentManager) //
-				.appendIsAllowedToSee(AppDef.ofLeastRole(Role.ADMIN)))), //
+		ALIAS(alias()), //
+		API_TIMEOUT(ModbusApiProps.apiTimeout() //
+				.setRequired(true)), //
+		COMPONENT_IDS(ModbusApiProps.componentIds(CONTROLLER_ID) //
+				.setRequired(true)) //
 		;
 
 		private final AppDef<? super ModbusTcpApiReadWrite, ? super Property, ? super BundleParameter> def;
diff --git a/io.openems.edge.core/src/io/openems/edge/app/core/AppMeta.java b/io.openems.edge.core/src/io/openems/edge/app/core/AppMeta.java
new file mode 100644
index 00000000000..0031aef77b8
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/app/core/AppMeta.java
@@ -0,0 +1,178 @@
+package io.openems.edge.app.core;
+
+import static io.openems.edge.app.common.props.CommonProps.alias;
+import static io.openems.edge.app.common.props.CommonProps.defaultDef;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+import com.google.gson.JsonElement;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.oem.OpenemsEdgeOem;
+import io.openems.common.session.Language;
+import io.openems.common.session.Role;
+import io.openems.common.types.CurrencyConfig;
+import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.app.core.AppMeta.Property;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.core.appmanager.AbstractOpenemsApp;
+import io.openems.edge.core.appmanager.AbstractOpenemsAppWithProps;
+import io.openems.edge.core.appmanager.AppConfiguration;
+import io.openems.edge.core.appmanager.AppDef;
+import io.openems.edge.core.appmanager.AppDescriptor;
+import io.openems.edge.core.appmanager.ComponentManagerSupplier;
+import io.openems.edge.core.appmanager.ComponentUtil;
+import io.openems.edge.core.appmanager.ConfigurationTarget;
+import io.openems.edge.core.appmanager.OpenemsApp;
+import io.openems.edge.core.appmanager.OpenemsAppCardinality;
+import io.openems.edge.core.appmanager.OpenemsAppCategory;
+import io.openems.edge.core.appmanager.OpenemsAppPermissions;
+import io.openems.edge.core.appmanager.OpenemsAppStatus;
+import io.openems.edge.core.appmanager.TranslationUtil;
+import io.openems.edge.core.appmanager.Type;
+import io.openems.edge.core.appmanager.Type.Parameter;
+import io.openems.edge.core.appmanager.Type.Parameter.BundleParameter;
+import io.openems.edge.core.appmanager.dependency.Tasks;
+import io.openems.edge.core.appmanager.flag.Flag;
+import io.openems.edge.core.appmanager.flag.Flags;
+import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
+import io.openems.edge.core.appmanager.formly.enums.DisplayType;
+
+@Component(name = "App.Core.Meta")
+public class AppMeta extends AbstractOpenemsAppWithProps<AppMeta, Property, Parameter.BundleParameter>
+		implements OpenemsApp {
+
+	public enum Property implements Type<Property, AppMeta, Parameter.BundleParameter> {
+		ALIAS(AppDef.copyOfGeneric(alias())), //
+
+		CURRENCY(AppDef.copyOfGeneric(defaultDef(), def -> def//
+				.setTranslatedLabelWithAppPrefix(".currency.label")
+				.setField(JsonFormlyUtil::buildSelectFromNameable, (app, property, l, parameter, field) -> {
+					field.setOptions(Stream.of(CurrencyConfig.values()).map(Enum::name).toList());
+				}) //
+				.bidirectional("_meta", "currency", ComponentManagerSupplier::getComponentManager))), //
+		IS_ESS_CHARGE_FROM_GRID_ALLOWED(AppDef.copyOfGeneric(defaultDef(), def -> def//
+				.setTranslatedLabelWithAppPrefix(".gridCharge.label") //
+				.setField(JsonFormlyUtil::buildFieldGroupFromNameable, (app, property, l, parameter, field) -> {
+					var bundle = parameter.bundle();
+					field.setPopupInput(property, DisplayType.BOOLEAN);
+					field.setFieldGroup(JsonUtils.buildJsonArray() //
+							.add(JsonFormlyUtil.buildText() //
+									.setText(TranslationUtil.getTranslation(bundle, "App.Core.Meta.gridCharge.description"))
+									.build())
+							.add(JsonFormlyUtil.buildCheckboxFromNameable(property) //
+									.setLabel(TranslationUtil.getTranslation(bundle, "App.Core.Meta.gridCharge.label")) //
+									.build())
+							.build());
+				}) //
+				.bidirectional("_meta", "isEssChargeFromGridAllowed", ComponentManagerSupplier::getComponentManager))), //
+		;
+
+		private AppDef<? super AppMeta, ? super Property, ? super BundleParameter> def;
+
+		private Property(AppDef<? super AppMeta, ? super Property, ? super BundleParameter> def) {
+			this.def = def;
+		}
+
+		@Override
+		public Type<Property, AppMeta, BundleParameter> self() {
+			return this;
+		}
+
+		@Override
+		public AppDef<? super AppMeta, ? super Property, ? super BundleParameter> def() {
+			return this.def;
+		}
+
+		@Override
+		public Function<GetParameterValues<AppMeta>, BundleParameter> getParamter() {
+			return Parameter.functionOf(AbstractOpenemsApp::getTranslationBundle);
+		}
+	}
+
+	@Activate
+	public AppMeta(//
+			@Reference final ComponentManager componentManager, //
+			final ComponentContext componentContext, //
+			@Reference final ConfigurationAdmin cm, //
+			@Reference final ComponentUtil componentUtil //
+	) {
+		super(componentManager, componentContext, cm, componentUtil);
+	}
+
+	@Override
+	protected ThrowingTriFunction<ConfigurationTarget, Map<Property, JsonElement>, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() {
+		return (t, p, l) -> {
+
+			final var currency = this.getEnum(p, CurrencyConfig.class, Property.CURRENCY);
+			final var isEssChargeFromGridAllowed = this.getBoolean(p, Property.IS_ESS_CHARGE_FROM_GRID_ALLOWED);
+
+			final var components = new ArrayList<EdgeConfig.Component>();
+
+			components.add(new EdgeConfig.Component("_meta", "", "Core.Meta", //
+					JsonUtils.buildJsonObject() //
+							.addProperty("currency", currency) //
+							.addProperty("isEssChargeFromGridAllowed", isEssChargeFromGridAllowed) //
+							.build()));
+
+			return AppConfiguration.create() //
+					.addTask(Tasks.component(components)) //
+					.build();
+		};
+	}
+
+	@Override
+	public AppDescriptor getAppDescriptor(OpenemsEdgeOem oem) {
+		return AppDescriptor.create() //
+				.build();
+	}
+
+	@Override
+	public OpenemsAppCardinality getCardinality() {
+		return OpenemsAppCardinality.SINGLE;
+	}
+
+	@Override
+	public OpenemsAppCategory[] getCategories() {
+		return new OpenemsAppCategory[] { OpenemsAppCategory.CORE };
+	}
+
+	@Override
+	protected AppMeta getApp() {
+		return this;
+	}
+
+	@Override
+	protected Property[] propertyValues() {
+		return Property.values();
+	}
+
+	@Override
+	public OpenemsAppPermissions getAppPermissions() {
+		return OpenemsAppPermissions.create() //
+				.setCanDelete(Role.ADMIN) // TODO theoretically not even admin
+				.build();
+	}
+
+	@Override
+	public Flag[] flags() {
+		final var flags = new ArrayList<>();
+		if (this.getStatus() == OpenemsAppStatus.BETA) {
+			flags.add(Flags.SHOW_AFTER_KEY_REDEEM);
+		}
+		flags.add(Flags.ALWAYS_INSTALLED);
+		return flags.toArray(Flag[]::new);
+	}
+
+}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java
index aa5d3f2fe2f..6393780a8f1 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java
@@ -11,11 +11,13 @@
 import java.util.TreeMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentConstants;
 import org.osgi.service.component.ComponentContext;
 
+import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -129,6 +131,60 @@ public AppConfiguration getAppConfiguration(ConfigurationTarget target, JsonObje
 		return configuration;
 	}
 
+	@Override
+	public String mapPropName(String prop, String componentId, OpenemsAppInstance instance) {
+		var enumMap = this.convertToMap(new ArrayList<>(), instance.properties);
+		var mappedPropName = this.mapPropNameWithMap(enumMap, prop, componentId);
+		return this.getPropertyByName(mappedPropName) == null ? null : mappedPropName;
+	}
+
+	/**
+	 * Convert JsonObject with Properties to Map.
+	 *
+	 * @param componentId id of the component
+	 * @param prop        the propertyname
+	 * @param map         map of the instance
+	 * @return a typed {@link Map} of Properties
+	 */
+	private String mapPropNameWithMap(Map<PROPERTY, JsonElement> map, String prop, String componentId) {
+		return this.transformCase(prop);
+	}
+
+	private String transformCase(String prop) {
+		var parsedPropName = prop;
+		if (prop.contains(".")) {
+			parsedPropName = pointedCaseToUpperUnderscore(prop);
+		} else {
+			parsedPropName = lowerCamelToUpperUnderscore(prop);
+		}
+		return parsedPropName;
+	}
+
+	private static String pointedCaseToUpperUnderscore(String str) {
+		return str.replace('.', '_').toUpperCase();
+	}
+
+	private static boolean isLowerCamelCase(String str) {
+		if (str == null || str.length() == 0) {
+			return false;
+		}
+		boolean isFirstCharUpperCaseLetter = Character.isUpperCase(str.charAt(0)) || !Character.isLetter(str.charAt(0));
+		if (!isFirstCharUpperCaseLetter && str.length() > 1) {
+			return IntStream.range(1, str.length() - 1)
+					.noneMatch(i -> !Character.isLetter(str.charAt(i))
+							|| Character.isUpperCase(str.charAt(i)) && Character.isUpperCase(str.charAt(i + 1)))
+					&& Character.isLetter(str.charAt(str.length() - 1));
+		}
+		return !isFirstCharUpperCaseLetter;
+	}
+
+	private static String lowerCamelToUpperUnderscore(String str) {
+		if (isLowerCamelCase(str)) {
+			return CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, str);
+		}
+		return str;
+	}
+
 	@Override
 	public String getAppId() {
 		return this.componentContext.getProperties().get(ComponentConstants.COMPONENT_NAME).toString();
@@ -371,6 +427,11 @@ protected static final Component getComponentWithFactoryId(List<Component> compo
 		return components.stream().filter(t -> t.getFactoryId().equals(factoryId)).findFirst().orElse(null);
 	}
 
+	@Override
+	public boolean assertCanEdit(String prop, User user) {
+		return true;
+	}
+
 	@Override
 	public ComponentManager getComponentManager() {
 		return this.componentManager;
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsAppWithProps.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsAppWithProps.java
index fa7043d8378..d75661808c9 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsAppWithProps.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsAppWithProps.java
@@ -6,6 +6,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
@@ -128,6 +129,16 @@ protected <E extends Enum<E>> E getEnum(//
 		return this.getEnum(map, enumType, property, PROPERTY::def);
 	}
 
+	@Override
+	public final String mapPropName(String prop, String componentId, OpenemsAppInstance instance) {
+		return Stream.of(this.propertyValues()).map(p -> p.def().getBidirectionalPropertyName()).filter(t -> {
+			if (t == null) {
+				return false;
+			}
+			return t.equals(prop);
+		}).findFirst().orElseGet(() -> super.mapPropName(prop, componentId, instance));
+	}
+
 	protected boolean getBoolean(//
 			final Map<PROPERTY, JsonElement> map, //
 			final PROPERTY property, //
@@ -269,6 +280,15 @@ public final T get() {
 
 	}
 
+	@Override
+	public final boolean assertCanEdit(String propName, User user) {
+		final var prop = Stream.of(this.propertyValues())//
+				.filter(property -> property.name().equals(propName))//
+				.findFirst().orElseThrow(() -> new RuntimeException("Property " + propName + " does not exist"));
+		return prop.def().getIsAllowedToEdit().test(this.getApp(), prop, user.getLanguage(),
+				this.singletonParameter(user.getLanguage()).get(), user);
+	}
+
 	protected abstract APP getApp();
 
 	@Override
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppDef.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppDef.java
index 777c07abda9..5064d50abbe 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppDef.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppDef.java
@@ -169,6 +169,8 @@ public static interface FieldValuesConsumer<A, P, M, T> {
 	 */
 	private FieldValuesSupplier<? super APP, ? super PROPERTY, ? super PARAMETER, String> description;
 
+	private String propertyName;
+
 	/**
 	 * Function to get the default value of the field (can be any JsonElement =>
 	 * JsonArray, JsonPrimitiv(Number, String, Boolean, Character).
@@ -360,6 +362,7 @@ PARAMETERO> AppDef<APP, PROPERTY, PARAMETER> copyOfGeneric(//
 		def.bidirectionalValue = otherDef.bidirectionalValue;
 		def.isAllowedToSee = otherDef.isAllowedToSee;
 		def.isAllowedToEdit = otherDef.isAllowedToEdit;
+		def.propertyName = otherDef.propertyName;
 		return def;
 	}
 
@@ -380,6 +383,10 @@ public AppDef<APP, PROPERTY, PARAMETER> setAllowedToSave(//
 		return this;
 	}
 
+	public AppDef<APP, PROPERTY, PARAMETER> setMinRole(final Role role) {
+		return this.appendIsAllowedToEdit(ofLeastRole(role));
+	}
+
 	public final AppDef<APP, PROPERTY, PARAMETER> setTranslationBundleSupplier(//
 			final Function<PARAMETER, ResourceBundle> bundleSupplier //
 	) {
@@ -999,11 +1006,92 @@ public AppDef<APP, PROPERTY, PARAMETER> bidirectional(//
 			final Function<? super APP, ComponentManager> componentManagerFunction, //
 			final Function<? super JsonElement, JsonElement> mapper //
 	) {
+		return this.bidirectional(t -> {
+			final var a = t.get(propOfComponentId.name());
+			return a == null ? null : a.getAsString();
+		}, property, componentManagerFunction, mapper);
+	}
+
+	/**
+	 * Binds a property bidirectional.
+	 * 
+	 * <p>
+	 * The property itself will not be stored in the app configuration only in the
+	 * component. If the user doesn't provide the value of a property and there is a
+	 * bidirectional binding for it it will be filled up with the value of the
+	 * bidirectional binding. If there is no component id in the configuration or
+	 * the component doesn't exist or the property of the value is null then null is
+	 * returned inside the bidirectional function.
+	 * 
+	 * @param componentId              the componentId
+	 * @param property                 the property
+	 * @param componentManagerFunction the componentmanagerFunction
+	 * @return this
+	 */
+	public AppDef<APP, PROPERTY, PARAMETER> bidirectional(//
+			final String componentId, //
+			final String property, //
+			final Function<? super APP, ComponentManager> componentManagerFunction //
+	) {
+		return this.bidirectional(componentId, property, componentManagerFunction, Function.identity());
+	}
+
+	/**
+	 * Binds a property bidirectional.
+	 * 
+	 * <p>
+	 * The property itself will not be stored in the app configuration only in the
+	 * component. If the user doesn't provide the value of a property and there is a
+	 * bidirectional binding for it it will be filled up with the value of the
+	 * bidirectional binding. If there is no component id in the configuration or
+	 * the component doesn't exist or the property of the value is null then null is
+	 * returned inside the bidirectional function.
+	 * 
+	 * @param componentId              the componentId
+	 * @param property                 the property
+	 * @param componentManagerFunction the componentmanagerFunction
+	 * @param mapper                   mapper
+	 * @return this
+	 */
+	public AppDef<APP, PROPERTY, PARAMETER> bidirectional(//
+			final String componentId, //
+			final String property, //
+			final Function<? super APP, ComponentManager> componentManagerFunction, //
+			final Function<? super JsonElement, JsonElement> mapper //
+	) {
+		return this.bidirectional(t -> componentId, property, componentManagerFunction, mapper);
+	}
+
+	/**
+	 * Binds a property bidirectional.
+	 * 
+	 * <p>
+	 * The property itself will not be stored in the app configuration only in the
+	 * component. If the user doesn't provide the value of a property and there is a
+	 * bidirectional binding for it it will be filled up with the value of the
+	 * bidirectional binding. If there is no component id in the configuration or
+	 * the component doesn't exist or the property of the value is null then null is
+	 * returned inside the bidirectional function.
+	 * 
+	 * @param componentIdSupplier      the componentId supplier
+	 * @param property                 the property
+	 * @param componentManagerFunction the componentmanagerFunction
+	 * @param mapper                   mapper
+	 * 
+	 * @return this
+	 */
+	public AppDef<APP, PROPERTY, PARAMETER> bidirectional(//
+			final Function<JsonObject, String> componentIdSupplier, //
+			final String property, //
+			final Function<? super APP, ComponentManager> componentManagerFunction, //
+			final Function<? super JsonElement, JsonElement> mapper //
+	) {
+		this.propertyName = property;
 		this.bidirectionalValue = (app, prop, l, param, properties) -> {
 			if (properties == null) {
 				return null;
 			}
-			final var componentId = properties.get(propOfComponentId.name());
+			final var componentId = componentIdSupplier.apply(properties);
 			if (componentId == null) {
 				return null;
 			}
@@ -1016,12 +1104,19 @@ public AppDef<APP, PROPERTY, PARAMETER> bidirectional(//
 				return JsonNull.INSTANCE;
 			});
 
+			final var p = componentManager.getComponentProperties(componentId);
 			try {
-				final var component = componentManager.getComponent(componentId.getAsString());
-				return Optional.ofNullable(component.getComponentContext().getProperties().get(property)) //
+				final var component = componentManager.getComponent(componentId);
+
+				return Optional.ofNullable(p.get(property)) //
 						.map(JsonUtils::getAsJsonElement) //
 						.map(mapper) //
-						.orElseGet(defaultValueSupplier);
+						.orElseGet(() -> {
+							return Optional.ofNullable(component.getComponentContext().getProperties().get(property)) //
+									.map(JsonUtils::getAsJsonElement) //
+									.map(mapper) //
+									.orElseGet(defaultValueSupplier);
+						});
 			} catch (OpenemsNamedException e) {
 				return defaultValueSupplier.get();
 			}
@@ -1031,6 +1126,10 @@ public AppDef<APP, PROPERTY, PARAMETER> bidirectional(//
 		return this.self();
 	}
 
+	public String getBidirectionalPropertyName() {
+		return this.propertyName;
+	}
+
 	/**
 	 * Creates a simple mapper if the input {@link JsonElement} is a number it gets
 	 * multiplied with the given multiplicator.
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java
index 25908265a55..0cb83d8f684 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java
@@ -9,10 +9,12 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -20,6 +22,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
@@ -61,6 +64,8 @@
 import io.openems.edge.core.appmanager.dependency.AppManagerAppHelper;
 import io.openems.edge.core.appmanager.dependency.Dependency;
 import io.openems.edge.core.appmanager.dependency.UpdateValues;
+import io.openems.edge.core.appmanager.flag.Flag;
+import io.openems.edge.core.appmanager.flag.Flags;
 import io.openems.edge.core.appmanager.jsonrpc.AddAppInstance;
 import io.openems.edge.core.appmanager.jsonrpc.DeleteAppInstance;
 import io.openems.edge.core.appmanager.jsonrpc.GetApp;
@@ -68,6 +73,8 @@
 import io.openems.edge.core.appmanager.jsonrpc.GetAppDescriptor;
 import io.openems.edge.core.appmanager.jsonrpc.GetAppInstances;
 import io.openems.edge.core.appmanager.jsonrpc.GetApps;
+import io.openems.edge.core.appmanager.jsonrpc.UpdateAppConfig;
+import io.openems.edge.core.appmanager.jsonrpc.GetEstimatedConfiguration;
 import io.openems.edge.core.appmanager.jsonrpc.UpdateAppInstance;
 import io.openems.edge.core.appmanager.validator.Validator;
 
@@ -90,8 +97,36 @@ public class AppManagerImpl extends AbstractOpenemsComponent implements AppManag
 	@Reference
 	private ConfigurationAdmin cm;
 
-	@Reference(policy = ReferencePolicy.DYNAMIC)
-	protected volatile List<OpenemsApp> availableApps;
+	protected volatile List<OpenemsApp> availableApps = new CopyOnWriteArrayList<>();
+
+	/**
+	 * Binds newly available OpenemsApp.
+	 * 
+	 * @param app the app
+	 */
+	@Reference(policy = ReferencePolicy.DYNAMIC, //
+			bind = "bindApp", unbind = "unbindApp", //
+			cardinality = ReferenceCardinality.MULTIPLE, //
+			policyOption = ReferencePolicyOption.GREEDY)
+	public void bindApp(OpenemsApp app) {
+		this.availableApps.add(app);
+		var alwaysInstalled = app.hasFlag(Flags.ALWAYS_INSTALLED);
+		if (alwaysInstalled) {
+			this.instantiatedApps
+					.add(new OpenemsAppInstance(app.getAppId(), "", UUID.randomUUID(), new JsonObject(), emptyList()));
+		}
+	}
+
+	/**
+	 * Unbinds no longer available apps.
+	 * 
+	 * @param app the app
+	 */
+	public void unbindApp(OpenemsApp app) {
+		this.availableApps.remove(app);
+		var installedInstances = this.instantiatedApps.stream().filter(t -> t.appId == app.getAppId()).toList();
+		this.instantiatedApps.removeAll(installedInstances);
+	}
 
 	@Reference
 	private ComponentServiceObjects<AppManagerAppHelper> csoAppManagerAppHelper;
@@ -199,19 +234,24 @@ public final List<OpenemsAppInstance> getInstantiatedApps() {
 	 * @param apps that should be formatted
 	 * @return formatted apps string
 	 */
-	private static String getJsonAppsString(List<OpenemsAppInstance> apps) {
-		return JsonUtils
-				.prettyToString(apps.stream().map(OpenemsAppInstance::toJsonObject).collect(JsonUtils.toJsonArray()));
+	private String getJsonAppsString(List<OpenemsAppInstance> apps) {
+		return JsonUtils.prettyToString(apps.stream() //
+				.filter(t -> !this.appIdIsAlwaysInstalled(t.appId)) //
+				.map(OpenemsAppInstance::toJsonObject) //
+				.collect(JsonUtils.toJsonArray()));
 	}
 
 	/**
 	 * Parses the configured apps to a List of {@link OpenemsAppInstance}s.
 	 *
-	 * @param apps the app configuration from Config.json as {@link JsonArray}
+	 * @param apps                the app configuration from Config.json as
+	 *                            {@link JsonArray}
+	 * @param alwaysInstalledApps list of all apps that are always installed
 	 * @return List of {@link OpenemsAppInstance}s
 	 * @throws OpenemsNamedException on parse error
 	 */
-	private static List<OpenemsAppInstance> parseInstantiatedApps(JsonArray apps) throws OpenemsNamedException {
+	private static List<OpenemsAppInstance> parseInstantiatedApps(JsonArray apps, List<String> alwaysInstalledApps)
+			throws OpenemsNamedException {
 		var errors = new ArrayList<String>();
 		var result = new ArrayList<OpenemsAppInstance>(apps.size());
 		for (var appElement : apps) {
@@ -237,6 +277,9 @@ private static List<OpenemsAppInstance> parseInstantiatedApps(JsonArray apps) th
 			}
 			result.add(new OpenemsAppInstance(appId, alias, instanceId, properties, dependecies));
 		}
+		var aip = alwaysInstalledApps.stream()
+				.map(t -> new OpenemsAppInstance(t, "", UUID.randomUUID(), new JsonObject(), emptyList())).toList();
+		result.addAll(aip);
 		if (!errors.isEmpty()) {
 			throw new OpenemsException(errors.stream().collect(Collectors.joining("|")));
 		}
@@ -253,8 +296,14 @@ private void applyConfig(Config config) {
 			if (apps == null || apps.isBlank()) {
 				apps = "[]"; // default to empty array
 			}
-			var instApps = parseInstantiatedApps(JsonUtils.parseToJsonArray(apps));
 
+			var alwaysInstalledApps = this.instantiatedApps.stream().filter(t -> {
+				return this.findAppById(t.appId)//
+						.map(a -> a.hasFlag(Flags.ALWAYS_INSTALLED))//
+						.orElse(false);
+			}).map(t -> t.appId).toList();
+
+			var instApps = parseInstantiatedApps(JsonUtils.parseToJsonArray(apps), alwaysInstalledApps);
 			// always replace old apps with the new ones
 			var currentApps = new ArrayList<>(this.instantiatedApps);
 
@@ -829,6 +878,113 @@ public void buildJsonApiRoutes(JsonApiBuilder builder) {
 						emptyList()));
 			});
 		}, call -> this.handleAddAppInstanceRequest(call.get(EdgeKeys.USER_KEY), call.getRequest()));
+
+		builder.handleRequest(new GetEstimatedConfiguration(), endpoint -> {
+
+			endpoint.applyRequestBuilder(request -> {
+				request.addExample("Home 30",
+						new GetEstimatedConfiguration.Request("App.FENECON.Home.30", "FENECON Home 30",
+								JsonUtils.buildJsonObject() //
+										.addProperty("SAFETY_COUNTRY", "GERMANY") //
+										.addProperty("FEED_IN_TYPE", "EXTERNAL_LIMITATION") //
+										.addProperty("FEED_IN_SETTING", "QU_ENABLE_CURVE") //
+										.addProperty("HAS_MPPT_1", "true") //
+										.addProperty("ALIAS_MPPT_1", "String A and String B") //
+										.build()));
+			});
+
+		}, call -> {
+			final var request = call.getRequest();
+			final var user = call.get(EdgeKeys.USER_KEY);
+
+			final var app = this.findAppByIdOrError(request.appId());
+
+			final var configs = this.useAppManagerAppHelper(t -> {
+				return t.getInstallConfiguration(user, new OpenemsAppInstance(request.appId(), request.alias(),
+						UUID.randomUUID(), request.properties(), null), app);
+			});
+
+			return new GetEstimatedConfiguration.Response(configs);
+		});
+
+		builder.handleRequest(new UpdateAppConfig(), endpoint -> {
+			endpoint.setDescription("""
+					Updates a AppInstance.
+					""".stripIndent());
+
+			endpoint.setGuards(EdgeGuards.roleIsAtleast(Role.OWNER));
+
+		}, call -> this.handleUpdateAppConfigRequest(call.get(EdgeKeys.USER_KEY), call.getRequest()));
+	}
+
+	/**
+	 * Find unique instanceId for given componentId}.
+	 *
+	 * @param componentId Id of the component the app configures
+	 * @return the instanceId of the appInstance
+	 * @throws OpenemsNamedException on error
+	 */
+	private OpenemsAppInstance findInstanceByComponentId(String componentId) throws OpenemsNamedException {
+		for (var appConfig : this.appConfigs()) {
+			var containsComponent = appConfig.getValue().getComponents().stream()
+					.anyMatch(t -> t.getId().equals(componentId));
+			if (containsComponent) {
+				return appConfig.getKey();
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Handles {@link UpdateAppConfigRequest}.
+	 *
+	 * @param user    the User
+	 * @param request the {@link UpdateAppConfigRequest} Request
+	 * @return the Future JSON-RPC Response
+	 * @throws OpenemsNamedException on error
+	 */
+	public UpdateAppConfig.Response handleUpdateAppConfigRequest(User user, UpdateAppConfig.Request request)
+			throws OpenemsNamedException {
+
+		final var appInstance = this.findInstanceByComponentId(request.componentId());
+
+		// update Component the old fashioned way if no app exists for the component
+		if (appInstance == null) {
+			return this.updateComponentDirectly(user, request);
+		}
+		final var app = this.findAppByIdOrError(appInstance.appId);
+
+		final var requestProperties = request.properties().entrySet().stream() //
+				.map(entry -> Map.entry(app.mapPropName(entry.getKey(), request.componentId(), appInstance),
+						entry.getValue()))
+				.filter(entry -> entry.getKey() != null)
+				.collect(JsonUtils.toJsonObject(Entry::getKey, Entry::getValue));
+
+		for (var entry : appInstance.properties.entrySet()) {
+			if (requestProperties.has(entry.getKey())) {
+				continue;
+			}
+			requestProperties.add(entry.getKey(), entry.getValue());
+		}
+
+		// build UpdateAppInstance Request and pass the request to the
+		// handleUpdateAppInstanceRequest Method
+		var req = new UpdateAppInstance.Request(appInstance.instanceId, appInstance.alias, requestProperties);
+		this.handleUpdateAppInstanceRequest(user, req);
+		return new UpdateAppConfig.Response();
+	}
+
+	private UpdateAppConfig.Response updateComponentDirectly(User user, UpdateAppConfig.Request from)
+			throws OpenemsNamedException {
+		final var properties = from.properties();
+		final var componentUpdateProps = new ArrayList<UpdateComponentConfigRequest.Property>();
+		for (var key : properties.keySet()) {
+			componentUpdateProps.add(new UpdateComponentConfigRequest.Property(key, properties.get(key)));
+		}
+		final var updateRequest = new UpdateComponentConfigRequest(from.componentId(), componentUpdateProps);
+		this.componentManager.handleUpdateComponentConfigRequest(user, updateRequest);
+		return new UpdateAppConfig.Response();
 	}
 
 	/**
@@ -844,10 +1000,34 @@ public UpdateAppInstance.Response handleUpdateAppInstanceRequest(User user, Upda
 		return this.lockModifyingApps(() -> {
 			final var oldApp = this.findInstanceByIdOrError(request.instanceId());
 			final var app = this.findAppByIdOrError(oldApp.appId);
-			app.getAppConfiguration(ConfigurationTarget.UPDATE, request.properties(), user.getLanguage());
 
-			final var updatedInstance = new OpenemsAppInstance(oldApp.appId, request.alias(), oldApp.instanceId,
-					request.properties(), oldApp.dependencies);
+			final var props = request.properties();
+			final JsonObject restOfProps;
+
+			if (app instanceof AbstractOpenemsAppWithProps) {
+				restOfProps = AbstractOpenemsApp.fillUpProperties(app, oldApp.properties);
+			} else {
+				restOfProps = oldApp.properties;
+			}
+			final var notAllowedProperties = props.keySet().stream()//
+					.filter(key -> {
+						if (restOfProps.has(key)) {
+
+							return (!props.get(key).getAsString().equals(restOfProps.get(key).getAsString()));
+						}
+						return false;
+					}).filter(key -> {
+						final var canEdit = app.assertCanEdit(key, user);
+						return !canEdit;
+					}).collect(Collectors.joining(", "));
+			if (notAllowedProperties.length() > 0) {
+				throw new OpenemsException("User is not allowed to edit " + notAllowedProperties + "!");
+			}
+
+			app.getAppConfiguration(ConfigurationTarget.UPDATE, props, user.getLanguage());
+
+			final var updatedInstance = new OpenemsAppInstance(oldApp.appId, request.alias(), oldApp.instanceId, props,
+					oldApp.dependencies);
 
 			var result = this.lastUpdate = this.useAppManagerAppHelper(appHelper -> {
 				return appHelper.updateApp(user, oldApp, updatedInstance, app);
@@ -858,7 +1038,7 @@ public UpdateAppInstance.Response handleUpdateAppInstanceRequest(User user, Upda
 			this.instantiatedApps.removeAll(result.modifiedOrCreatedApps);
 			this.instantiatedApps.addAll(result.modifiedOrCreatedApps);
 
-			return new Pair<>(true, new UpdateAppInstance.Response(
+			return new Pair<>(!this.appIdIsAlwaysInstalled(app.getAppId()), new UpdateAppInstance.Response(
 					this.createInstanceWithFilledProperties(app, result.rootInstance), result.warnings));
 		}, (shouldUpdate) -> {
 			if (shouldUpdate == null || !shouldUpdate) {
@@ -873,6 +1053,18 @@ public UpdateAppInstance.Response handleUpdateAppInstanceRequest(User user, Upda
 		});
 	}
 
+	/**
+	 * Checks from AppId if the app has the Flag alwaysInstalled.
+	 * 
+	 * @param appId appId of the app
+	 * @return if the app is always installed
+	 */
+	public boolean appIdIsAlwaysInstalled(String appId) {
+		return this.findAppById(appId)//
+				.map(t -> t.hasFlag(Flags.ALWAYS_INSTALLED))//
+				.orElse(false);
+	}
+
 	/**
 	 * updated the AppManager configuration with the given app instances.
 	 *
@@ -883,7 +1075,7 @@ public UpdateAppInstance.Response handleUpdateAppInstanceRequest(User user, Upda
 	private void updateAppManagerConfiguration(User user, List<OpenemsAppInstance> apps) throws OpenemsNamedException {
 		this.waitingForModified = true;
 		AppManagerImpl.sortApps(apps);
-		var p = new Property("apps", getJsonAppsString(apps));
+		var p = new Property("apps", this.getJsonAppsString(apps));
 		// user can be null using internal method
 		this.componentManager.handleUpdateComponentConfigRequest(user,
 				new UpdateComponentConfigRequest(SINGLETON_COMPONENT_ID, Arrays.asList(p)));
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java
index b47cac80875..d31a2c54c60 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java
@@ -1,5 +1,7 @@
 package io.openems.edge.core.appmanager;
 
+import java.util.stream.Stream;
+
 import org.osgi.service.component.ComponentConstants;
 
 import com.google.gson.JsonObject;
@@ -14,6 +16,25 @@
 
 public interface OpenemsApp {
 
+	/**
+	 * Tests if a user is allowed to edit a property.
+	 * 
+	 * @param prop The property to be tested
+	 * @param user The user permissions are to be tested for
+	 * @return true if user is allowed to edit, false otherwise
+	 */
+	public boolean assertCanEdit(String prop, User user);
+
+	/**
+	 * Maps the property name of a component to the coressponding app Property.
+	 * 
+	 * @param prop        The property to be mapped
+	 * @param componentId the componentId
+	 * @param instance    instance of the app
+	 * @return the mapped property name
+	 */
+	public String mapPropName(String prop, String componentId, OpenemsAppInstance instance);
+
 	/**
 	 * Gets the {@link AppAssistant} for this {@link OpenemsApp}.
 	 *
@@ -123,6 +144,15 @@ public default Flag[] flags() {
 		return new Flag[] {};
 	}
 
+	/** Checks whether the app has a passed flag set.
+	 * 
+	 * @param flag the flag to be checked
+	 * @return is the flag set
+	 */
+	public default boolean hasFlag(Flag flag) {
+		return Stream.of(this.flags()).anyMatch(f -> f.equals(flag));
+	}
+
 	public static final String FALLBACK_IMAGE = """
 			data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY5\
 			1AAABhWlDQ1BJQ0MgUHJvZmlsZQAAKM+VkT1Iw1AUhU9TpVIqgu0g4pChOlkQFXGUKBbBQmkrtOpg8tI/aNKQpLg4Cq4FB38Wqw\
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
index 16d616748e9..3bd86a01dde 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppCategory.java
@@ -9,6 +9,11 @@
 
 public enum OpenemsAppCategory {
 
+	/**
+	 * Core.
+	 */
+	CORE("core"),
+
 	/**
 	 * Integrated Systems.
 	 */
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelper.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelper.java
index 2d5eb15d54b..8be75ab8167 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelper.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelper.java
@@ -1,9 +1,13 @@
 package io.openems.edge.core.appmanager.dependency;
 
+import java.util.List;
+
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.user.User;
 import io.openems.edge.core.appmanager.OpenemsApp;
 import io.openems.edge.core.appmanager.OpenemsAppInstance;
+import io.openems.edge.core.appmanager.dependency.aggregatetask.AggregateTask;
+import io.openems.edge.core.appmanager.dependency.aggregatetask.AggregateTask.AggregateTaskExecutionConfiguration;
 
 public interface AppManagerAppHelper {
 
@@ -42,6 +46,21 @@ public UpdateValues updateApp(User user, OpenemsAppInstance oldInstance, Openems
 	 */
 	public UpdateValues deleteApp(User user, OpenemsAppInstance instance) throws OpenemsNamedException;
 
+	/**
+	 * Gets a list of {@link AggregateTaskExecutionConfiguration} which are the
+	 * expected steps that are executed when installing a app with the provided
+	 * properties.
+	 * 
+	 * @param user     the executing user
+	 * @param instance the settings of the new {@link OpenemsAppInstance}
+	 * @param app      the {@link OpenemsApp}
+	 * @return a list of the configurations
+	 * @throws OpenemsNamedException on error
+	 */
+	public List<AggregateTask.AggregateTaskExecutionConfiguration> getInstallConfiguration(//
+			User user, OpenemsAppInstance instance, OpenemsApp app //
+	) throws OpenemsNamedException;
+
 	/**
 	 * Only available during a call of one of the other methods.
 	 *
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelperImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelperImpl.java
index 7ce7533c0f2..3dd1c7d21c2 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelperImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/AppManagerAppHelperImpl.java
@@ -150,6 +150,47 @@ public UpdateValues deleteApp(User user, OpenemsAppInstance instance) throws Ope
 		return this.usingTemporaryApps(user, () -> this.deleteAppInternal(user, instance));
 	}
 
+	@Override
+	public List<AggregateTask.AggregateTaskExecutionConfiguration> getInstallConfiguration(//
+			User user, //
+			OpenemsAppInstance instance, //
+			OpenemsApp app //
+	) throws OpenemsNamedException {
+		return this.getConfigurations(user, () -> this.updateAppInternal(user, null, instance, app));
+	}
+
+	private List<AggregateTask.AggregateTaskExecutionConfiguration> getConfigurations(//
+			User user, //
+			ThrowingSupplier<UpdateValues, OpenemsNamedException> supplier //
+	) throws OpenemsNamedException {
+		Objects.requireNonNull(supplier);
+		// to make sure the temporaryApps get set to null
+		this.resetTasks();
+		this.temporaryApps = new TemporaryApps();
+		OpenemsNamedException exception = null;
+		RuntimeException runtimeException = null;
+		try {
+			supplier.get();
+		} catch (OpenemsNamedException e) {
+			exception = e;
+		} catch (RuntimeException e) {
+			runtimeException = e;
+		}
+		this.temporaryApps = null;
+		if (exception != null) {
+			this.log.error("An Exception occurred during handling the supplier.", exception);
+			throw exception;
+		}
+		if (runtimeException != null) {
+			this.log.error("An RuntimeException occurred during handling the supplier.", runtimeException);
+			throw runtimeException;
+		}
+
+		return this.tasks.stream() //
+				.map(AggregateTask::getExecutionConfiguration) //
+				.toList();
+	}
+
 	private UpdateValues usingTemporaryApps(User user, ThrowingSupplier<UpdateValues, OpenemsNamedException> supplier)
 			throws OpenemsNamedException {
 		Objects.requireNonNull(supplier);
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/AggregateTask.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/AggregateTask.java
index b5a42dd4944..e32e34e0495 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/AggregateTask.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/AggregateTask.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Set;
 
+import com.google.gson.JsonElement;
+
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.session.Language;
 import io.openems.edge.common.user.User;
@@ -12,6 +14,28 @@
 
 public interface AggregateTask<T> {
 
+	/**
+	 * Class representing the configuration of an already aggregated
+	 * {@link AggregateTask}.
+	 */
+	public interface AggregateTaskExecutionConfiguration {
+
+		/**
+		 * The identifier of the configuration.
+		 * 
+		 * @return a string which identifies this type of configuration
+		 */
+		public String identifier();
+
+		/**
+		 * Creates a {@link JsonElement} of this configuration.
+		 * 
+		 * @return the created {@link JsonElement}
+		 */
+		public JsonElement toJson();
+
+	}
+
 	public static record AggregateTaskExecuteConstraints(//
 			/**
 			 * Tasks which need to run before this task.
@@ -48,6 +72,14 @@ public static record AggregateTaskExecuteConstraints(//
 	 */
 	public void delete(User user, List<AppConfiguration> otherAppConfigurations) throws OpenemsNamedException;
 
+	/**
+	 * Gets the {@link AggregateTaskExecutionConfiguration} which can be used for
+	 * debugging.
+	 * 
+	 * @return the AggregateTaskExecutionConfiguration
+	 */
+	public AggregateTaskExecutionConfiguration getExecutionConfiguration();
+
 	/**
 	 * Validates the expected configuration.
 	 * 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/ComponentAggregateTaskImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/ComponentAggregateTaskImpl.java
index 87fad0519b6..d7e878ddc73 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/ComponentAggregateTaskImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/ComponentAggregateTaskImpl.java
@@ -4,6 +4,8 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.osgi.service.component.annotations.Activate;
@@ -11,6 +13,9 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+
 import io.openems.common.exceptions.InvalidValueException;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
@@ -20,12 +25,14 @@
 import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest.Property;
 import io.openems.common.session.Language;
 import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.user.User;
 import io.openems.edge.core.appmanager.AppConfiguration;
 import io.openems.edge.core.appmanager.ComponentUtilImpl;
 import io.openems.edge.core.appmanager.TranslationUtil;
 import io.openems.edge.core.appmanager.dependency.AppManagerAppHelperImpl;
+import io.openems.edge.core.appmanager.jsonrpc.GetEstimatedConfiguration;
 
 @Component(//
 		service = { //
@@ -37,6 +44,36 @@
 )
 public class ComponentAggregateTaskImpl implements ComponentAggregateTask {
 
+	private record ComponentAggregatedExecutionConfiguration(//
+			List<EdgeConfig.Component> components //
+	) implements AggregateTask.AggregateTaskExecutionConfiguration {
+
+		private ComponentAggregatedExecutionConfiguration {
+			Objects.requireNonNull(components);
+		}
+
+		@Override
+		public String identifier() {
+			return "Component";
+		}
+
+		@Override
+		public JsonElement toJson() {
+			if (this.components.isEmpty()) {
+				return JsonNull.INSTANCE;
+			}
+			return JsonUtils.buildJsonObject() //
+					.add("components", this.components.stream() //
+							.map(t -> new GetEstimatedConfiguration.Component(t.getFactoryId(), t.getId(), t.getAlias(),
+									t.getProperties().entrySet().stream() //
+											.collect(JsonUtils.toJsonObject(Entry::getKey, Entry::getValue)))) //
+							.map(GetEstimatedConfiguration.Component.serializer()::serialize) //
+							.collect(JsonUtils.toJsonArray())) //
+					.build();
+		}
+
+	}
+
 	private final ComponentManager componentManager;
 
 	private List<EdgeConfig.Component> components;
@@ -210,6 +247,11 @@ public void delete(User user, List<AppConfiguration> otherAppConfigurations) thr
 		}
 	}
 
+	@Override
+	public AggregateTaskExecutionConfiguration getExecutionConfiguration() {
+		return new ComponentAggregatedExecutionConfiguration(this.components);
+	}
+
 	@Override
 	public String getGeneralFailMessage(Language l) {
 		final var bundle = AppManagerAppHelperImpl.getTranslationBundle(l);
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/PersistencePredictorAggregateTaskImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/PersistencePredictorAggregateTaskImpl.java
index 49bfb12f7ed..7ce66695a85 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/PersistencePredictorAggregateTaskImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/PersistencePredictorAggregateTaskImpl.java
@@ -6,6 +6,7 @@
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -15,12 +16,15 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonPrimitive;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest;
 import io.openems.common.session.Language;
+import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.user.User;
@@ -38,6 +42,42 @@
 )
 public class PersistencePredictorAggregateTaskImpl implements PersistencePredictorAggregateTask {
 
+	private record PersistencePredictorExecutionConfiguration(//
+			Set<String> channelsToAdd, //
+			Set<String> channelsToRemove //
+	) implements AggregateTask.AggregateTaskExecutionConfiguration {
+
+		private PersistencePredictorExecutionConfiguration {
+			Objects.requireNonNull(channelsToAdd);
+			Objects.requireNonNull(channelsToRemove);
+		}
+
+		@Override
+		public String identifier() {
+			return "PersistencePredictor";
+		}
+
+		@Override
+		public JsonElement toJson() {
+			if (this.channelsToAdd.isEmpty() && this.channelsToRemove.isEmpty()) {
+				return JsonNull.INSTANCE;
+			}
+			return JsonUtils.buildJsonObject() //
+					.onlyIf(!this.channelsToAdd.isEmpty(), t -> {
+						t.add("channelsToAdd", this.channelsToAdd.stream() //
+								.map(JsonPrimitive::new) //
+								.collect(JsonUtils.toJsonArray()));
+					}) //
+					.onlyIf(!this.channelsToRemove.isEmpty(), t -> {
+						t.add("channelsToRemove", this.channelsToRemove.stream() //
+								.map(JsonPrimitive::new) //
+								.collect(JsonUtils.toJsonArray()));
+					}) //
+					.build();
+		}
+
+	}
+
 	private ComponentManager componentManager;
 
 	private Set<String> channelsToAdd;
@@ -97,6 +137,11 @@ public void validate(//
 		errors.add("Missing channels in predictor [" + String.join(";", missingChannels) + "]");
 	}
 
+	@Override
+	public AggregateTaskExecutionConfiguration getExecutionConfiguration() {
+		return new PersistencePredictorExecutionConfiguration(this.channelsToAdd, this.channelsToRemove);
+	}
+
 	@Override
 	public String getGeneralFailMessage(Language l) {
 		final var bundle = AppManagerAppHelperImpl.getTranslationBundle(l);
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerAggregateTaskImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerAggregateTaskImpl.java
index 2059bc85e89..41d903bbb14 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerAggregateTaskImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerAggregateTaskImpl.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import org.osgi.service.component.annotations.Activate;
@@ -10,8 +11,13 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonPrimitive;
+
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.session.Language;
+import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.user.User;
 import io.openems.edge.core.appmanager.AppConfiguration;
 import io.openems.edge.core.appmanager.ComponentUtil;
@@ -28,6 +34,33 @@
 )
 public class SchedulerAggregateTaskImpl implements SchedulerAggregateTask {
 
+	private record SchedulerExecutionConfiguration(//
+			List<String> insertOrder //
+	) implements AggregateTask.AggregateTaskExecutionConfiguration {
+
+		private SchedulerExecutionConfiguration {
+			Objects.requireNonNull(insertOrder);
+		}
+
+		@Override
+		public String identifier() {
+			return "Scheduler";
+		}
+
+		@Override
+		public JsonElement toJson() {
+			if (this.insertOrder.isEmpty()) {
+				return JsonNull.INSTANCE;
+			}
+			return JsonUtils.buildJsonObject() //
+					.add("insertOrder", this.insertOrder.stream() //
+							.map(JsonPrimitive::new) //
+							.collect(JsonUtils.toJsonArray()))
+					.build();
+		}
+
+	}
+
 	private final ComponentAggregateTask aggregateTask;
 	private final ComponentUtil componentUtil;
 
@@ -92,6 +125,11 @@ public void delete(User user, List<AppConfiguration> otherAppConfigurations) thr
 		this.componentUtil.removeIdsInSchedulerIfExisting(user, this.removeIds);
 	}
 
+	@Override
+	public AggregateTaskExecutionConfiguration getExecutionConfiguration() {
+		return new SchedulerExecutionConfiguration(this.order);
+	}
+
 	@Override
 	public String getGeneralFailMessage(Language l) {
 		final var bundle = AppManagerAppHelperImpl.getTranslationBundle(l);
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerByCentralOrderAggregateTaskImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerByCentralOrderAggregateTaskImpl.java
index 253f2b98c45..6d608d70b4d 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerByCentralOrderAggregateTaskImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/SchedulerByCentralOrderAggregateTaskImpl.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Function;
@@ -20,9 +21,13 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.session.Language;
+import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.user.User;
 import io.openems.edge.core.appmanager.AppConfiguration;
@@ -44,6 +49,37 @@
 )
 public class SchedulerByCentralOrderAggregateTaskImpl implements SchedulerByCentralOrderAggregateTask {
 
+	private record SchedulerByCentralOrderExecutionConfiguration(//
+			List<SchedulerComponent> insertOrder //
+	) implements AggregateTask.AggregateTaskExecutionConfiguration {
+
+		private SchedulerByCentralOrderExecutionConfiguration {
+			Objects.requireNonNull(insertOrder);
+		}
+
+		@Override
+		public String identifier() {
+			return "SchedulerByCentralOrder";
+		}
+
+		@Override
+		public JsonElement toJson() {
+			if (this.insertOrder.isEmpty()) {
+				return JsonNull.INSTANCE;
+			}
+			return JsonUtils.buildJsonObject() //
+					.add("insertOrder", this.insertOrder.stream() //
+							.map(t -> JsonUtils.buildJsonObject() //
+									.addProperty("id", t.id()) //
+									.addProperty("factoryId", t.factoryId()) //
+									.addPropertyIfNotNull("createdByAppId", t.createdByAppId()) //
+									.build())
+							.collect(JsonUtils.toJsonArray()))
+					.build();
+		}
+
+	}
+
 	private final ComponentManager componentManager;
 	private final ComponentUtil componentUtil;
 	private final AppManagerUtil appManagerUtil;
@@ -68,6 +104,7 @@ public ProductionSchedulerOrderDefinition() {
 							.filterByFactoryId("Controller.Api.ModbusTcp.ReadWrite") //
 							.thenByCreatedAppId("App.Ess.GeneratingPlantController") //
 							.rest()) //
+					.thenByFactoryId("Controller.Api.ModbusRtu.ReadWrite") // 
 					.thenByFactoryId("Controller.Api.Rest.ReadWrite") //
 					.thenByFactoryId("Controller.Ess.GridOptimizedCharge") //
 					.thenByFactoryId("Controller.Ess.Hybrid.Surplus-Feed-To-Grid") //
@@ -416,6 +453,11 @@ public void delete(User user, List<AppConfiguration> otherAppConfigurations) thr
 		this.componentUtil.removeIdsInSchedulerIfExisting(user, this.getIdsToRemove(otherAppConfigurations));
 	}
 
+	@Override
+	public AggregateTaskExecutionConfiguration getExecutionConfiguration() {
+		return new SchedulerByCentralOrderExecutionConfiguration(this.schedulerComponents);
+	}
+
 	private List<String> getIdsToRemove(List<AppConfiguration> otherAppConfigurations) {
 		final var otherIds = AppConfiguration
 				.flatMap(otherAppConfigurations, SchedulerByCentralOrderAggregateTask.class,
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/StaticIpAggregateTaskImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/StaticIpAggregateTaskImpl.java
index b01d6dde1a3..bbe8a3c9896 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/StaticIpAggregateTaskImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/dependency/aggregatetask/StaticIpAggregateTaskImpl.java
@@ -2,6 +2,7 @@
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.osgi.service.component.annotations.Activate;
@@ -9,8 +10,12 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.session.Language;
+import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.user.User;
 import io.openems.edge.core.appmanager.AppConfiguration;
 import io.openems.edge.core.appmanager.ComponentUtil;
@@ -28,6 +33,40 @@
 )
 public class StaticIpAggregateTaskImpl implements StaticIpAggregateTask {
 
+	private record StaticIpExecutionConfiguration(//
+			List<InterfaceConfiguration> ips //
+	) implements AggregateTask.AggregateTaskExecutionConfiguration {
+
+		private StaticIpExecutionConfiguration {
+			Objects.requireNonNull(ips);
+		}
+
+		@Override
+		public String identifier() {
+			return "StaticIp";
+		}
+
+		@Override
+		public JsonElement toJson() {
+			if (this.ips.isEmpty()) {
+				return JsonNull.INSTANCE;
+			}
+			return JsonUtils.buildJsonObject() //
+					.add("interfaces", this.ips.stream() //
+							.map(t -> JsonUtils.buildJsonObject() //
+									.addProperty("interface", t.interfaceName) //
+									.add("addresses", t.getIps().stream() //
+											.map(ip -> JsonUtils.buildJsonObject() //
+													.addProperty("address", ip.getInet4Address().getHostAddress()) //
+													.build()) //
+											.collect(JsonUtils.toJsonArray())) //
+									.build())
+							.collect(JsonUtils.toJsonArray()))
+					.build();
+		}
+
+	}
+
 	private final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
 
 	private final ComponentUtil componentUtil;
@@ -69,6 +108,11 @@ public void delete(User user, List<AppConfiguration> otherAppConfigurations) thr
 		this.execute(user, otherAppConfigurations, null, this.ips2Delete);
 	}
 
+	@Override
+	public AggregateTaskExecutionConfiguration getExecutionConfiguration() {
+		return new StaticIpExecutionConfiguration(this.ips);
+	}
+
 	private void execute(//
 			final User user, //
 			final List<AppConfiguration> otherAppConfigurations, //
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/flag/Flags.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/flag/Flags.java
index bb85f9bbcf2..57c4e53a00e 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/flag/Flags.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/flag/Flags.java
@@ -3,6 +3,8 @@
 public final class Flags {
 
 	public static final Flag SHOW_AFTER_KEY_REDEEM = new FlagRecord("showAfterKeyRedeem");
+	
+	public static final Flag ALWAYS_INSTALLED = new FlagRecord("alwaysInstalled");
 
 	private Flags() {
 		super();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetEstimatedConfiguration.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetEstimatedConfiguration.java
new file mode 100644
index 00000000000..f2b10cf9853
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetEstimatedConfiguration.java
@@ -0,0 +1,125 @@
+package io.openems.edge.core.appmanager.jsonrpc;
+
+import static io.openems.common.jsonrpc.serialization.JsonSerializerUtil.jsonObjectSerializer;
+import static io.openems.common.utils.JsonUtils.toJsonArray;
+import static java.util.Collections.emptyList;
+
+import java.util.List;
+import java.util.Objects;
+
+import com.google.gson.JsonObject;
+
+import io.openems.common.jsonrpc.serialization.JsonSerializer;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.common.jsonapi.EndpointRequestType;
+import io.openems.edge.core.appmanager.dependency.aggregatetask.AggregateTask;
+import io.openems.edge.core.appmanager.jsonrpc.GetEstimatedConfiguration.Request;
+import io.openems.edge.core.appmanager.jsonrpc.GetEstimatedConfiguration.Response;
+
+public class GetEstimatedConfiguration implements EndpointRequestType<Request, Response> {
+
+	@Override
+	public String getMethod() {
+		return "getEstimatedConfiguration";
+	}
+
+	@Override
+	public JsonSerializer<Request> getRequestSerializer() {
+		return Request.serializer();
+	}
+
+	@Override
+	public JsonSerializer<Response> getResponseSerializer() {
+		return Response.serializer();
+	}
+
+	public static record Request(//
+			String appId, //
+			String alias, //
+			JsonObject properties //
+	) {
+
+		/**
+		 * Returns a {@link JsonSerializer} for a
+		 * {@link GetEstimatedConfiguration.Request}.
+		 * 
+		 * @return the created {@link JsonSerializer}
+		 */
+		public static JsonSerializer<Request> serializer() {
+			return jsonObjectSerializer(Request.class, //
+					json -> new Request(//
+							json.getString("appId"), //
+							json.getString("alias"), //
+							json.getJsonObject("properties")),
+					obj -> JsonUtils.buildJsonObject() //
+							.addProperty("appId", obj.appId()) //
+							.addProperty("alias", obj.alias()) //
+							.add("properties", obj.properties()) //
+							.build());
+		}
+
+	}
+
+	public record Response(//
+			List<AggregateTask.AggregateTaskExecutionConfiguration> configurations //
+	) {
+
+		/**
+		 * Returns a {@link JsonSerializer} for a
+		 * {@link GetEstimatedConfiguration.Response}.
+		 * 
+		 * @return the created {@link JsonSerializer}
+		 */
+		public static JsonSerializer<Response> serializer() {
+			return jsonObjectSerializer(Response.class, //
+					// TODO polymorphic serializer
+					json -> new Response(emptyList()), //
+					obj -> JsonUtils.buildJsonObject() //
+							.add("configurations", obj.configurations().stream() //
+									.map(t -> {
+										final var configJson = t.toJson();
+
+										if (configJson.isJsonNull()) {
+											return null;
+										}
+
+										return JsonUtils.buildJsonObject() //
+												.addProperty("type", t.identifier()) //
+												.add("configuration", configJson) //
+												.build();
+									}) //
+									.filter(Objects::nonNull) //
+									.collect(toJsonArray())) //
+							.build());
+		}
+	}
+
+	public record Component(String factoryId, String id, String alias, JsonObject properties) {
+
+		/**
+		 * Returns a {@link JsonSerializer} for a
+		 * {@link GetEstimatedConfiguration.Component}.
+		 * 
+		 * @return the created {@link JsonSerializer}
+		 */
+		public static JsonSerializer<GetEstimatedConfiguration.Component> serializer() {
+			return jsonObjectSerializer(GetEstimatedConfiguration.Component.class, json -> {
+				return new GetEstimatedConfiguration.Component(//
+						json.getString("factoryId"), //
+						json.getString("id"), //
+						json.getString("alias"), //
+						json.getJsonObject("properties") //
+				);
+			}, obj -> {
+				return JsonUtils.buildJsonObject() //
+						.addProperty("factoryId", obj.factoryId()) //
+						.addProperty("id", obj.id()) //
+						.addProperty("alias", obj.alias()) //
+						.add("properties", obj.properties()) //
+						.build();
+			});
+		}
+
+	}
+
+}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppConfig.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppConfig.java
new file mode 100644
index 00000000000..0253c0742a3
--- /dev/null
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppConfig.java
@@ -0,0 +1,102 @@
+package io.openems.edge.core.appmanager.jsonrpc;
+
+import static io.openems.common.jsonrpc.serialization.JsonSerializerUtil.jsonObjectSerializer;
+
+import com.google.gson.JsonObject;
+
+import io.openems.common.jsonrpc.serialization.JsonSerializer;
+import io.openems.common.jsonrpc.serialization.JsonSerializerUtil;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.common.jsonapi.EndpointRequestType;
+import io.openems.edge.core.appmanager.OpenemsAppInstance;
+import io.openems.edge.core.appmanager.jsonrpc.UpdateAppConfig.Request;
+import io.openems.edge.core.appmanager.jsonrpc.UpdateAppConfig.Response;
+
+/**
+ * Updates an {@link OpenemsAppInstance}.
+ *
+ * <p>
+ * Request:
+ *
+ * <pre>
+ * {
+ *   "jsonrpc": "2.0",
+ *   "id": "UUID",
+ *   "method": "updateAppConfig",
+ *   "params": {
+ *     "componentId": string (uuid),
+ *     "properties": {}
+ *   }
+ * }
+ * </pre>
+ *
+ * <p>
+ * Response:
+ *
+ * <pre>
+ * {
+ *   "jsonrpc": "2.0",
+ *   "id": "UUID",
+ *   "result": {
+ *     "instance": {@link OpenemsAppInstance#toJsonObject()}
+ *     "warnings": string[]
+ *   }
+ * }
+ * </pre>
+ */
+public class UpdateAppConfig implements EndpointRequestType<Request, Response> {
+
+	@Override
+	public String getMethod() {
+		return "updateAppConfig";
+	}
+
+	@Override
+	public JsonSerializer<Request> getRequestSerializer() {
+		return Request.serializer();
+	}
+
+	@Override
+	public JsonSerializer<Response> getResponseSerializer() {
+		return Response.serializer();
+	}
+
+	public record Request(//
+			String componentId, //
+			JsonObject properties //
+	) {
+
+		/**
+		 * Returns a {@link JsonSerializer} for a {@link UpdateAppInstance.Request}.
+		 * 
+		 * @return the created {@link JsonSerializer}
+		 */
+		public static JsonSerializer<UpdateAppConfig.Request> serializer() {
+			return jsonObjectSerializer(UpdateAppConfig.Request.class, //
+					json -> new UpdateAppConfig.Request(//
+							json.getString("componentId"), //
+							json.getJsonObject("properties")), //
+					obj -> JsonUtils.buildJsonObject() //
+							.addProperty("componentId", obj.componentId()) //
+							.add("properties", obj.properties()) //
+							.build());
+		}
+
+	}
+
+	public record Response(//
+	
+	) {
+
+		/**
+		 * Returns a {@link JsonSerializer} for a {@link UpdateAppInstance.Response}.
+		 * 
+		 * @return the created {@link JsonSerializer}
+		 */
+		public static JsonSerializer<UpdateAppConfig.Response> serializer() {
+			return JsonSerializerUtil.emptyObjectSerializer(Response::new);
+		}
+
+	}
+
+}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties
index e9795f28fb0..620bdbb678a 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties
@@ -15,6 +15,7 @@ ess = Speichersystemsteuerung
 openemsDeviceHardware = OpenEMS Geräte Hardware
 timedata = Timedata
 test = Test
+core = Core
 
 # Global
 alias = Alias
@@ -77,15 +78,30 @@ formly.validation.requireChecked = Diese Checkbox ist erforderlich!
 App.Api.apiTimeout.label = Api-Timeout
 App.Api.apiTimeout.description = Legt die Zeitüberschreitung in Sekunden für Aktualisierungen in den von dieser Api eingestellten Kanälen fest.
 
-App.Api.ModbusTcp.changeComponentHint = <a class=\"warning\">Hinweis</a>: Beim Einfügen einer Komponente ändert sich auch die Modbus Tabelle!
+App.Api.Modbus.componentIds.description = Komponenten, die über die Schnittstelle verfügbar gemacht werden sollen.
+App.Api.Modbus.componentIds.label = Komponenten-IDs
+App.Api.Modbus.changeComponentHint = <a class=\"warning\">Hinweis</a>: Beim Einfügen einer Komponente ändert sich auch die Modbus Tabelle!
 
 App.Api.ModbusTcp.ReadOnly.Name = Modbus/TCP lesend
 App.Api.ModbusTcp.ReadOnly.Name.short = Modbus/TCP lesend
-
 App.Api.ModbusTcp.ReadWrite.Name = Modbus/TCP Schreibzugriff
 App.Api.ModbusTcp.ReadWrite.Name.short = Modbus/TCP Schreibzugriff
-App.Api.ModbusTcp.ReadWrite.componentIds.label = Component-IDs
-App.Api.ModbusTcp.ReadWrite.componentIds.description = Komponenten, die über die Schnittstelle verfügbar gemacht werden sollen.
+
+App.Api.ModbusRtu.ReadOnly.Name = Modbus/RTU lesend
+App.Api.ModbusRtu.ReadOnly.Name.short = Modbus/RTU lesend
+App.Api.ModbusRtu.ReadWrite.Name = Modbus/RTU Schreibzugriff
+App.Api.ModbusRtu.ReadWrite.Name.short = Modbus/RTU Schreibzugriff
+
+App.Api.ModbusRtu.portName.label = Port-Name
+App.Api.ModbusRtu.portName.description = Der Name des seriellen Ports - z.B. '/dev/ttyUSB0' oder 'COM3'
+App.Api.ModbusRtu.baudrate.label = Baudrate
+App.Api.ModbusRtu.baudrate.description = Die Baudrate - z.B. 9600, 19200, 38400, 57600 oder 115200
+App.Api.ModbusRtu.databits.label = Datenbits
+App.Api.ModbusRtu.databits.description = Die Anzahl der Datenbits - z.B. 8
+App.Api.ModbusRtu.stopbits.label = Stoppbits
+App.Api.ModbusRtu.stopbits.description = Die Anzahl der Stoppbits - '1', '1.5' oder '2'
+App.Api.ModbusRtu.parity.label = Parität
+App.Api.ModbusRtu.parity.description = Die Parität - 'keine', 'gerade', 'ungerade', 'mark' oder 'space'
 
 App.Api.Mqtt.Name = MQTT-Api lesend
 App.Api.Mqtt.Name.short = MQTT-Api lesend
@@ -120,6 +136,13 @@ App.Timedata.InfluxDb.isReadOnly.description = Aktiviert Read Only Modus. Dann w
 App.Timedata.InfluxDb.bucket.label = Bucket
 App.Timedata.InfluxDb.bucket.description = Der Bucket-Name; für InfluxDB v1: 'Datenbank/retentionPolicy', z. B. 'db/daten'
 
+# Core
+App.Core.Meta.Name = Meta
+App.Core.Meta.Name.short = Meta 
+
+App.Core.Meta.currency.label = Währung
+App.Core.Meta.gridCharge.label = Ist Beladung aus dem Netz erlaubt?
+App.Core.Meta.gridCharge.description = <a class=\"warning\">ACHTUNG</a>: Die aktive Beladung der Batterie aus dem Netz über die technisch notwendige Erhaltungsladung hinaus erfordert eine entsprechende Anmeldung des Speichersystems. Im Zweifel wenden Sie sich hierzu bitte an Ihren Installateur. Mit Betätigung des blauen \\\"Speichern\\\"-Buttons bestätigen Sie, dass Sie diese Prüfung durchgeführt haben.<br/><br/>Beachten Sie: Voraussetzung für die Inanspruchnahme einer Förderung nach dem Gesetz für den Ausbau erneuerbarer Energien (EEG) ist, dass im Speicher ausschließlich Strom zwischengespeichert wird, der aus erneuerbaren Energien und/oder Grubengas stammt. Bei Aktivierung dieser Funktion wird der Speicher mit Netzstrom geladen. Dieser Netzstrom wird, je nach Stromlieferungsvertrag, ggf. auch aus fossilen Energieträgern und/oder Atomkraft gewonnen. Daher können wir nicht gewährleisten, dass der Speicher ausschließlich mit Strom aus erneuerbaren Energien und/oder Grubengas geladen wird
 
 # Evcs
 App.Evcs.controller.alias = Ladestation Steuerung
@@ -253,7 +276,7 @@ App.IntegratedSystem.ctRatioFirst.label = Wandler-Primärstrom (200A - 5000A/5A)
 App.IntegratedSystem.shadowManagementDisabled.label = Schattenmanagement deaktivieren
 App.IntegratedSystem.shadowManagementDisabled.description = Nur wenn Optimierer verbaut sind, muss das Schattenmanagement deaktiviert werden
 App.IntegratedSystem.hasEssLimiter14a.label = Hat Limitierer für §14a
-App.IntegratedSystem.naProtectionEnabled.label = NA-Schutz aktiviert?
+App.IntegratedSystem.naProtectionEnabled.label = Fernabschaltung aktivieren (Zentraler NA Schutz)
 
 App.IntegratedSystem.modbusToBattery.alias = Kommunikation mit der Batterie
 App.IntegratedSystem.modbusToBatteryN.alias = Kommunikation mit den Batterien
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties
index 03f34b1bafa..5441df63c3a 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties
@@ -15,6 +15,7 @@ ess = Energy Storage controller
 openemsDeviceHardware = OpenEMS Device Hardware
 timedata = Timedata
 test = Test
+core = Core
 
 # Global
 alias = Alias
@@ -77,15 +78,30 @@ formly.validation.requireChecked = This checkbox is required!
 App.Api.apiTimeout.label = Api-Timeout
 App.Api.apiTimeout.description = Sets the timeout in seconds for updates on Channels set by this Api.
 
+App.Api.Modbus.componentIds.description = Components that should be made available via Modbus.
+App.Api.Modbus.componentIds.label = Component-IDs
 App.Api.ModbusTcp.changeComponentHint = <a class=\"warning\">Note</a>: When inserting a component, the Modbus table also changes!
 
+App.Api.ModbusRtu.ReadOnly.Name = Modbus/RTU reading
+App.Api.ModbusRtu.ReadOnly.Name.short = Modbus/RTU reading
+App.Api.ModbusRtu.ReadWrite.Name = Modbus/RTU write access
+App.Api.ModbusRtu.ReadWrite.Name.short = Modbus/RTU write access
+
 App.Api.ModbusTcp.ReadOnly.Name = Modbus/TCP reading
 App.Api.ModbusTcp.ReadOnly.Name.short = Modbus/TCP reading
-
 App.Api.ModbusTcp.ReadWrite.Name = Modbus/TCP write access
 App.Api.ModbusTcp.ReadWrite.Name.short = Modbus/TCP write access
-App.Api.ModbusTcp.ReadWrite.componentIds.label = Component-IDs
-App.Api.ModbusTcp.ReadWrite.componentIds.description = Components that should be made available via Modbus.
+
+App.Api.ModbusRtu.portName.label = Port-Name
+App.Api.ModbusRtu.portName.description = The name of the serial port - e.g. '/dev/ttyUSB0' or 'COM3'
+App.Api.ModbusRtu.baudrate.label = Baudrate
+App.Api.ModbusRtu.baudrate.description = The baudrate - e.g. 9600, 19200, 38400, 57600 or 115200
+App.Api.ModbusRtu.databits.label = Databits
+App.Api.ModbusRtu.databits.description = The number of databits - e.g. 8
+App.Api.ModbusRtu.stopbits.label = Stopbits
+App.Api.ModbusRtu.stopbits.description = The number of stopbits - '1', '1.5' or '2'.
+App.Api.ModbusRtu.parity.label = Parity
+App.Api.ModbusRtu.parity.description = The parity - 'none', 'even', 'odd', 'mark' or 'space'
 
 App.Api.Mqtt.Name = MQTT-Api reading
 App.Api.Mqtt.Name.short = MQTT-Api reading
@@ -120,6 +136,13 @@ App.Timedata.InfluxDb.isReadOnly.description = Activates the read-only mode. The
 App.Timedata.InfluxDb.bucket.label = Bucket
 App.Timedata.InfluxDb.bucket.description = The bucket name; for InfluxDB v1: 'database/retentionPolicy', e.g. 'db/data'
 
+# Core
+App.Core.Meta.Name = Meta
+App.Core.Meta.Name.short = Meta
+
+App.Core.Meta.currency.label = Currency
+App.Core.Meta.gridCharge.label = Is charging from the grid allowed?
+App.Core.Meta.gridCharge.description = <br/><a class=\"warning\">WARNING</a>: Actively charging the battery from the grid beyond the technically necessary maintenance charge requires appropriate registration of the storage system. If in doubt, please consult your installer. By pressing the blue \\\"Save\\\" button, you confirm that you have conducted this check.<br/><br/>Please note: A requirement for receiving subsidies under the Renewable Energy Sources Act (EEG) is that only electricity generated from renewable energies and/or mine gas is stored in the system. When this function is activated, the storage system is charged with grid electricity. This grid electricity may, depending on your electricity supply contract, include energy from fossil fuels and/or nuclear power. Therefore, we cannot guarantee that the storage system will only be charged with electricity from renewable energies and/or mine gas.
 
 # Evcs
 App.Evcs.controller.alias = Charging station control
@@ -252,8 +275,8 @@ App.IntegratedSystem.gridMeterType.option.commercialMeter = Home 3-phase sensor
 App.IntegratedSystem.ctRatioFirst.label = CT-Ratio (200A - 5000A/5A)
 App.IntegratedSystem.shadowManagementDisabled.label = Deactivate shadow management
 App.IntegratedSystem.shadowManagementDisabled.description = Only if optimisers are installed, shadow management must be deactivated
-App.IntegratedSystem.hasEssLimiter14a.label = Has limiter for §14a
-App.IntegratedSystem.naProtectionEnabled.label = NA-protection enabled?
+App.IntegratedSystem.hasEssLimiter14a.label = Has limiter for §14a
+App.IntegratedSystem.naProtectionEnabled.label = Activate remote shutdown (central NA protection)
 
 App.IntegratedSystem.modbusToBattery.alias = Communication with the battery
 App.IntegratedSystem.modbusToBatteryN.alias = Communication with the batteries
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java
index 3029e0d6a04..90494546d22 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java
@@ -1,5 +1,6 @@
 package io.openems.edge.core.componentmanager;
 
+import static java.util.Collections.emptyMap;
 import static java.util.stream.Collectors.toMap;
 
 import java.io.IOException;
@@ -10,9 +11,12 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.osgi.framework.BundleContext;
@@ -54,6 +58,7 @@
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.utils.JsonUtils;
+import io.openems.common.utils.StreamUtils;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.EnumDoc;
 import io.openems.edge.common.channel.StateChannelDoc;
@@ -156,6 +161,20 @@ protected void deactivate() {
 		}
 	}
 
+	@Override
+	public Map<String, Object> getComponentProperties(String componentId) {
+		Configuration config;
+		try {
+			config = this.getExistingConfigForId(componentId);
+		} catch (OpenemsNamedException e) {
+			e.printStackTrace();
+			return emptyMap();
+		}
+
+		return StreamUtils.dictionaryToStream(config.getProperties())
+				.collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+	}
+
 	@Override
 	public List<OpenemsComponent> getEnabledComponents() {
 		return this.getComponentsViaService("(&(enabled=true)(!(service.factoryPid=Core.ComponentManager)))");
diff --git a/io.openems.edge.core/test/io/openems/edge/app/TestPermissions.java b/io.openems.edge.core/test/io/openems/edge/app/TestPermissions.java
new file mode 100644
index 00000000000..4f560f26e8f
--- /dev/null
+++ b/io.openems.edge.core/test/io/openems/edge/app/TestPermissions.java
@@ -0,0 +1,169 @@
+package io.openems.edge.app;
+
+import static io.openems.edge.app.common.props.CommonProps.defaultDef;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.function.Function;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Reference;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.oem.OpenemsEdgeOem;
+import io.openems.common.session.Language;
+import io.openems.common.session.Role;
+import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
+import io.openems.common.utils.JsonUtils.JsonArrayBuilder;
+import io.openems.edge.app.TestPermissions.Property;
+import io.openems.edge.app.TestPermissions.TestPermissionsParameter;
+import io.openems.edge.app.common.props.CommonProps;
+import io.openems.edge.app.common.props.ComponentProps;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.core.appmanager.AbstractOpenemsAppWithProps;
+import io.openems.edge.core.appmanager.AppConfiguration;
+import io.openems.edge.core.appmanager.AppDef;
+import io.openems.edge.core.appmanager.AppDescriptor;
+import io.openems.edge.core.appmanager.ComponentUtil;
+import io.openems.edge.core.appmanager.ConfigurationTarget;
+import io.openems.edge.core.appmanager.OpenemsApp;
+import io.openems.edge.core.appmanager.OpenemsAppCardinality;
+import io.openems.edge.core.appmanager.OpenemsAppCategory;
+import io.openems.edge.core.appmanager.TranslationUtil;
+import io.openems.edge.core.appmanager.Type;
+import io.openems.edge.core.appmanager.Type.Parameter.BundleProvider;
+import io.openems.edge.core.appmanager.dependency.Tasks;
+import io.openems.edge.core.appmanager.formly.JsonFormlyUtil;
+import io.openems.edge.core.appmanager.formly.builder.FormlyBuilder;
+import io.openems.edge.core.appmanager.formly.builder.ReorderArrayBuilder;
+import io.openems.edge.core.appmanager.formly.builder.ReorderArrayBuilder.SelectOption;
+import io.openems.edge.core.appmanager.formly.enums.DisplayType;
+
+/**
+ * Tests AppPropertyPermissions.
+ */
+@org.osgi.service.component.annotations.Component(name = "App.Test.TestPermissions")
+public class TestPermissions extends AbstractOpenemsAppWithProps<TestPermissions, Property, TestPermissionsParameter>
+		implements OpenemsApp {
+
+	public record TestPermissionsParameter(//
+			ResourceBundle bundle //
+	) implements BundleProvider {
+
+	}
+
+	public static enum Property implements Type<Property, TestPermissions, TestPermissionsParameter> {
+		ID(AppDef.componentId("id0")), ADMIN_ONLY(AppDef.copyOfGeneric(CommonProps.defaultDef(), def -> def //
+				.setMinRole(Role.ADMIN))), //
+		INSTALLER_ONLY(AppDef.copyOfGeneric(CommonProps.defaultDef(), def -> def //
+				.setMinRole(Role.INSTALLER))), //
+		EVERYONE(AppDef.copyOfGeneric(CommonProps.defaultDef())), //
+		UPDATE_ARRAY(AppDef.copyOfGeneric(defaultDef(), def -> def //
+				.setTranslatedLabel("component.id.plural") //
+				.setField(JsonFormlyUtil::buildFieldGroupFromNameable, (app, property, l, parameter, field) -> {
+					field.setPopupInput(property, DisplayType.STRING);
+
+					final var arrayBuilder = new ReorderArrayBuilder(property); //
+					final var fields = JsonUtils.buildJsonArray() //
+							.add(arrayBuilder.build());
+
+					field.setFieldGroup(fields.build());
+				})).setDefaultValue((app, property, l, parameter) -> {
+					return JsonUtils.buildJsonArray().add("val1").add("val2").build();
+				})),
+
+		;//
+
+		private final AppDef<? super TestPermissions, ? super Property, ? super TestPermissionsParameter> def;
+
+		private Property(AppDef<? super TestPermissions, ? super Property, ? super TestPermissionsParameter> def) {
+			this.def = def;
+		}
+
+		@Override
+		public Type<Property, TestPermissions, TestPermissionsParameter> self() {
+			return this;
+		}
+
+		@Override
+		public AppDef<? super TestPermissions, ? super Property, ? super TestPermissionsParameter> def() {
+			return this.def;
+		}
+
+		@Override
+		public Function<GetParameterValues<TestPermissions>, TestPermissionsParameter> getParamter() {
+			return t -> {
+				return new TestPermissionsParameter(//
+						createResourceBundle(t.language) //
+				);
+			};
+		}
+
+	}
+
+	@Activate
+	public TestPermissions(//
+			@Reference ComponentManager componentManager, //
+			ComponentContext componentContext, //
+			@Reference ConfigurationAdmin cm, //
+			@Reference ComponentUtil componentUtil //
+	) {
+		super(componentManager, componentContext, cm, componentUtil);
+	}
+
+	@Override
+	protected ThrowingTriFunction<ConfigurationTarget, Map<Property, JsonElement>, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() {
+		return (t, p, l) -> {
+
+			final var components = new ArrayList<EdgeConfig.Component>();
+			final var updateArray = this.getJsonArray(p, Property.UPDATE_ARRAY);
+			components.add(new EdgeConfig.Component(this.getId(t, p, Property.ADMIN_ONLY, "id0"), "alias", "factoryId", //
+					new JsonObject()));
+			components.add(
+					new EdgeConfig.Component(this.getId(t, p, Property.INSTALLER_ONLY, "id0"), "alias", "factoryId", //
+							new JsonObject()));
+			components.add(new EdgeConfig.Component(this.getId(t, p, Property.EVERYONE, "id0"), "alias", "factoryId", //
+					new JsonObject()));
+			return AppConfiguration.create() //
+					.addTask(Tasks.component(components)) //
+					.build();
+		};
+	}
+
+	@Override
+	public AppDescriptor getAppDescriptor(OpenemsEdgeOem oem) {
+		return AppDescriptor.create() //
+				.setWebsiteUrl(oem.getAppWebsiteUrl(this.getAppId())) //
+				.build();
+	}
+
+	@Override
+	public OpenemsAppCategory[] getCategories() {
+		return new OpenemsAppCategory[] { OpenemsAppCategory.TEST };
+	}
+
+	@Override
+	public OpenemsAppCardinality getCardinality() {
+		return OpenemsAppCardinality.SINGLE;
+	}
+
+	@Override
+	protected TestPermissions getApp() {
+		return this;
+	}
+
+	@Override
+	protected Property[] propertyValues() {
+		return Property.values();
+	}
+
+}
diff --git a/io.openems.edge.core/test/io/openems/edge/app/api/TestModbusTcpApiReadWrite.java b/io.openems.edge.core/test/io/openems/edge/app/api/TestModbusTcpApiReadWrite.java
index 874f365b240..f0bba295098 100644
--- a/io.openems.edge.core/test/io/openems/edge/app/api/TestModbusTcpApiReadWrite.java
+++ b/io.openems.edge.core/test/io/openems/edge/app/api/TestModbusTcpApiReadWrite.java
@@ -44,8 +44,8 @@ public void testDeactivateReadOnly() throws Exception {
 		var readOnlyApp = this.appManagerTestBundle.sut.getInstantiatedApps().get(0);
 
 		if (readOnlyApp.properties.has("ACTIVE")) {
-			var isActiv = readOnlyApp.properties.get("ACTIVE").getAsBoolean();
-			assertTrue(isActiv);
+			var isActive = readOnlyApp.properties.get("ACTIVE").getAsBoolean();
+			assertTrue(isActive);
 		}
 
 		// create ReadWrite app
@@ -66,8 +66,8 @@ public void testDeactivateReadOnly() throws Exception {
 		readOnlyApp = this.appManagerTestBundle.sut.getInstantiatedApps().get(0);
 
 		assertTrue(readOnlyApp.properties.has("ACTIVE"));
-		var isActiv = readOnlyApp.properties.get("ACTIVE").getAsBoolean();
-		assertFalse(isActiv);
+		var isActive = readOnlyApp.properties.get("ACTIVE").getAsBoolean();
+		assertFalse(isActive);
 
 		// remove ReadWrite to see if the ReadOnly gets activated
 		this.appManagerTestBundle.sut.handleDeleteAppInstanceRequest(DUMMY_ADMIN,
@@ -77,8 +77,8 @@ public void testDeactivateReadOnly() throws Exception {
 		readOnlyApp = this.appManagerTestBundle.sut.getInstantiatedApps().get(0);
 
 		if (readOnlyApp.properties.has("ACTIVE")) {
-			isActiv = readOnlyApp.properties.get("ACTIVE").getAsBoolean();
-			assertTrue(isActiv);
+			isActive = readOnlyApp.properties.get("ACTIVE").getAsBoolean();
+			assertTrue(isActive);
 		}
 	}
 
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/AppPropertyPermissionsTest.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/AppPropertyPermissionsTest.java
new file mode 100644
index 00000000000..601c29cf203
--- /dev/null
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/AppPropertyPermissionsTest.java
@@ -0,0 +1,82 @@
+package io.openems.edge.core.appmanager;
+
+import static io.openems.edge.common.test.DummyUser.DUMMY_ADMIN;
+import static io.openems.edge.common.test.DummyUser.DUMMY_INSTALLER;
+import static io.openems.edge.common.test.DummyUser.DUMMY_OWNER;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.app.TestPermissions;
+import io.openems.edge.core.appmanager.jsonrpc.AddAppInstance;
+import io.openems.edge.core.appmanager.jsonrpc.UpdateAppConfig;
+
+public class AppPropertyPermissionsTest {
+
+	private AppManagerTestBundle appManagerTestBundle;
+
+	private TestPermissions testPermissions;
+
+	@Before
+	public void setUp() throws Exception {
+		this.appManagerTestBundle = new AppManagerTestBundle(null, null, t -> {
+			return ImmutableList.of(//
+					this.testPermissions = Apps.testPermissions(t) //
+			);
+		});
+		this.appManagerTestBundle.sut.handleAddAppInstanceRequest(DUMMY_ADMIN,
+				new AddAppInstance.Request(this.testPermissions.getAppId(), "key", "alias", JsonUtils.buildJsonObject() //
+						.addProperty(TestPermissions.Property.ID.name(), "id0")
+						.addProperty(TestPermissions.Property.ADMIN_ONLY.name(), "val0") //
+						.addProperty(TestPermissions.Property.INSTALLER_ONLY.name(), "val0") //
+						.addProperty(TestPermissions.Property.EVERYONE.name(), "val0") //
+						.build()))
+				.instance();
+	}
+
+	@Test(expected = OpenemsException.class)
+	public void testAdminOnlyAsInstaller() throws OpenemsNamedException {
+		final var req = this.request("ADMIN_ONLY");
+		this.appManagerTestBundle.sut.handleUpdateAppConfigRequest(DUMMY_INSTALLER, req);
+	}
+
+	@Test
+	public void testAdminOnlyAsAdmin() throws OpenemsNamedException {
+		final var req = this.request("ADMIN_ONLY");
+		this.appManagerTestBundle.sut.handleUpdateAppConfigRequest(DUMMY_ADMIN, req);
+	}
+
+	@Test(expected = OpenemsException.class)
+	public void testInstallerOnlyAsOwner() throws OpenemsNamedException {
+		final var req = this.request("INSTALLER_ONLY");
+		this.appManagerTestBundle.sut.handleUpdateAppConfigRequest(DUMMY_OWNER, req);
+	}
+
+	@Test
+	public void testInstallerOnlyAsAdmin() throws OpenemsNamedException {
+		final var req = this.request("INSTALLER_ONLY");
+		this.appManagerTestBundle.sut.handleUpdateAppConfigRequest(DUMMY_ADMIN, req);
+	}
+
+	@Test
+	public void testEveryoneAsOwner() throws OpenemsNamedException {
+		final var req = this.request("EVERYONE");
+		this.appManagerTestBundle.sut.handleUpdateAppConfigRequest(DUMMY_OWNER, req);
+	}
+
+	private UpdateAppConfig.Request request(String val) {
+		final var ja = JsonUtils.buildJsonArray().add("val3").add("val4").build();
+		final var jo = JsonUtils.buildJsonObject().add(val, JsonUtils.getAsJsonElement("val1"))
+				.add("UPDATE_ARRAY", ja)
+				.build();
+		
+		final var req = new UpdateAppConfig.Request("id0", jo);
+		return req;
+	}
+
+}
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java
index 3d776848849..6bf3134da74 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java
@@ -12,6 +12,9 @@
 import io.openems.edge.app.TestBDependencyToC;
 import io.openems.edge.app.TestC;
 import io.openems.edge.app.TestMultipleIds;
+import io.openems.edge.app.TestPermissions;
+import io.openems.edge.app.api.ModbusRtuApiReadOnly;
+import io.openems.edge.app.api.ModbusRtuApiReadWrite;
 import io.openems.edge.app.api.ModbusTcpApiReadOnly;
 import io.openems.edge.app.api.ModbusTcpApiReadWrite;
 import io.openems.edge.app.api.RestJsonApiReadOnly;
@@ -321,6 +324,16 @@ public static final TechbaseCm4sGen2 techbaseCm4sGen2(AppManagerTestBundle t) {
 		return app(t, TechbaseCm4sGen2::new, "App.OpenemsHardware.CM4S.Gen2");
 	}
 
+	/**
+	 * Test method for creating a {@link TestPermissions}.
+	 * 
+	 * @param t the {@link AppManagerTestBundle}
+	 * @return the {@link OpenemsApp} instance
+	 */
+	public static final TestPermissions testPermissions(AppManagerTestBundle t) {
+		return app(t, TestPermissions::new, "App.Test.TestPermissions");
+	}
+	
 	// Test
 
 	/**
@@ -385,6 +398,26 @@ public static final ModbusTcpApiReadWrite modbusTcpApiReadWrite(AppManagerTestBu
 		return app(t, ModbusTcpApiReadWrite::new, "App.Api.ModbusTcp.ReadWrite");
 	}
 
+	/**
+	 * Test method for creating a {@link ModbusRtuApiReadOnly}.
+	 * 
+	 * @param t the {@link AppManagerTestBundle}
+	 * @return the {@link OpenemsApp} instance
+	 */
+	public static final ModbusRtuApiReadOnly modbusRtuApiReadOnly(AppManagerTestBundle t) {
+		return app(t, ModbusRtuApiReadOnly::new, "App.Api.ModbusRtu.ReadOnly");
+	}
+
+	/**
+	 * Test method for creating a {@link ModbusRtuApiReadWrite}.
+	 * 
+	 * @param t the {@link AppManagerTestBundle}
+	 * @return the {@link OpenemsApp} instance
+	 */
+	public static final ModbusRtuApiReadWrite modbusRtuApiReadWrite(AppManagerTestBundle t) {
+		return app(t, ModbusRtuApiReadWrite::new, "App.Api.ModbusRtu.ReadWrite");
+	}
+
 	/**
 	 * Test method for creating a {@link RestJsonApiReadOnly}.
 	 * 
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyApp.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyApp.java
index 245f4d5d20a..4965436cfa5 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyApp.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyApp.java
@@ -8,6 +8,7 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.function.TriFunction;
 import io.openems.common.oem.OpenemsEdgeOem;
 import io.openems.common.session.Language;
 import io.openems.edge.common.user.User;
@@ -26,6 +27,7 @@ public class DummyApp implements OpenemsApp {
 	private final AppAssistant appAssistant;
 	private final AppDescriptor appDescriptor;
 	private final ThrowingTriFunction<ConfigurationTarget, JsonObject, Language, AppConfiguration, OpenemsNamedException> configuration;
+	private final TriFunction<String, String, OpenemsAppInstance, String> propName;
 
 	public static class DummyAppBuilder {
 
@@ -42,6 +44,7 @@ public static class DummyAppBuilder {
 		private AppAssistant appAssistant;
 		private AppDescriptor appDescriptor;
 		private ThrowingTriFunction<ConfigurationTarget, JsonObject, Language, AppConfiguration, OpenemsNamedException> configuration;
+		private TriFunction<String, String, OpenemsAppInstance, String> propName;
 
 		private DummyAppBuilder() {
 		}
@@ -115,6 +118,11 @@ public DummyAppBuilder setConfiguration(
 			return this;
 		}
 
+		public DummyAppBuilder setPropName(TriFunction<String, String, OpenemsAppInstance, String> propName) {
+			this.propName = propName;
+			return this;
+		}
+
 		public DummyApp build() {
 			final var name = this.name == null ? this.appId : this.name;
 			return new DummyApp(//
@@ -128,8 +136,8 @@ public DummyApp build() {
 					this.properties.toArray(OpenemsAppPropertyDefinition[]::new), //
 					this.appAssistant == null ? AppAssistant.create(name).build() : this.appAssistant, //
 					this.appDescriptor == null ? AppDescriptor.create().build() : this.appDescriptor, //
-					this.configuration == null ? (t, u, s) -> AppConfiguration.empty() : this.configuration //
-			);
+					this.configuration == null ? (t, u, s) -> AppConfiguration.empty() : this.configuration, //
+					this.propName == null ? (t, u, s) -> t : this.propName);
 		}
 
 	}
@@ -155,8 +163,8 @@ public DummyApp(//
 			AppAssistant appAssistant, //
 			AppDescriptor appDescriptor, //
 			ThrowingTriFunction<ConfigurationTarget, JsonObject, //
-					Language, AppConfiguration, OpenemsNamedException> configuration //
-	) {
+					Language, AppConfiguration, OpenemsNamedException> configuration, //
+			TriFunction<String, String, OpenemsAppInstance, String> mapPropName) {
 		super();
 		this.appId = appId;
 		this.categories = categories;
@@ -169,6 +177,7 @@ public DummyApp(//
 		this.appAssistant = appAssistant;
 		this.appDescriptor = appDescriptor;
 		this.configuration = configuration;
+		this.propName = mapPropName;
 	}
 
 	@Override
@@ -232,4 +241,13 @@ public OpenemsAppPermissions getAppPermissions() {
 		return this.appPermissions;
 	}
 
+	@Override
+	public String mapPropName(String prop, String componentId, OpenemsAppInstance instance) {
+		return this.propName.apply(prop, componentId, instance);
+	}
+	
+	@Override
+	public boolean assertCanEdit(String prop, User user) {
+		return true;
+	}
 }
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyAppManagerAppHelper.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyAppManagerAppHelper.java
index 9ad1f56bc01..91ab3fa14c2 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyAppManagerAppHelper.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyAppManagerAppHelper.java
@@ -14,6 +14,7 @@
 import io.openems.edge.core.appmanager.dependency.TemporaryApps;
 import io.openems.edge.core.appmanager.dependency.UpdateValues;
 import io.openems.edge.core.appmanager.dependency.aggregatetask.AggregateTask;
+import io.openems.edge.core.appmanager.dependency.aggregatetask.AggregateTask.AggregateTaskExecutionConfiguration;
 
 public class DummyAppManagerAppHelper implements AppManagerAppHelper {
 
@@ -63,6 +64,12 @@ public UpdateValues deleteApp(User user, OpenemsAppInstance instance) throws Ope
 		return this.impl.deleteApp(user, instance);
 	}
 
+	@Override
+	public List<AggregateTaskExecutionConfiguration> getInstallConfiguration(User user, OpenemsAppInstance instance,
+			OpenemsApp app) throws OpenemsNamedException {
+		return this.impl.getInstallConfiguration(user, instance, app);
+	}
+
 	@Override
 	public TemporaryApps getTemporaryApps() {
 		return this.impl.getTemporaryApps();
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyPseudoComponentManager.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyPseudoComponentManager.java
index 9aba2d766eb..e2c8af440f4 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyPseudoComponentManager.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/DummyPseudoComponentManager.java
@@ -36,6 +36,7 @@
 import io.openems.common.types.EdgeConfig.ActualEdgeConfig;
 import io.openems.common.types.EdgeConfig.Component;
 import io.openems.common.utils.JsonUtils;
+import io.openems.common.utils.StreamUtils;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -389,4 +390,15 @@ public ServiceReference<?> getServiceReference() {
 
 	}
 
+	@Override
+	public Map<String, Object> getComponentProperties(String componentId) {
+		try {
+			var dic = this.getComponent(componentId).getComponentContext().getProperties();
+			return StreamUtils.dictionaryToStream(dic) //
+					.collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+		} catch (OpenemsNamedException e) {
+			return Collections.emptyMap();
+		}
+	}
+
 }
diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/UpdateComponentDirectlyTest.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/UpdateComponentDirectlyTest.java
new file mode 100644
index 00000000000..dc0f9136cd0
--- /dev/null
+++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/UpdateComponentDirectlyTest.java
@@ -0,0 +1,48 @@
+package io.openems.edge.core.appmanager;
+
+import static io.openems.edge.common.test.DummyUser.DUMMY_ADMIN;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.jsonrpc.request.CreateComponentConfigRequest;
+import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest;
+import io.openems.common.types.EdgeConfig;
+import io.openems.common.utils.JsonUtils;
+import io.openems.edge.core.appmanager.AppManagerTestBundle.PseudoComponentManagerFactory;
+import io.openems.edge.core.appmanager.jsonrpc.UpdateAppConfig;
+
+public class UpdateComponentDirectlyTest {
+	private AppManagerTestBundle appManagerTestBundle;
+
+	@Before
+	public void setUp() throws Exception {
+		this.appManagerTestBundle = new AppManagerTestBundle(null, null, t -> {
+			return ImmutableList.of(//
+
+			);
+		}, null, new PseudoComponentManagerFactory());
+	}
+
+	@Test
+	public void testAdminOnlyAsInstaller() throws OpenemsNamedException {
+		final var testTest = List.of(new UpdateComponentConfigRequest.Property("id", "evcs1"),
+				new UpdateComponentConfigRequest.Property("debugMode", false));
+		this.appManagerTestBundle.componentManger.handleCreateComponentConfigRequest(DUMMY_ADMIN,
+				new CreateComponentConfigRequest("Evcs.Keba.KeContact", testTest));
+		this.appManagerTestBundle.sut.handleUpdateAppConfigRequest(DUMMY_ADMIN,
+				new UpdateAppConfig.Request("evcs1", JsonUtils.buildJsonObject().addProperty("debugMode", true)//
+						.build()));
+		final var properties = JsonUtils.buildJsonObject()//
+				.addProperty("debugMode", true)//
+				.build();
+		this.appManagerTestBundle
+				.assertComponentExist(new EdgeConfig.Component("evcs1", "", "Evcs.Keba.KeContact", properties));
+
+	}
+}
diff --git a/io.openems.edge.edge2edge/src/io/openems/edge/edge2edge/ess/Edge2EdgeEss.java b/io.openems.edge.edge2edge/src/io/openems/edge/edge2edge/ess/Edge2EdgeEss.java
index f80c88ee79a..bc21f46680e 100644
--- a/io.openems.edge.edge2edge/src/io/openems/edge/edge2edge/ess/Edge2EdgeEss.java
+++ b/io.openems.edge.edge2edge/src/io/openems/edge/edge2edge/ess/Edge2EdgeEss.java
@@ -12,11 +12,13 @@ public interface Edge2EdgeEss extends OpenemsComponent {
 
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		MINIMUM_POWER_SET_POINT(Doc.of(OpenemsType.FLOAT) //
-				.accessMode(AccessMode.READ_ONLY)//
-				.unit(Unit.WATT)), //
+				.accessMode(AccessMode.READ_ONLY) //
+				.unit(Unit.WATT) //
+				.text("Minimum available active power")), //
 		MAXIMUM_POWER_SET_POINT(Doc.of(OpenemsType.FLOAT) //
 				.accessMode(AccessMode.READ_ONLY)//
-				.unit(Unit.WATT)), //
+				.unit(Unit.WATT) //
+				.text("Maximum available electrical power")), //
 		REMOTE_SET_ACTIVE_POWER_EQUALS(Doc.of(OpenemsType.FLOAT) //
 				.accessMode(AccessMode.WRITE_ONLY)//
 				.unit(Unit.WATT)), //
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java
index 36565ec140f..d840fe149d3 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java
@@ -68,6 +68,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		SET_ACTIVE_POWER_EQUALS(new IntegerDoc() //
 				.unit(Unit.WATT) //
 				.accessMode(AccessMode.WRITE_ONLY) //
+				.text("Write command for a charge power (-) or discharge power (+). Range e.g. [-5000 to 5000]") //
 				.onChannelSetNextWrite(
 						new PowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS))),
 
@@ -120,6 +121,7 @@ public void accept(ManagedSymmetricEss ess, Integer value) throws OpenemsNamedEx
 		SET_REACTIVE_POWER_EQUALS(new IntegerDoc() //
 				.unit(Unit.VOLT_AMPERE_REACTIVE) //
 				.accessMode(AccessMode.WRITE_ONLY) //
+				.text("Write command for the reactive power") //
 				.onChannelSetNextWrite(
 						new PowerConstraint("SetReactivePowerEquals", Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS))), //
 		/**
@@ -135,6 +137,7 @@ public void accept(ManagedSymmetricEss ess, Integer value) throws OpenemsNamedEx
 		SET_ACTIVE_POWER_LESS_OR_EQUALS(new IntegerDoc() //
 				.unit(Unit.WATT) //
 				.accessMode(AccessMode.WRITE_ONLY) //
+				.text("Write command for a minimum charge power (-) or maximum discharge power (+). Range e.g. [-5000 to 5000]") //
 				.onChannelSetNextWrite(new PowerConstraint("SetActivePowerLessOrEquals", Phase.ALL, Pwr.ACTIVE,
 						Relationship.LESS_OR_EQUALS))), //
 		/**
@@ -150,6 +153,7 @@ public void accept(ManagedSymmetricEss ess, Integer value) throws OpenemsNamedEx
 		SET_ACTIVE_POWER_GREATER_OR_EQUALS(new IntegerDoc() //
 				.unit(Unit.WATT) //
 				.accessMode(AccessMode.WRITE_ONLY) //
+				.text("Write command for a maximum charge power (-) or minimum discharge power (+). Range e.g. [-5000 to 5000]") //
 				.onChannelSetNextWrite(new PowerConstraint("SetActivePowerGreaterOrEquals", Phase.ALL, Pwr.ACTIVE,
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
@@ -165,6 +169,7 @@ public void accept(ManagedSymmetricEss ess, Integer value) throws OpenemsNamedEx
 		SET_REACTIVE_POWER_LESS_OR_EQUALS(new IntegerDoc() //
 				.unit(Unit.VOLT_AMPERE_REACTIVE) //
 				.accessMode(AccessMode.WRITE_ONLY) //
+				.text("Write command for the maximum reactive power") //
 				.onChannelSetNextWrite(new PowerConstraint("SetReactivePowerLessOrEquals", Phase.ALL, Pwr.REACTIVE,
 						Relationship.LESS_OR_EQUALS))), //
 		/**
@@ -180,6 +185,7 @@ public void accept(ManagedSymmetricEss ess, Integer value) throws OpenemsNamedEx
 		SET_REACTIVE_POWER_GREATER_OR_EQUALS(new IntegerDoc() //
 				.unit(Unit.VOLT_AMPERE_REACTIVE) //
 				.accessMode(AccessMode.WRITE_ONLY) //
+				.text("Write command for the maximum reactive power") //
 				.onChannelSetNextWrite(new PowerConstraint("SetReactivePowerGreaterOrEquals", Phase.ALL, Pwr.REACTIVE,
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java
index 4f14108fd5e..04e27c3b2e1 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java
@@ -32,7 +32,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		SOC(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.PERCENT) //
-				.persistencePriority(PersistencePriority.HIGH)),
+				.persistencePriority(PersistencePriority.HIGH) //
+				.text("State of Charge of the energy storage system")), //
 		/**
 		 * Capacity.
 		 *
@@ -57,7 +58,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * </ul>
 		 */
 		GRID_MODE(Doc.of(GridMode.values()) //
-				.persistencePriority(PersistencePriority.HIGH)),
+				.persistencePriority(PersistencePriority.HIGH) //
+				.text("Current power grid mode; 1:On-Grid, 2:Off-Grid")), //
 		/**
 		 * Active Power.
 		 *
@@ -71,7 +73,9 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		ACTIVE_POWER(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT) //
 				.persistencePriority(PersistencePriority.HIGH) //
-				.text("Negative values for Charge; positive for Discharge") //
+				.text("Discharge or charging Power (including DC-PV power, if applicable)."
+						+ " For the actual charging or discharging power of the battery, please refer to address"
+						+ " \"ess0/DcDischargePower\". Negative values for charge; positive for discharge.") //
 		),
 		/**
 		 * Reactive Power.
@@ -85,6 +89,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		REACTIVE_POWER(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.VOLT_AMPERE_REACTIVE) //
 				.persistencePriority(PersistencePriority.HIGH) //
+				.text("Current value of the reactive power")//
 		),
 		/**
 		 * Holds the currently maximum possible apparent power. This value is commonly
@@ -138,7 +143,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		MIN_CELL_VOLTAGE(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.MILLIVOLT) //
-				.persistencePriority(PersistencePriority.HIGH)),
+				.persistencePriority(PersistencePriority.HIGH) //
+				.text("Minimum cell voltage")), //
 		/**
 		 * Max Cell Voltage.
 		 *
@@ -153,7 +159,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		MAX_CELL_VOLTAGE(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.MILLIVOLT) //
-				.persistencePriority(PersistencePriority.HIGH)),
+				.persistencePriority(PersistencePriority.HIGH) //
+				.text("Maximum cell voltage")), //
 		/**
 		 * Min Cell Temperature.
 		 *
@@ -168,7 +175,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		MIN_CELL_TEMPERATURE(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.DEGREE_CELSIUS) //
-				.persistencePriority(PersistencePriority.HIGH)),
+				.persistencePriority(PersistencePriority.HIGH) //
+				.text("Minimum cell temperature")), //
 		/**
 		 * Max Cell Temperature.
 		 *
@@ -183,7 +191,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 */
 		MAX_CELL_TEMPERATURE(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.DEGREE_CELSIUS) //
-				.persistencePriority(PersistencePriority.HIGH));
+				.persistencePriority(PersistencePriority.HIGH) //
+				.text("Maximum cell temperature")); //
 
 		private final Doc doc;
 
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java
index 3f0c194c5a1..1777480da1c 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadUtils.java
@@ -27,6 +27,7 @@ public class HardyBarthReadUtils {
 	private final EvcsHardyBarthImpl parent;
 
 	private int errorCounter = 0;
+	private int undefinedErrorCounter = 0;
 
 	public HardyBarthReadUtils(EvcsHardyBarthImpl parent) {
 		this.parent = parent;
@@ -58,9 +59,20 @@ protected void setEvcsChannelIds(JsonElement json, PhaseRotation phaseRotation)
 				"secc", "port0", "metering", "energy", "active_import", "actual"));
 
 		// Current
-		final var currentL1 = getAsIntOrElse(json, 0, "secc", "port0", "metering", "current", "ac", "l1", "actual");
-		final var currentL2 = getAsIntOrElse(json, 0, "secc", "port0", "metering", "current", "ac", "l2", "actual");
-		final var currentL3 = getAsIntOrElse(json, 0, "secc", "port0", "metering", "current", "ac", "l3", "actual");
+		final var currentL1 = getAsInteger(json, 1, "secc", "port0", "metering", "current", "ac", "l1", "actual");
+		final var currentL2 = getAsInteger(json, 1, "secc", "port0", "metering", "current", "ac", "l2", "actual");
+		final var currentL3 = getAsInteger(json, 1, "secc", "port0", "metering", "current", "ac", "l3", "actual");
+
+		// Checks if value are null and if they are checks if its the third error or
+		// more
+		// and otherwise returns, so that no new values are written this cycle
+		// TODO: find a better long term solution
+		if (currentL1 == null || currentL2 == null || currentL3 == null) {
+			this.parent.logDebug("Invalid current values detected");
+			if (this.handleUndefinedError()) {
+				return;
+			}
+		}
 
 		// Power
 		final var activePowerL1 = getAsInteger(json, SCALE_FACTOR_MINUS_1, //
@@ -75,6 +87,20 @@ protected void setEvcsChannelIds(JsonElement json, PhaseRotation phaseRotation)
 		final var voltageL2 = activePowerL2 == null ? null : round(activePowerL2 * 1_000_000F / currentL2);
 		final var voltageL3 = activePowerL3 == null ? null : round(activePowerL3 * 1_000_000F / currentL3);
 
+		if (activePowerL1 == null || activePowerL2 == null || activePowerL3 == null) {
+			this.parent.logDebug("Active power values are null");
+			if (this.handleUndefinedError()) {
+				return;
+			}
+		}
+
+		if (voltageL1 == null || voltageL2 == null || voltageL3 == null) {
+			this.parent.logDebug("Voltage values are null");
+			if (this.handleUndefinedError()) {
+				return;
+			}
+		}
+
 		var rp = RotatedPhases.from(phaseRotation, //
 				voltageL1, currentL1, activePowerL1, //
 				voltageL2, currentL2, activePowerL2, //
@@ -101,7 +127,16 @@ protected void setEvcsChannelIds(JsonElement json, PhaseRotation phaseRotation)
 				"secc", "port0", "metering", "power", "active_total", "actual")) //
 				.map(p -> p < 100 ? 0 : p) // Ignore the consumption of the charger itself
 				.orElse(null);
+
+		if (activePower == null) {
+			this.parent.logDebug("Active Power invalid");
+			if (this.handleUndefinedError()) {
+				return;
+			}
+		}
+
 		this.parent._setActivePower(activePower);
+		this.undefinedErrorCounter = 0;
 
 		// STATUS
 		var status = getValueFromJson(STRING, json, value -> {
@@ -163,13 +198,9 @@ private static Integer getAsInteger(JsonElement json, float scaleFactor, String.
 				jsonPaths);
 	}
 
-	private static int getAsIntOrElse(JsonElement json, int orElse, String... jsonPaths) {
-		var result = getValueFromJson(INTEGER, json, //
-				value -> TypeUtils.<Integer>getAsType(INTEGER, value), //
-				jsonPaths);
-		return result == null //
-				? orElse //
-				: result;
+	private boolean handleUndefinedError() {
+		this.undefinedErrorCounter++;
+		return this.undefinedErrorCounter <= 3;
 	}
 
 	/**
diff --git a/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/EvcsHardyBarthImplTest.java b/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/EvcsHardyBarthImplTest.java
index 8ecb6c334bc..1d352a5a9b5 100644
--- a/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/EvcsHardyBarthImplTest.java
+++ b/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/EvcsHardyBarthImplTest.java
@@ -107,6 +107,55 @@ public void test() throws Exception {
 				);
 	}
 
+	@Test
+	public void testHandleUndefinedCheck() throws Exception {
+		final var phaseRotation = L2_L3_L1;
+		var sut = new EvcsHardyBarthImpl();
+		var ru = sut.readUtils;
+		new ComponentTest(sut) //
+				.addReference("httpBridgeFactory", ofDummyBridge()) //
+				.activate(MyConfig.create() //
+						.setId("evcs0") //
+						.setIp("192.168.8.101") //
+						.setMaxHwCurrent(32_000) //
+						.setMinHwCurrent(6_000) //
+						.setPhaseRotation(phaseRotation).build())
+
+				.next(new TestCase() //
+						.onBeforeProcessImage(() -> ru
+								.handleGetApiCallResponse(new HttpResponse<String>(OK, API_RESPONSE), phaseRotation)) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 3192) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, 1044) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, 1075) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, 1073) //
+						.output(ElectricityMeter.ChannelId.CURRENT, 14_770) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, 4_770) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, 5_000) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, 5_000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, 216_156) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 218_868) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, 215_000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, 214_600) //
+				)
+				// Values are not overwritten when empty/null response from api
+				.next(new TestCase() //
+						.onBeforeProcessImage(() -> ru.handleGetApiCallResponse(
+								new HttpResponse<String>(OK, EMPTY_API_RESPONSE), phaseRotation)) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER, 3192) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L1, 1044) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L2, 1075) //
+						.output(ElectricityMeter.ChannelId.ACTIVE_POWER_L3, 1073) //
+						.output(ElectricityMeter.ChannelId.CURRENT, 14_770) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L1, 4_770) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L2, 5_000) //
+						.output(ElectricityMeter.ChannelId.CURRENT_L3, 5_000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE, 216_156) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L1, 218_868) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L2, 215_000) //
+						.output(ElectricityMeter.ChannelId.VOLTAGE_L3, 214_600) //
+				);
+	}
+
 	private static final String API_RESPONSE = """
 			{
 			   "device":{
@@ -275,4 +324,174 @@ public void test() throws Exception {
 			   }
 			}
 			""";
+
+	private static final String EMPTY_API_RESPONSE = """
+			{
+			   "device":{
+			      "product":null,
+			      "modelname":null,
+			      "hardware_version":null,
+			      "software_version":null,
+			      "vcs_version":null,
+			      "hostname":null,
+			      "mac_address":null,
+			      "serial":null,
+			      "uuid":null,
+			      "internal_id":null
+			   },
+			   "secc":{
+			      "port0":{
+			         "ci":{
+			            "evse":{
+			               "basic":{
+			                  "grid_current_limit":{
+			                     "actual":null
+			                  },
+			                  "phase_count":null,
+			                  "physical_current_limit":null,
+			                  "offered_current_limit":null
+			               },
+			               "phase":{
+			                  "actual":null
+			               }
+			            },
+			            "charge":{
+			               "cp":{
+			                  "status":null
+			               },
+			               "plug":{
+			                  "status":null
+			               },
+			               "contactor":{
+			                  "status":null
+			               },
+			               "pwm":{
+			                  "status":null
+			               }
+			            }
+			         },
+			         "salia":{
+			            "chargemode":null,
+			            "thermal":null,
+			            "mem":null,
+			            "uptime":null,
+			            "load":null,
+			            "chargedata":null,
+			            "authmode":null,
+			            "firmwarestate":null,
+			            "firmwareprogress":null,
+			            "heartbeat":null,
+			            "pausecharging":null
+			         },
+			         "session":{
+			            "authorization_status":null
+			         },
+			         "contactor":{
+			            "state":{
+			               "hlc_target":null,
+			               "actual":null,
+			               "target":null
+			            },
+			            "error":null
+			         },
+			         "metering":{
+			            "meter":{
+			               "serialnumber":null,
+			               "type":null,
+			               "available":null
+			            },
+			            "eichrecht_protocol":null,
+			            "power":{
+			               "active":{
+			                  "ac":{
+			                     "l1":{
+			                        "actual":null
+			                     },
+			                     "l2":{
+			                        "actual":null
+			                     },
+			                     "l3":{
+			                        "actual":null
+			                     }
+			                  }
+			               },
+			               "active_total":{
+			                  "actual":null
+			               }
+			            },
+			            "current":{
+			               "ac":{
+			                  "l1":{
+			                     "actual":null
+			                  },
+			                  "l2":{
+			                     "actual":null
+			                  },
+			                  "l3":{
+			                     "actual":null
+			                  }
+			               }
+			            },
+			            "energy":{
+			               "active_total":{
+			                  "actual":null
+			               },
+			               "active_export":{
+			                  "actual":null
+			               },
+			               "active_import":{
+			                  "actual":null
+			               }
+			            }
+			         },
+			         "emergency_shutdown":null,
+			         "rcd":{
+			            "feedback":{
+			               "available":null
+			            },
+			            "state":{
+			               "actual":null
+			            },
+			            "recloser":{
+			               "available":null
+			            }
+			         },
+			         "plug_lock":{
+			            "state":{
+			               "actual":null,
+			               "target":null
+			            },
+			            "error":null
+			         },
+			         "availability":{
+			            "actual":null
+			         },
+			         "cp":{
+			            "pwm_state":{
+			               "actual":null
+			            },
+			            "state":null,
+			            "duty_cycle":null
+			         },
+			         "rfid":{
+			            "available":null,
+			            "authorizereq":null
+			         },
+			         "diode_present":null,
+			         "cable_current_limit":null,
+			         "ready_for_slac":null,
+			         "ev_present":null,
+			         "ventilation":{
+			            "state":{
+			               "actual":null
+			            },
+			            "available":null
+			         },
+			         "charging":null,
+			         "grid_current_limit":null
+			      }
+			   }
+			}
+			""";
+
 }
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java
index 2de80ca9f6b..4e2487d2df0 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContact.java
@@ -15,7 +15,6 @@
 import io.openems.edge.common.modbusslave.ModbusType;
 import io.openems.edge.evcs.api.Evcs;
 import io.openems.edge.evcs.api.ManagedEvcs;
-import io.openems.edge.evcs.api.Status;
 import io.openems.edge.meter.api.ElectricityMeter;
 
 public interface EvcsKebaKeContact
@@ -46,13 +45,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/*
 		 * Report 2
 		 */
-		STATUS_KEBA(Doc.of(Status.values()) //
-				.text("Current state of the charging station")),
+		R2_STATE(Doc.of(R2State.values())), //
 		ERROR_1(Doc.of(OpenemsType.INTEGER) //
 				.text("Detail code for state ERROR; exceptions see FAQ on www.kecontact.com")), //
 		ERROR_2(Doc.of(OpenemsType.INTEGER) //
 				.text("Detail code for state ERROR; exceptions see FAQ on www.kecontact.com")), //
-		PLUG(Doc.of(Plug.values())), //
+		R2_PLUG(Doc.of(R2Plug.values())), //
 		ENABLE_SYS(Doc.of(OpenemsType.BOOLEAN) //
 				.text("Enable state for charging (contains Enable input, RFID, UDP,..)")), //
 		ENABLE_USER(Doc.of(OpenemsType.BOOLEAN) //
@@ -145,10 +143,10 @@ private ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode accessMode)
 				.channel(16, EvcsKebaKeContact.ChannelId.SERIAL, ModbusType.STRING16)
 				.channel(32, EvcsKebaKeContact.ChannelId.FIRMWARE, ModbusType.STRING16)
 				.channel(48, EvcsKebaKeContact.ChannelId.COM_MODULE, ModbusType.STRING16)
-				.channel(64, EvcsKebaKeContact.ChannelId.STATUS_KEBA, ModbusType.UINT16)
+				.channel(64, EvcsKebaKeContact.ChannelId.R2_STATE, ModbusType.UINT16)
 				.channel(65, EvcsKebaKeContact.ChannelId.ERROR_1, ModbusType.UINT16)
 				.channel(66, EvcsKebaKeContact.ChannelId.ERROR_2, ModbusType.UINT16)
-				.channel(67, EvcsKebaKeContact.ChannelId.PLUG, ModbusType.UINT16)
+				.channel(67, EvcsKebaKeContact.ChannelId.R2_PLUG, ModbusType.UINT16)
 				.channel(68, EvcsKebaKeContact.ChannelId.ENABLE_SYS, ModbusType.UINT16)
 				.channel(69, EvcsKebaKeContact.ChannelId.ENABLE_USER, ModbusType.UINT16)
 				.channel(70, EvcsKebaKeContact.ChannelId.MAX_CURR_PERCENT, ModbusType.UINT16)
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2Plug.java
similarity index 53%
rename from io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java
rename to io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2Plug.java
index 1ca34e1c7a6..148a3540b86 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2Plug.java
@@ -2,18 +2,41 @@
 
 import io.openems.common.types.OptionsEnum;
 
-public enum Plug implements OptionsEnum {
+public enum R2Plug implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
+	/**
+	 * No cable is plugged.
+	 */
 	UNPLUGGED(0, "Unplugged"), //
+	/**
+	 * Cable is plugged into charging station.
+	 */
 	PLUGGED_ON_EVCS(1, "Plugged on EVCS"), //
+	/**
+	 * Cable is plugged into charging station and locked.
+	 * 
+	 * <p>
+	 * This is the default idle state for all devices with permanently attached
+	 * cable.
+	 */
 	PLUGGED_ON_EVCS_AND_LOCKED(3, "Plugged on EVCS and locked"), //
+	/**
+	 * Cable is plugged into charging station and vehicle but not locked.
+	 */
 	PLUGGED_ON_EVCS_AND_ON_EV(5, "Plugged on EVCS and on EV"), //
+	/**
+	 * Cable is plugged into charging station and vehicle, furthermore the cable is
+	 * locked.
+	 * 
+	 * <p>
+	 * Charging is not possible until plug state "7" is reached.
+	 */
 	PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED(7, "Plugged on EVCS and on EV and locked");
 
 	private final int value;
 	private final String name;
 
-	private Plug(int value, String name) {
+	private R2Plug(int value, String name) {
 		this.value = value;
 		this.name = name;
 	}
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2State.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2State.java
new file mode 100644
index 00000000000..ac27b229300
--- /dev/null
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/R2State.java
@@ -0,0 +1,56 @@
+package io.openems.edge.evcs.keba.kecontact;
+
+import io.openems.common.types.OptionsEnum;
+
+public enum R2State implements OptionsEnum {
+	UNDEFINED(-1, "Undefined"), //
+	/**
+	 * Startup.
+	 */
+	STARTUP(0, "Startup"), //
+	/**
+	 * Not ready for charging. Charging station is not connected to a vehicle, is
+	 * locked by the authorization function or another mechanism.
+	 */
+	NOT_READY(1, "Not ready"), //
+	/**
+	 * Ready for charging and waiting for reaction from vehicle.
+	 */
+	READY(2, "Ready"), //
+	/**
+	 * Charging.
+	 */
+	CHARGING(3, "Charging"), //
+	/**
+	 * Error is present.
+	 */
+	ERROR(4, "Error"), //
+	/**
+	 * Charging process temporarily interrupted because temperature is too high or
+	 * any other voter denies.
+	 */
+	INTERRUPTED(5, "Interrupted");
+
+	private final int value;
+	private final String name;
+
+	private R2State(int value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	@Override
+	public int getValue() {
+		return this.value;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public OptionsEnum getUndefined() {
+		return UNDEFINED;
+	}
+}
\ No newline at end of file
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
index 69208c18c90..a19fca836c3 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
@@ -1,5 +1,6 @@
 package io.openems.edge.evcs.keba.kecontact;
 
+import static io.openems.common.utils.FunctionUtils.doNothing;
 import static io.openems.common.utils.JsonUtils.getAsOptionalInt;
 import static io.openems.common.utils.JsonUtils.getAsOptionalLong;
 import static io.openems.common.utils.JsonUtils.getAsOptionalString;
@@ -31,6 +32,7 @@ public class ReadHandler implements Consumer<String> {
 
 	private final Logger log = LoggerFactory.getLogger(ReadHandler.class);
 	private final EvcsKebaKeContactImpl parent;
+	private final EnergySessionHandler energySessionHandler = new EnergySessionHandler();
 
 	private boolean receiveReport1 = false;
 	private boolean receiveReport2 = false;
@@ -98,45 +100,45 @@ public void accept(String message) {
 		 */
 		case "2" -> {
 			this.receiveReport2 = true;
-			this.setInt(EvcsKebaKeContact.ChannelId.STATUS_KEBA, j, "State");
+
+			// Parse Status and Plug immediately
+			this.setInt(EvcsKebaKeContact.ChannelId.R2_STATE, j, "State");
+			final R2State r2State = keba.channel(EvcsKebaKeContact.ChannelId.R2_STATE).getNextValue().asEnum();
+			final R2Plug r2Plug = this.setPlug(j);
 
 			// Value "setenergy" not used, because it is reset by the currtime 0 1 command
 
 			// Set Evcs status
-			Channel<Status> stateChannel = keba.channel(EvcsKebaKeContact.ChannelId.STATUS_KEBA);
-			Channel<Plug> plugChannel = keba.channel(EvcsKebaKeContact.ChannelId.PLUG);
-
-			Plug plug = plugChannel.value().asEnum();
-			Status status = stateChannel.value().asEnum();
-			if (plug.equals(Plug.PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED)) {
-
-				// Charging is rejected (by the Software) if the plug is connected but the EVCS
-				// still not ready for charging.
-				if (status.equals(Status.NOT_READY_FOR_CHARGING)) {
-					status = Status.CHARGING_REJECTED;
-				}
+			var status = switch (r2Plug) {
+			case PLUGGED_ON_EVCS, PLUGGED_ON_EVCS_AND_LOCKED, PLUGGED_ON_EVCS_AND_ON_EV, UNDEFINED, UNPLUGGED //
+				-> Status.NOT_READY_FOR_CHARGING;
 
+			case PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED -> {
 				/*
 				 * Check if the maximum energy limit is reached, informs the user and sets the
 				 * status
 				 */
-				int limit = keba.getSetEnergyLimit().orElse(0);
-				int energy = keba.getEnergySession().orElse(0);
-				if (energy >= limit && limit != 0) {
-					status = Status.ENERGY_LIMIT_REACHED;
+				var limit = keba.getSetEnergyLimit().get();
+				var energy = keba.getEnergySession().get();
+				if (limit != null && energy != null && energy >= limit) {
+					yield Status.ENERGY_LIMIT_REACHED;
 				}
-			} else {
-				// Plug not fully connected
-				status = Status.NOT_READY_FOR_CHARGING;
+				yield switch (r2State) {
+				case UNDEFINED -> Status.UNDEFINED;
+				case STARTUP -> Status.STARTING;
+				case NOT_READY -> Status.NOT_READY_FOR_CHARGING;
+				case INTERRUPTED, READY -> Status.READY_FOR_CHARGING;
+				case CHARGING -> Status.CHARGING;
+				case ERROR -> Status.ERROR;
+				};
 			}
+			};
 
 			keba._setStatus(status);
-			var errorState = status == Status.ERROR == true;
-			keba.channel(EvcsKebaKeContact.ChannelId.CHARGINGSTATION_STATE_ERROR).setNextValue(errorState);
+			keba.channel(EvcsKebaKeContact.ChannelId.CHARGINGSTATION_STATE_ERROR).setNextValue(status == Status.ERROR);
 
 			this.setInt(EvcsKebaKeContact.ChannelId.ERROR_1, j, "Error1");
 			this.setInt(EvcsKebaKeContact.ChannelId.ERROR_2, j, "Error2");
-			this.setInt(EvcsKebaKeContact.ChannelId.PLUG, j, "Plug");
 			this.setBoolean(EvcsKebaKeContact.ChannelId.ENABLE_SYS, j, "Enable sys");
 			this.setBoolean(EvcsKebaKeContact.ChannelId.ENABLE_USER, j, "Enable user");
 			this.setInt(EvcsKebaKeContact.ChannelId.MAX_CURR_PERCENT, j, "Max curr %");
@@ -198,9 +200,10 @@ public void accept(String message) {
 							.map(e -> round(e * 0.1F)) //
 							.orElse(null));
 			keba._setEnergySession(//
-					getAsOptionalInt(j, "E pres") //
-							.map(e -> round(e * 0.1F)) //
-							.orElse(null));
+					this.energySessionHandler.updateFromReport3(//
+							getAsOptionalInt(j, "E pres") //
+									.map(e -> round(e * 0.1F)) //
+									.orElse(null)));
 
 			// TODO use COS_PHI to calculate ReactivePower
 			this.setInt(EvcsKebaKeContact.ChannelId.COS_PHI, j, "PF");
@@ -240,10 +243,10 @@ public void accept(String message) {
 		 */
 		default -> {
 			if (j.has("State")) {
-				this.setInt(EvcsKebaKeContact.ChannelId.STATUS_KEBA, j, "State");
+				this.setInt(EvcsKebaKeContact.ChannelId.R2_STATE, j, "State");
 			}
 			if (j.has("Plug")) {
-				this.setInt(EvcsKebaKeContact.ChannelId.PLUG, j, "Plug");
+				this.setPlug(j);
 			}
 			if (j.has("Input")) {
 				this.setBoolean(EvcsKebaKeContact.ChannelId.INPUT, j, "Input");
@@ -384,6 +387,14 @@ private void setString(ChannelId channelId, JsonObject jMessage, String name) {
 		this.set(channelId, getAsOptionalString(jMessage, name).orElse(null));
 	}
 
+	private R2Plug setPlug(JsonObject jMessage) {
+		final var channelId = EvcsKebaKeContact.ChannelId.R2_PLUG;
+		this.setInt(channelId, jMessage, "Plug");
+		final R2Plug r2Plug = this.parent.channel(channelId).getNextValue().asEnum();
+		this.energySessionHandler.updatePlug(r2Plug);
+		return r2Plug;
+	}
+
 	private void setInt(ChannelId channelId, JsonObject jMessage, String name) {
 		this.set(channelId, getAsOptionalInt(jMessage, name).orElse(null));
 	}
@@ -423,4 +434,36 @@ public boolean hasResultandReset(Report report) {
 		}
 		return result;
 	}
+
+	protected static class EnergySessionHandler {
+		private R2Plug r2Plug = R2Plug.UNDEFINED;
+		private Integer ePresOnUnplugged = null;
+
+		protected synchronized void updatePlug(R2Plug r2Plug) {
+			this.r2Plug = r2Plug;
+		}
+
+		public synchronized Integer updateFromReport3(Integer ePres) {
+			switch (this.r2Plug) {
+			case UNPLUGGED, // no cable
+					PLUGGED_ON_EVCS, PLUGGED_ON_EVCS_AND_LOCKED // not plugged on EV
+				-> this.ePresOnUnplugged = ePres > 0 ? ePres : null;
+			case UNDEFINED, // unsure
+					PLUGGED_ON_EVCS_AND_ON_EV, PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED // plugged on EV
+				-> doNothing();
+			}
+			if (this.ePresOnUnplugged == null) {
+				return ePres;
+			}
+			if (ePres == null) {
+				return null;
+			}
+			if (this.ePresOnUnplugged <= ePres) {
+				return null;
+			}
+			// reset
+			this.ePresOnUnplugged = null;
+			return ePres;
+		}
+	}
 }
diff --git a/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContactImplTest.java b/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContactImplTest.java
index db60737ebb8..5ed2f067016 100644
--- a/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContactImplTest.java
+++ b/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/EvcsKebaKeContactImplTest.java
@@ -1,8 +1,8 @@
 package io.openems.edge.evcs.keba.kecontact;
 
 import static io.openems.edge.evcs.api.PhaseRotation.L2_L3_L1;
-import static io.openems.edge.evcs.api.Status.CHARGING_REJECTED;
-import static io.openems.edge.evcs.keba.kecontact.Plug.PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED;
+import static io.openems.edge.evcs.keba.kecontact.R2Plug.PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED;
+import static io.openems.edge.evcs.keba.kecontact.R2State.INTERRUPTED;
 
 import org.junit.Test;
 
@@ -42,10 +42,10 @@ public void test() throws Exception {
 
 				.next(new TestCase() //
 						.onBeforeProcessImage(() -> rh.accept(REPORT_2)) //
-						.output(EvcsKebaKeContact.ChannelId.STATUS_KEBA, CHARGING_REJECTED) //
+						.output(EvcsKebaKeContact.ChannelId.R2_STATE, INTERRUPTED) //
 						.output(EvcsKebaKeContact.ChannelId.ERROR_1, 0) //
 						.output(EvcsKebaKeContact.ChannelId.ERROR_2, 0) //
-						.output(EvcsKebaKeContact.ChannelId.PLUG, PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED) //
+						.output(EvcsKebaKeContact.ChannelId.R2_PLUG, PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED) //
 						.output(EvcsKebaKeContact.ChannelId.ENABLE_SYS, false) //
 						.output(EvcsKebaKeContact.ChannelId.ENABLE_USER, false) //
 						.output(EvcsKebaKeContact.ChannelId.MAX_CURR_PERCENT, 1_000) //
diff --git a/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadHandlerTest.java b/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadHandlerTest.java
new file mode 100644
index 00000000000..f54d9e5d28c
--- /dev/null
+++ b/io.openems.edge.evcs.keba.kecontact/test/io/openems/edge/evcs/keba/kecontact/ReadHandlerTest.java
@@ -0,0 +1,39 @@
+package io.openems.edge.evcs.keba.kecontact;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+public class ReadHandlerTest {
+
+	@Test
+	public void testEnergySessionHandler() {
+		var sut = new ReadHandler.EnergySessionHandler();
+		sut.updatePlug(R2Plug.UNDEFINED);
+		assertNull(sut.updateFromReport3(null));
+
+		assertEquals(990, sut.updateFromReport3(990).intValue());
+
+		sut.updatePlug(R2Plug.PLUGGED_ON_EVCS_AND_ON_EV);
+		assertEquals(1000, sut.updateFromReport3(1000).intValue());
+
+		sut.updatePlug(R2Plug.UNPLUGGED);
+		assertNull(sut.updateFromReport3(1010));
+
+		sut.updatePlug(R2Plug.PLUGGED_ON_EVCS_AND_ON_EV);
+		assertNull(sut.updateFromReport3(1020));
+
+		sut.updatePlug(R2Plug.PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED);
+		assertEquals(500, sut.updateFromReport3(500).intValue());
+
+		sut.updatePlug(R2Plug.UNPLUGGED);
+		assertNull(sut.updateFromReport3(510));
+
+		sut.updatePlug(R2Plug.PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED);
+		assertNull(sut.updateFromReport3(510));
+
+		sut.updatePlug(R2Plug.PLUGGED_ON_EVCS_AND_ON_EV_AND_LOCKED);
+		assertEquals(20, sut.updateFromReport3(20).intValue());
+	}
+}
diff --git a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20.java b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20.java
index 05ed735239d..d4e9044d18d 100644
--- a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20.java
+++ b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20.java
@@ -20,4 +20,4 @@ public Doc doc() {
 		}
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java
index 1ac395603ea..159528ebcf8 100644
--- a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java
+++ b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java
@@ -152,6 +152,18 @@ private void activate(ComponentContext context, Config config) throws OpenemsExc
 						tasks = myTasks.toArray(Task[]::new);
 						break;
 					}
+
+					case UR20_16DI_P: {
+						var element = new BitsWordElement(inputRegisterOffset, this);
+						for (var i = 0; i < 16; i++) {
+							var channelId = FieldbusChannelId.forDigitalInput(moduleCount, i + 1);
+							var channel = (BooleanReadChannel) this.addChannel(channelId);
+							this.modules.get(module).add(channel);
+							element.bit(i, channelId);
+						}
+						tasks = new Task[] { new FC3ReadRegistersTask(element.startAddress, Priority.HIGH, element) };
+						break;
+					}
 					}
 
 					if (tasks == null || tasks.length == 0) {
@@ -237,4 +249,4 @@ private CompletableFuture<List<Long>> readCurrentModuleList(int numberOfEntries)
 				.thenApply(rsr -> ((ReadElementsResult<Long>) rsr).values());
 	}
 
-}
+}
\ No newline at end of file
diff --git a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/URemoteModule.java b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/URemoteModule.java
index cddc3bc8d71..7f4ea68c666 100644
--- a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/URemoteModule.java
+++ b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/URemoteModule.java
@@ -12,7 +12,7 @@ public enum URemoteModule {
 	// UR20_8DI_P_2W(0x00131FC1), //
 	// UR20_8DI_P_3W(0x000A1FC1), //
 	// UR20_8DI_P_3W_HD(0x00031FC1), //
-	// UR20_16DI_P(0x00049FC2), //
+	UR20_16DI_P(0x00049FC2, 2, 0), //
 	// UR20_16DI_P_PLC_INT(0x00059FC2), //
 	// UR20_2DI_P_TS(0x0F014700), //
 	// UR20_4DI_P_TS(0x0F024700), //
diff --git a/io.openems.edge.io.weidmueller/test/io/openems/edge/io/weidmueller/IoWeidmuellerUr20ImplTest.java b/io.openems.edge.io.weidmueller/test/io/openems/edge/io/weidmueller/IoWeidmuellerUr20ImplTest.java
index eadbf247bb5..19e62d5be1c 100644
--- a/io.openems.edge.io.weidmueller/test/io/openems/edge/io/weidmueller/IoWeidmuellerUr20ImplTest.java
+++ b/io.openems.edge.io.weidmueller/test/io/openems/edge/io/weidmueller/IoWeidmuellerUr20ImplTest.java
@@ -21,4 +21,4 @@ public void test() throws Exception {
 				.next(new TestCase());
 	}
 
-}
+}
\ No newline at end of file
diff --git a/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.html b/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.html
index c08da36f604..db62436e5d5 100644
--- a/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.html
+++ b/ui/src/app/edge/history/Controller/ModbusTcpApi/overview/overview.html
@@ -1,23 +1,23 @@
 <oe-chart *ngIf="isInitialized" [title]="component.alias">
     <modbusTcpApiChart [isOnlyChart]="true" [component]="component">
         <div *ngIf="this.component && this.component.factoryId === 'Controller.Api.ModbusTcp.ReadWrite'">
-        <ion-row class="ion-justify-content-center">
-            <ion-item class="ion-text-center" lines="none">
-                <ion-icon color="primary" size="large" slot="start" name="alert-outline"></ion-icon>
-                <ion-label class="ion-text-wrap">
-                    <ion-row class="ion-text-center" translate>
-                        <small translate>
-                            Edge.Index.Widgets.InfoStorageForCharge
-                        </small>
-                    </ion-row>
-                    <ion-row size="6" class="ion-text-center">
-                        <small translate>
-                             Edge.Index.Widgets.InfoStorageForDischarge
-                        </small>
-                    </ion-row>
-                </ion-label>
-            </ion-item>
-        </ion-row>
-    </div>
-</modbusTcpApiChart>
+            <ion-row class="ion-justify-content-center">
+                <ion-item class="ion-text-center" lines="none">
+                    <ion-icon color="primary" size="large" slot="start" name="alert-outline"></ion-icon>
+                    <ion-label class="ion-text-wrap">
+                        <ion-row class="ion-text-center" style="white-space: pre !important; width: 100%">
+                            <small translate>
+                                Edge.Index.Widgets.InfoStorageForCharge
+                            </small>
+                        </ion-row>
+                        <ion-row size="6" class="ion-text-center" style="white-space: pre !important; width: 100%">
+                            <small translate>
+                                Edge.Index.Widgets.InfoStorageForDischarge
+                            </small>
+                        </ion-row>
+                    </ion-label>
+                </ion-item>
+            </ion-row>
+        </div>
+    </modbusTcpApiChart>
 </oe-chart>
diff --git a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
index e145a52ca1e..4c6b7d56044 100644
--- a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
+++ b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html
@@ -43,12 +43,12 @@
                     <ion-item class="ion-text-center" lines="none">
                         <ion-icon color="primary" size="large" slot="start" name="alert-outline"></ion-icon>
                         <ion-label class="ion-text-wrap">
-                            <ion-row class="ion-text-center" translate>
+                            <ion-row class="ion-text-center" style="white-space: pre !important; width: 100%">
                                 <small translate>
                                     Edge.Index.Widgets.InfoStorageForCharge
                                 </small>
                             </ion-row>
-                            <ion-row size="6" class="ion-text-center">
+                            <ion-row size="6" class="ion-text-center" style="white-space: pre !important; width: 100%">
                                 <small translate>
                                     Edge.Index.Widgets.InfoStorageForDischarge
                                 </small>
@@ -75,12 +75,13 @@
                         <ion-item class="ion-text-center" lines="none">
                             <ion-icon color="primary" size="large" slot="start" name="alert-outline"></ion-icon>
                             <ion-label class="ion-text-wrap">
-                                <ion-row class="ion-text-center" translate>
+                                <ion-row class="ion-text-center" style="white-space: pre !important; width: 100%">
                                     <small translate>
                                         Edge.Index.Widgets.InfoStorageForCharge
                                     </small>
                                 </ion-row>
-                                <ion-row size="6" class="ion-text-center">
+                                <ion-row size="6" class="ion-text-center"
+                                    style="white-space: pre !important; width: 100%">
                                     <small translate>
                                         Edge.Index.Widgets.InfoStorageForDischarge
                                     </small>
@@ -119,12 +120,13 @@
                         <ion-item class="ion-text-center" lines="none">
                             <ion-icon color="primary" size="large" slot="start" name="alert-outline"></ion-icon>
                             <ion-label class="ion-text-wrap">
-                                <ion-row class="ion-text-center" translate>
+                                <ion-row class="ion-text-center" style="white-space: pre !important; width: 100%">
                                     <small translate>
                                         Edge.Index.Widgets.InfoStorageForCharge
                                     </small>
                                 </ion-row>
-                                <ion-row size="6" class="ion-text-center">
+                                <ion-row size="6" class="ion-text-center"
+                                    style="white-space: pre !important; width: 100%">
                                     <small translate>
                                         Edge.Index.Widgets.InfoStorageForDischarge
                                     </small>
diff --git a/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts b/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts
index c4a8ef62502..e55c75f18a4 100644
--- a/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts
+++ b/ui/src/app/edge/live/Controller/ModbusTcpApi/modal/modal.ts
@@ -47,8 +47,8 @@ export class ModalComponent extends AbstractModal {
     });
   }
 
-  protected getModbusProtocol(componentId: string) {
-    return this.profile.getModbusProtocol(componentId);
+  protected getModbusProtocol(componentId: string, type: string) {
+    return this.profile.getModbusProtocol(componentId, type);
   }
 
   protected override onCurrentData(currentData: CurrentData) {
diff --git a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html
index 56855d3e69d..137672073ef 100644
--- a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html
+++ b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html
@@ -10,7 +10,7 @@
 </ion-header>
 
 <div>
-    <ion-grid>
+    <ion-grid aria-hidden="false">
         <ion-row>
             <ion-col>
                 <formly-form [form]="form" [fields]="fields" [model]="myModel"></formly-form>
diff --git a/ui/src/app/edge/settings/profile/profile.component.html b/ui/src/app/edge/settings/profile/profile.component.html
index 9cde0096885..388f2734929 100644
--- a/ui/src/app/edge/settings/profile/profile.component.html
+++ b/ui/src/app/edge/settings/profile/profile.component.html
@@ -98,21 +98,27 @@ <h3>{{ item.alias }} <ion-icon *ngIf="edge.roleIsAtLeast('owner')" style="cursor
                       <!-- Additional information for specific Factory-IDs -->
                       <ng-container *ngFor="let factoryId of [item.factoryId]" [ngSwitch]="factoryId">
                         <ion-text *ngSwitchCase="'Controller.Api.ModbusTcp.ReadOnly'">
-                          <ion-button (click)="getModbusProtocol(item.id)">Download Protocol</ion-button>
+                          <ion-button (click)="getModbusProtocol(item.id,'tcp')">Download Protocol</ion-button>
                           <oe-help-button key="CONTROLLER_API_MODBUSTCP_READ">
                             <span translate>
                               General.manual
                             </span>
                           </oe-help-button>
                         </ion-text>
+                        <ion-text *ngSwitchCase="'Controller.Api.ModbusRtu.ReadOnly'">
+                          <ion-button (click)="getModbusProtocol(item.id,'rtu')">Download Protocol</ion-button>
+                        </ion-text>
                         <ion-text *ngSwitchCase="'Controller.Api.ModbusTcp.ReadWrite'">
-                          <ion-button (click)="getModbusProtocol(item.id)">Download Protocol</ion-button>
+                          <ion-button (click)="getModbusProtocol(item.id,'tcp')">Download Protocol</ion-button>
                           <oe-help-button key="CONTROLLER_API_MODBUSTCP_READWRITE">
                             <span translate>
                               General.manual
                             </span>
                           </oe-help-button>
                         </ion-text>
+                        <ion-text *ngSwitchCase="'Controller.Api.ModbusRtu.ReadWrite'">
+                          <ion-button (click)="getModbusProtocol(item.id,'rtu')">Download Protocol</ion-button>
+                        </ion-text>
                         <ion-text *ngSwitchCase="'Controller.Api.Rest.ReadOnly'">
                           <oe-help-button key="CONTROLLER_API_REST_READ">
                             <span translate>
diff --git a/ui/src/app/edge/settings/profile/profile.component.ts b/ui/src/app/edge/settings/profile/profile.component.ts
index cbc086d4715..ebd165df44e 100644
--- a/ui/src/app/edge/settings/profile/profile.component.ts
+++ b/ui/src/app/edge/settings/profile/profile.component.ts
@@ -46,11 +46,11 @@ export class ProfileComponent implements OnInit {
     });
   }
 
-  public getModbusProtocol(componentId: string) {
+  public getModbusProtocol(componentId: string, type: string) {
     this.service.getCurrentEdge().then(edge => {
       const request = new ComponentJsonApiRequest({ componentId: componentId, payload: new GetModbusProtocolExportXlsxRequest() });
       edge.sendRequest(this.service.websocket, request).then(response => {
-        Utils.downloadXlsx(response as Base64PayloadResponse, "Modbus-TCP-" + edge.id);
+        Utils.downloadXlsx(response as Base64PayloadResponse, "Modbus-" + type + "-" + edge.id);
       }).catch(reason => {
         this.service.toast(this.translate.instant("Edge.Config.PROFILE.ERROR_DOWNLOADING_MODBUS_PROTOCOL") + ": " + (reason as JsonrpcResponseError).error.message, "danger");
       });
diff --git a/ui/src/app/index/login.component.ts b/ui/src/app/index/login.component.ts
index 8c738c710ba..09b6ef14b49 100644
--- a/ui/src/app/index/login.component.ts
+++ b/ui/src/app/index/login.component.ts
@@ -19,16 +19,19 @@ import { UserComponent } from "../user/user.component";
   standalone: false,
 })
 export class LoginComponent implements ViewWillEnter, AfterContentChecked, OnDestroy, OnInit {
+
   public currentThemeMode: string;
   public environment = environment;
   public form: FormGroup;
   protected formIsDisabled: boolean = false;
   protected popoverActive: "android" | "ios" | null = null;
+  protected showPassword: boolean = false;
   protected readonly operatingSystem = AppService.deviceInfo.os;
   protected readonly isApp: boolean = Capacitor.getPlatform() !== "web";
   private stopOnDestroy: Subject<void> = new Subject<void>();
   private page = 0;
 
+
   constructor(
     public service: Service,
     public websocket: Websocket,
@@ -163,4 +166,5 @@ export class LoginComponent implements ViewWillEnter, AfterContentChecked, OnDes
       this.popoverActive = operatingSystem;
     }
   }
+
 }
diff --git a/ui/src/app/shared/components/edge/edgeconfig.spec.ts b/ui/src/app/shared/components/edge/edgeconfig.spec.ts
index e4d7ecfc6ec..1a94c6d8305 100644
--- a/ui/src/app/shared/components/edge/edgeconfig.spec.ts
+++ b/ui/src/app/shared/components/edge/edgeconfig.spec.ts
@@ -197,6 +197,18 @@ export namespace DummyConfig {
                 "io.openems.edge.timedata.api.TimedataProvider",
             ],
         };
+
+        export const MODBUS_RTU_READWRITE = {
+            id: "Controller.Api.ModbusRtu.ReadWrite",
+            natureIds: [
+                "io.openems.edge.common.jsonapi.JsonApi",
+                "io.openems.edge.common.component.OpenemsComponent",
+                "io.openems.edge.controller.api.modbus.ModbusRtuApi",
+                "io.openems.edge.controller.api.modbus.readwrite.ControllerApiModbusRtuReadWrite",
+                "io.openems.edge.controller.api.Controller",
+                "io.openems.edge.timedata.api.TimedataProvider",
+            ],
+        };
     }
 
     export namespace Component {
diff --git a/ui/src/app/shared/components/edge/edgeconfig.ts b/ui/src/app/shared/components/edge/edgeconfig.ts
index 0ddf42d24ca..92412cc06ae 100644
--- a/ui/src/app/shared/components/edge/edgeconfig.ts
+++ b/ui/src/app/shared/components/edge/edgeconfig.ts
@@ -183,6 +183,8 @@ export class EdgeConfig {
                         "Controller.Api.ModbusTcp",
                         "Controller.Api.ModbusTcp.ReadOnly",
                         "Controller.Api.ModbusTcp.ReadWrite",
+                        "Controller.Api.ModbusRtu.ReadOnly",
+                        "Controller.Api.ModbusRtu.ReadWrite",
                         "Controller.Api.MQTT",
                         "Controller.Api.Rest.ReadOnly",
                         "Controller.Api.Rest.ReadWrite",
diff --git a/ui/src/app/shared/components/formly/form-field.wrapper.ts b/ui/src/app/shared/components/formly/form-field.wrapper.ts
index 71ea84f9036..94410ddbb8d 100644
--- a/ui/src/app/shared/components/formly/form-field.wrapper.ts
+++ b/ui/src/app/shared/components/formly/form-field.wrapper.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component } from "@angular/core";
+import { ChangeDetectionStrategy, Component, ViewEncapsulation } from "@angular/core";
 import { FieldWrapper } from "@ngx-formly/core";
 
 @Component({
@@ -6,12 +6,12 @@ import { FieldWrapper } from "@ngx-formly/core";
     templateUrl: "./form-field.wrapper.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
     standalone: false,
+    encapsulation: ViewEncapsulation.None,
     styles: [`
-    :host {
-        formly-field-ion-toggle, formly-field-ion-checkbox{
-            width: 100%;
-        }
-    }
+            formly-field-ion-toggle, formly-field-ion-checkbox, formly-custom-select,
+            formly-input-serial-number {
+                width: 100%;
+            }
     `],
 })
 export class FormlyWrapperFormFieldComponent extends FieldWrapper { }
diff --git a/ui/src/app/shared/components/formly/formly-select/formly-select.ts b/ui/src/app/shared/components/formly/formly-select/formly-select.ts
new file mode 100644
index 00000000000..daf30a3f137
--- /dev/null
+++ b/ui/src/app/shared/components/formly/formly-select/formly-select.ts
@@ -0,0 +1,33 @@
+import { Component } from "@angular/core";
+import { FieldType } from "@ngx-formly/core";
+
+@Component({
+  selector: "formly-custom-select",
+  template: `
+    <ion-select
+        [id]="id"
+        [label]="props.label"
+        interface="alert"
+        labelPlacement="start"
+        justify="space-between"
+        [placeholder]="to.placeholder"
+        [formControl]="formControl"
+        [formlyAttributes]="field"
+      >
+                  <ng-container *ngFor="let option of props.options">
+                  <ion-select-option [value]="option.value">
+                  {{ option.label }}
+                  </ion-select-option>
+                  </ng-container>
+      </ion-select>
+  `,
+  standalone: false,
+  styles: [`
+      :host {
+        formly-custom-select {
+                width: 100%;
+            }
+      }
+      `],
+})
+export class FormlySelectComponent extends FieldType { }
diff --git a/ui/src/app/shared/components/formly/input-serial-number-wrapper.html b/ui/src/app/shared/components/formly/input-serial-number-wrapper.html
index 169d30f12e8..57459c47597 100644
--- a/ui/src/app/shared/components/formly/input-serial-number-wrapper.html
+++ b/ui/src/app/shared/components/formly/input-serial-number-wrapper.html
@@ -1,23 +1,24 @@
 <ion-grid>
-    <ion-row>
-        <ion-col size-lg="5" size-md="5" size-sm="5" size="12">
-            <ion-item lines="none">
-                <ion-label [position]="to.labelPosition" style="max-width:none">
-                    <span>{{to.label}}</span>
-                    <span *ngIf="to.required && to.hideRequiredMarker !== true">*</span>
-                    <span *ngIf="to.description"><br /><small>{{ to.description }}</small></span>
-                </ion-label>
-            </ion-item>
-        </ion-col>
-        <ion-col size-lg="7" size-md="7" size-sm="7" size="12">
-            <ion-item [lines]="to.itemLines">
-                <span *ngIf="to.prefix" style="color: rgb(150,150,150)">{{to.prefix}}</span>
-                <ion-input [formControl]="formControl" [formlyAttributes]="field" text-left></ion-input>
+    <ion-row class="ion-no-padding">
+        <ion-col size="12">
+
+            <ion-item class="ion-no-padding">
+                <ion-input placeholder="{{props.placeholder}}" [type]="props.type || 'text'" [formControl]="formControl"
+                    labelPlacement="start" style="text-align: right">
+                    <div style="text-align: left;">
+                        <ion-label [position]="props.labelPosition">
+                            <span>{{ props.label }}</span>
+                            <span *ngIf="props.required && props.hideRequiredMarker !== true">*</span>
+                            <span><br /><small> {{ props.description
+                                    }}</small></span>
+                        </ion-label>
+                    </div>
+                </ion-input>
             </ion-item>
         </ion-col>
     </ion-row>
-    <ion-row>
-        <ion-col offset-lg="5" offset-md="5" offset-sm="5">
+    <ion-row class="ion-no-padding">
+        <ion-col offset-lg="5" offset-md="5" offset-sm="5" class="ion-no-padding">
             <ion-item lines="none" *ngIf="showError">
                 <ion-label class="ion-text-wrap">
                     <ion-text color="danger">
diff --git a/ui/src/app/shared/components/formly/input.html b/ui/src/app/shared/components/formly/input.html
index 49f9db44c50..5d8f34cf7e9 100644
--- a/ui/src/app/shared/components/formly/input.html
+++ b/ui/src/app/shared/components/formly/input.html
@@ -4,12 +4,13 @@
 </ion-input>
 <ng-template #noNumberInput>
     <ion-input placeholder="{{props.placeholder}}" [type]="props.type || 'text'" [formControl]="formControl"
-        style="text-align: right" labelPlacement="start" justify="space-between">
+        labelPlacement="start" style="text-align: right">
         <div style="text-align: left;">
-            <ion-label [position]="to.labelPosition">
-                <span>{{ to.label }}</span>
-                <span *ngIf="to.required && to.hideRequiredMarker !== true">*</span>
-                <span *ngIf="to.description"><br /><small>{{ to.description }}</small></span>
+            <ion-label [position]="props.labelPosition">
+                <span>{{ props.label }}</span>
+                <span *ngIf="props.required && props.hideRequiredMarker !== true">*</span>
+                <span><br /><small> {{ props.description
+                        }}</small></span>
             </ion-label>
         </div>
     </ion-input>
diff --git a/ui/src/app/shared/components/formly/input.ts b/ui/src/app/shared/components/formly/input.ts
index 4b3dcaf4647..71642277be9 100644
--- a/ui/src/app/shared/components/formly/input.ts
+++ b/ui/src/app/shared/components/formly/input.ts
@@ -1,10 +1,11 @@
-import { Component } from "@angular/core";
+import { Component, ViewEncapsulation } from "@angular/core";
 import { FieldType } from "@ngx-formly/core";
 
 @Component({
     selector: "formly-input-section",
     templateUrl: "./input.html",
     standalone: false,
+    encapsulation: ViewEncapsulation.None,
     styles: [`
     :host {
         min-width: fit-content;
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index c4ac3d7797c..62443764f46 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -20,6 +20,7 @@ import { FormlyWrapperFormFieldComponent } from "./components/formly/form-field.
 import { FormlyFieldCheckboxWithImageComponent } from "./components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image";
 import { FormlyFieldModalComponent } from "./components/formly/formly-field-modal/formlyfieldmodal";
 import { FormlyFieldRadioWithImageComponent } from "./components/formly/formly-field-radio-with-image/formly-field-radio-with-image";
+import { FormlySelectComponent } from "./components/formly/formly-select/formly-select";
 import { FormlySelectFieldModalComponent } from "./components/formly/formly-select-field-modal.component";
 import { FormlySelectFieldExtendedWrapperComponent } from "./components/formly/formly-select-field.extended";
 import { FormlyFieldWithLoadingAnimationComponent } from "./components/formly/formly-skeleton-wrapper";
@@ -79,6 +80,7 @@ export function SubnetmaskValidatorMessage(err, field: FormlyFieldConfig) {
         { name: "input", component: InputTypeComponent },
         { name: "repeat", component: RepeatTypeComponent },
         { name: "multi-step", component: FormlyFieldMultiStepComponent },
+        { name: "select", component: FormlySelectComponent },
       ],
       validators: [
         { name: "ip", validation: IpValidator },
@@ -121,6 +123,7 @@ export function SubnetmaskValidatorMessage(err, field: FormlyFieldConfig) {
     PanelWrapperComponent,
     PercentageBarComponent,
     RepeatTypeComponent,
+    FormlySelectComponent,
   ],
   exports: [
     AppHeaderComponent,
diff --git a/ui/src/global.scss b/ui/src/global.scss
index 50915dddbaa..d27e8c37c1c 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -47,6 +47,22 @@ ion-card-content {
     color: var(--ion-card-content-color);
 }
 
+input:-webkit-autofill,
+input:-webkit-autofill:focus {
+    background-color: transparent !important;
+    box-shadow: 0 0 0em 1000em var(--ion-background-color) inset !important;
+    -webkit-text-fill-color: var(--ion-text-color) !important;
+    margin-top: 0.1em;
+}
+
+.custom-ion-popover {
+
+    white-space: inherit;
+
+    // Overwrites default width of popover
+    --min-width: min-content;
+}
+
 .footer-color {
     background-color: var(--ion-color-toolbar-secondary) !important;
 }