diff --git a/docs/Berry-Cookbook.md b/docs/Berry-Cookbook.md
index b17d3dea2f..f7f98bb2fb 100644
--- a/docs/Berry-Cookbook.md
+++ b/docs/Berry-Cookbook.md
@@ -649,9 +649,10 @@ def netflip()
 end
 tasmota.set_timer(30000,netflip)              #4
 ```
+
 1. store variable "eth" with Ethernet status - "true" if Ethernet IP exists and "false" if not
 2. check if wifi status is true and compare to eth status
-3. send command `Wifi` with parameter depending on eth variable. `..` is to concatenate a string. See Berry [manualg(https://github.com/berry-lang/berry/wiki/Chapter-3#-operator-1)
+3. send command `Wifi` with parameter depending on eth variable. `..` is to concatenate a string. See Berry [manual](https://github.com/berry-lang/berry/wiki/Chapter-3#-operator-1)
 4. set a timer to execute the netflip function 30000ms (30 seconds) after loading `autoexec.be`
 
 ## TMP117 Driver
diff --git a/docs/Blinds-and-Shutters.md b/docs/Blinds-and-Shutters.md
index 992bc39757..cde467335c 100644
--- a/docs/Blinds-and-Shutters.md
+++ b/docs/Blinds-and-Shutters.md
@@ -80,7 +80,24 @@ Shutter 0 (Relay:1): Init. Pos: 20000 [100 %], Open Vel.: 100 Close Vel.: 100 ,
 ## Operation
 Turning a device relay on or off directly (i.e., using `Power`) will function to affect a shutter's movement. In momentary mode (i.e., stepper motor), the relays start or stop the motor. The driver takes care of the direction and proper update of the shutter position.
 
-The shutter reports its position and can also be sent to a dedicated position. `ShutterPosition 0` means the shutter is closed and `ShutterPosition 100` means the shutter is open. If you need the position values reversed (`0` = open, `100` = closed), define and [calibrate your shutter as documented below](#calibration). Then tell Tasmota to reverse the shutter position meaning via the `ShutterInvert<x> 1` command. All internal calculations are the same (the log output is the same). Only the interaction with the user and other systems changes. Now `ShutterPosition<x> 0` will open the shutter and `ShutterPosition<x> 100` will close the shutter. To set a value to all shutter you can use the index 0. For example `ShutterPosition0 30` will move all shutters to 30%. The index 0 also works with all configuration items.
+The shutter reports its position and can also be sent to a dedicated position. `ShutterPosition 0` means the shutter is closed and `ShutterPosition 100` means the shutter is open. If you need the position values reversed (`0` = open, `100` = closed), define and [calibrate your shutter as documented below](#calibration). Then tell Tasmota to reverse the shutter position meaning via the `ShutterInvert<x> 1` command. All internal calculations are the same (the log output is the same). Only the interaction with the user and other systems changes. Now `ShutterPosition<x> 0` will open the shutter and `ShutterPosition<x> 100` will close the shutter. 
+
+Function | ShutterInvert 0 | ShutterInvert 1
+-- | -- | --
+Relay 1 | open shutter | open shutter
+Relay 2 | close shutter | close shutter
+Webbutton UP | open shutter | open shutter
+Webbutton DOWN | close shutter | close shutter
+Slider OPEN | open shutter | open shutter
+Slider CLOSE | close shutter | close shutter
+ShutterOpen | open shutter | open shutter
+ShutterClose | close shutter | close shutter
+ShutterPosition 100 | open shutter | close shutter
+ShutterPosition 0 | close shutter | open shutter
+Reported position when open | 100 | 0
+Reported position when close | 0 | 100
+
+To set a value to all shutter you can use the index 0. For example `ShutterPosition0 30` will move all shutters to 30%. The index 0 also works with all configuration items.
 
 When `SetOption80 1` is invoked you have to define `Shutterrelay1 <value>` to get started
 If possible to avoid any injury on unexpected movement all RELAYS should start in OFF mode when the device reboots: `PowerOnState 0`
@@ -178,7 +195,7 @@ Following defaults are pre-compiled into the code and can only be changed by com
 ### Motor Stop time
 When shutters change direction immediatly it can happen that there is a short circuit or at least high moments on the motors. Therfore the default time between a STOP and the next START of the shutter is 0.5s = 500ms. This allows in most cases the shutter to fully stop and then start from a static position. With Version 12.3 you can change the duration through `shuttermotorstop 500` or any other value in ms. The value is for all defined shutters the same.
 
-WARNING: If you control the relay DIRECT through buttons os switches and do not use shutterbuttons or a rule to decouple it, then the MOTOSTOPTIME cannot kick in. The Relay in ON before the shutterdriver can intercept.
+WARNING: If you control the relay DIRECT through buttons or switches and do not use shutterbuttons or a rule to decouple it, then the MOTOSTOPTIME cannot kick in. The Relay is ON before the shutterdriver can intercept.
 
 ### Button Control
 When shutter is running in `ShutterMode 1` (normal two relay up/off down/off), you already have basic control over the shutter movement using switches or buttons in the module configuration to directly drive the shutter relays. For short circuit safe operation `ShutterMode 2` direct control of the relays will not give you a nice user interface since you have to 1st set the direction with one switch/button and 2nd switch on the power by the other switch/button. Because the button controll use multi-press events ensure that the "immediate action" is disabled: `SetOption13 0` (default)
@@ -209,7 +226,7 @@ More advanced control of the button press actions is given by the following `Shu
 
 `ShutterButton<x> <button> <p1> <p2> <p3> <ph> <m1> <m2> <m3> <mh> <mi>` 
 
-`<button>` ESP8266:`1..4`,ESP32:`1..32` : Button number, `0/-`: disable buttons for this shutter<BR>`<p1>` `0..100`: single press position, `t`: toggle, `-`: disable, `--0..100` or `++0..100` single press increment position<BR>`<p2>` `0..100`: double press position, `t`: toggle, `-`: disable, `--0..100` or `++0..100` double press increment position<BR>`<p3>` `0..100`: triple press position, `t`: toggle, `-`: disable, `--0..100` or `++0..100` tripple press increment position<BR>`<ph>` `0..100`: hold press position, shutter stop after releasing the hold button, `t`: toggle, `-`: disable<BR>`<m1>` `1`: enable single press position MQTT broadcast, `0/-`: disable<BR>`<m2>` `1`: enable double press position MQTT broadcast, `0/-`: disable<BR>`<m3>` `1`: enable triple press position MQTT broadcast, `0/-`: disable<BR>`<mh>` `1`: enable hold press position MQTT broadcast, `0/-`: disable<BR>`<mi>` `1`: enable MQTT broadcast to all shutter indices, `0/-`: disable
+`<button>` ESP8266:`1..4`,ESP32:`1..32` : Button number, `0/-`: disable buttons for this shutter<BR>`<p1>` `0..100`: single press position, `t`: toggle, `-`: disable, `--0..100` or `++0..100` single press increment position<BR>`<p2>` `0..100`: double press position, `t`: toggle, `-`: disable, `--0..100` or `++0..100` double press increment position<BR>`<p3>` `0..100`: triple press position, `t`: toggle, `-`: disable, `--0..100` or `++0..100` tripple press increment position<BR>`<ph>` `0..100`: hold press position, shutter stop after releasing the hold button if no group send `<mh>` is defined. If`<mh>` is 1 the release of the botton will NOT stop any shutter, `t`: toggle, `-`: disable<BR>`<m1>` `1`: enable single press position MQTT broadcast, `0/-`: disable<BR>`<m2>` `1`: enable double press position MQTT broadcast, `0/-`: disable<BR>`<m3>` `1`: enable triple press position MQTT broadcast, `0/-`: disable<BR>`<mh>` `1`: enable hold press position MQTT broadcast, `0/-`: disable<BR>`<mi>` `1`: enable MQTT broadcast to all shutter indices, `0/-`: disable
 
 Parameters are optional. When missing, all subsequent parameters are set to `disable`.
 
diff --git a/docs/Bluetooth_MI32.md b/docs/Bluetooth_MI32.md
index 688311f742..329268b959 100644
--- a/docs/Bluetooth_MI32.md
+++ b/docs/Bluetooth_MI32.md
@@ -431,7 +431,7 @@ cbp = tasmota.gen_cb(cb)
 BLE.conn_cb(cbp,cbuf)
 ```
   
-Error codes:
+####Error codes:
 
 - 0 - no error
 - 1 - connection error
@@ -444,7 +444,7 @@ Error codes:
 - 8 - did not write value
 - 9 - timeout: did not read on notify
   
-Op codes:
+####Op codes:
 
 - 1 - read  
 - 2 - write  
@@ -499,21 +499,23 @@ BLE.serv_cb(cbp,cbuf)
 # now add characteristics and advertisement ...
 ```
   
-Command operators:  
-- 201 - add and/or set advertisement data according to the BLE standard, typically chaining small packets in the in the format of `length-type-data`. When called for the first time, will return a bytes buffer, that represents an array of the 16-bit-handles of all characteristics in the order of addition.
-- 202 - add and/or set scan response data, according to the BLE standard which is equally  to the advertisement data. Should be used sparsely.
-- 211 - add and/or set characteristic with value of bytes buffer. For simplicity a `Client Characteristic Configuration Descriptor` (aka 0x2902) will be added on construction of every characteristic and read, write, notification and indication is enabled. You can select write with or without response withe the optional boolean of  `BLE.set_chr(string, bool)`, which defaults to "write with no response". The function call will always trigger a *notification*. As every *characteristic* belongs to a *service*, `BLE.set_svc(string)` must have been called before.  
-  
-Response operators (to client access to the server):
-- 221 - on read of a characteristic, returns no buffer data
-- 222 - on write of a characteristic, returns the written values as byte buffer data
-- 223 - on unsubscribe, returns no buffer data
-- 224 - on subscribe to notifications, returns no buffer data
-- 225 - on subscribe to indications, returns no buffer data
-- 226 - on subscribe to notifications and indications, returns no buffer data
-- 227 - on connect, returns MAC of client device as byte buffer
-- 228 - on disconnect, returns no buffer data
-- 229 - on status, returns error code as byte buffer
+####Command op codes:  
+  
+- 201 - add and/or set advertisement data according to the BLE standard, typically chaining small packets in the in the format of `length-type-data`. When called for the first time, will return a bytes buffer, that represents an array of the 16-bit-handles of all characteristics in the order of addition.  
+- 202 - add and/or set scan response data, according to the BLE standard which is equally  to the advertisement data. Should be used sparsely.  
+- 211 - add and/or set characteristic with value of bytes buffer. For simplicity a `Client Characteristic Configuration Descriptor` (aka 0x2902) will be added on construction of every characteristic and read, write, notification and indication is enabled. You can select write with or without response withe the optional boolean of  `BLE.set_chr(string, bool)`, which defaults to "write with no response". The function call will always trigger a *notification*. As every *characteristic* belongs to a *service*, `BLE.set_svc(string)` must have been called before.    
+  
+####Response op codes (triggered when a client interacts with the server):  
+   
+- 221 - on read of a characteristic, returns no buffer data  
+- 222 - on write of a characteristic, returns the written values as byte buffer data  
+- 223 - on unsubscribe, returns no buffer data  
+- 224 - on subscribe to notifications, returns no buffer data  
+- 225 - on subscribe to indications, returns no buffer data  
+- 226 - on subscribe to notifications and indications, returns no buffer data  
+- 227 - on connect, returns MAC of client device as byte buffer  
+- 228 - on disconnect, returns no buffer data  
+- 229 - on status, returns error code as byte buffer  
  
 
   
diff --git a/docs/Commands.md b/docs/Commands.md
index eaba09ba79..d40c76b5b2 100644
--- a/docs/Commands.md
+++ b/docs/Commands.md
@@ -149,7 +149,7 @@ Power<x\><a class="cmnd" id="power"></a>|Control the corresponding power state (
 PowerOnState<a class="cmnd" id="poweronstate"></a>|Control power state when the device is _**powered up**_. [More information](PowerOnState)<BR> `0` / `OFF` = keep power(s) OFF after power up <BR> `1` / `ON` = turn power(s) ON after power up <BR> `2` / `TOGGLE` = toggle power(s) from last saved state <BR> `3` = switch power(s) to their last saved state *(default)* <BR> `4` = turn power(s) ON and disable further power control <BR> `5` = after a `PulseTime` period turn power(s) ON (acts as inverted [`PulseTime`](Commands.md#pulsetime) mode)
 PulseTime<x\><a class="cmnd" id="pulsetime"></a>|Display the amount of `PulseTime` remaining on the corresponding Relay<x\>(x = `0..31`)<BR>`<value>` Set the duration to keep Relay<x\> `ON` when `Power<x> ON` command is issued. After this amount of time, the power will be turned `OFF`.<BR>`0` / `OFF` = disable use of PulseTime for Relay<x\><BR>`1..111` = set PulseTime for Relay<x\> in 0.1 second increments<BR>`112..64900` = set PulseTime for Relay<x\>, offset by 100, in 1 second increments. Add 100 to desired interval in seconds, e.g., `PulseTime 113` = 13 seconds and `PulseTime 460` = 6 minutes (i.e., 360 seconds)<BR>Note if you have more than 8 relays:<BR>Defined PulseTime for relays <1-8> will also be active for correspondent Relay <9-16>.<BR>
 SwitchDebounce<a class="cmnd" id="switchdebounce"></a>|User control over switch debounce timing and method<BR>`40..1000` = set switch debounce time in milliseconds *(default = `50`)*. The granularity is 10 milliseconds, so the normally unnecessary last digit is used by the debouncing code to flag special handling: <BR> `0` = no special handling <BR> `1` = force_high: only a debounce time long LOW pulse could turn the switch off <BR> `2` = force_low: only a debounce time long HIGH pulse could turn the switch on <BR> `3` = force_high + force_low <BR> `4..8` = unused <BR> `9` = [AC detection](https://tasmota.github.io/docs/Buttons-and-Switches/#ac-frequency-detection-switch) for switches / relays similar to MOES MS-104B / BlitzWolf SS5 etc. If the AC frequency is 50 Hz, `SwitchDebounce 69` will turn on the switch after three pulses and off after three missing one.
-SwitchMode<x\><a class="cmnd" id="switchmode"></a>|[Switch mode](Buttons-and-Switches#switchmode) <BR> `0` = toggle *(default)* <BR> `1` = follow (0 = off, 1 = on) <BR> `2` = inverted follow (0 = on, 1 = off) <BR> `3` = pushbutton (default 1, 0 = toggle) <BR> `4` = inverted pushbutton (default 0, 1 = toggle) <BR> `5` = pushbutton with hold (default 1, 0 = toggle, Hold = hold) <BR> `6` = inverted pushbutton with hold (default 0, 1 = toggle, hold = hold) <BR> `7` = pushbutton toggle (0 = toggle, 1 = toggle)<BR> `8` = multi change toggle (0 = toggle, 1 = toggle, 2x change = hold)<BR> `9` = multi change follow (0 = off, 1 = on, 2x change = hold)<BR> `10` = inverted multi change follow (0 = on, 1 = off, 2x change = hold)<BR> `11` = pushbutton with dimmer mode <BR> `12` = inverted pushbutton with dimmer mode <BR> `13` = pushon mode (1 = on, switch off using `PulseTime`)<BR> `14` = inverted pushon mode (0 = on, switch off using `PulseTime`)<BR> `15` = send only an MQTT message on switch change (`tele/tasmota/SENSOR` with payload `{"Time":"2021-01-01T00:00:00","Switch1":"OFF"}`)<BR> `16` = inverted send only an MQTT message on switch change
+SwitchMode<x\><a class="cmnd" id="switchmode"></a>|[Switch mode](Buttons-and-Switches#switchmode). Index `0` applies to **all** switches.<BR> `0` = toggle *(default)* <BR> `1` = follow (0 = off, 1 = on) <BR> `2` = inverted follow (0 = on, 1 = off) <BR> `3` = pushbutton (default 1, 0 = toggle) <BR> `4` = inverted pushbutton (default 0, 1 = toggle) <BR> `5` = pushbutton with hold (default 1, 0 = toggle, Hold = hold) <BR> `6` = inverted pushbutton with hold (default 0, 1 = toggle, hold = hold) <BR> `7` = pushbutton toggle (0 = toggle, 1 = toggle)<BR> `8` = multi change toggle (0 = toggle, 1 = toggle, 2x change = hold)<BR> `9` = multi change follow (0 = off, 1 = on, 2x change = hold)<BR> `10` = inverted multi change follow (0 = on, 1 = off, 2x change = hold)<BR> `11` = pushbutton with dimmer mode <BR> `12` = inverted pushbutton with dimmer mode <BR> `13` = pushon mode (1 = on, switch off using `PulseTime`)<BR> `14` = inverted pushon mode (0 = on, switch off using `PulseTime`)<BR> `15` = send only an MQTT message on switch change (`tele/tasmota/SENSOR` with payload `{"Time":"2021-01-01T00:00:00","Switch1":"OFF"}`)<BR> `16` = inverted send only an MQTT message on switch change
 SwitchText<x\><a class="cmnd" id="switchtext"></a>|Show current JSON label of `Switch<x>` (`1..8`). Only `SwitchText` shows value for all 8 switches<BR>`<text>` - replace default `Switch<x>` label in JSON messages with a custom text<BR>
 WebButton<x\><a class="cmnd" id="webbutton"></a>|Change the name of the toggle buttons of the WEB UI. This command accepts spaces in the name
 WebQuery<x\><a class="cmnd" id="webquery"></a>|Command for GET, POST, PUT, and PATCH HTTP queries, complete with Request Headers and request body (when applicable)<BR> `<url> GET|POST|PUT|PATCH [<headers>] <body>`<BR>[More information...](https://github.com/arendst/Tasmota/pull/13209)
@@ -159,7 +159,7 @@ See also|[`SetOption1`](#setoption1) - Set button multipress mode<BR>[`SetOption
 
 Command|Parameters
 :---|:---
-Delay<a class="cmnd" id="delay"></a>|`-1,1,2..3600` = set a delay between two backlog commands with 0.1 second increment. `-1` increments to the next second tick, `1` increments with default intercommnd delay of 200ms (changeable with SetOption34) *Not recommended for precision timing!*
+Delay<a class="cmnd" id="delay"></a>|`2..3600` = set a delay between two backlog commands with 0.1 second increment<BR>`-1` = increments to the next second tick<BR>`1` = increments with default intercommand delay of 200ms (changeable with SetOption34) *Not recommended for precision timing!*
 DeepSleepTime<a class="cmnd" id="deepsleeptime"></a>|Time to enter [deep sleep mode](DeepSleep)<BR>`0` = disable deep sleep mode *(default)*<BR>`11..86400` = set deep sleep mode time period in seconds
 DeviceName<a class="cmnd" id="devicename"></a>|Device name displayed in the webUI and used for HA autodiscovery.<br>`<value>` = set device name _(default = `FriendlyName1` value)_
 DspLine<1\|2><a class="cmnd" id="dspline"></a>|For POWR3 Elite and THR3 Elite<br>`2..127` = control message rotation speed on display
@@ -169,6 +169,7 @@ FriendlyName<x\><a class="cmnd" id="friendlyname"></a>|`1` = Reset friendly name
 GPIOs<a class="cmnd" id="gpios"></a>|Show list of available [components](Components#gpio-conversion) by name and index<BR>`255` / `All` Show list of all [components](Components#gpio-conversion) by name and index<BR>
 GPIO<a class="cmnd" id="gpio"></a>|Show current [component](Components#gpio-conversion) assignments of the Module's configurable GPIO<BR>`255` / `All` Show [component](Components#gpio-conversion) assignments for all the devices available GPIO<BR>
 GPIO<x\><a class="cmnd" id="gpiox"></a>|`<component>` = assign a [component](Components) to `Gpio<x>`
+I2CScan0<a class="cmnd" id="i2cscan0"></a>|*ESP32 only* Scan both I<sup>2</sup>C busses and show addresses for found devices 
 I2CScan<a class="cmnd" id="i2cscan"></a>|Scan I<sup>2</sup>C bus and show addresses for found devices
 I2CDriver<a class="cmnd" id="i2cdriver"></a>|Enable / Disable I<sup>2</sup>C sensor drivers. [Read more...](I2CDEVICES)<BR>
 LogHost<a class="cmnd" id="loghost"></a>|`1` = reset [syslog](https://www.sigmdel.ca/michel/ha/rpi/syslog_en.html) host to firmware default (`SYS_LOG_HOST`)<BR>`<value>` = set syslog host
@@ -183,7 +184,7 @@ PWM<x\><a class="cmnd" id="pwm"></a>|`0..1023` = set PWM value for channel (NOTE
 PWMFrequency<a class="cmnd" id="pwmfrequency"></a>|`1` = reset PWM frequency to 223Hz<BR>`40..4000 or 2..50000` = set PWM frequency (40Hz to 4kHz on ESP 82xx / 2Hz to 50kHz on ESP32)<BR>_As of v8.3.0 the default frequency changed to 977Hz_
 PWMRange<a class="cmnd" id="pwmrange"></a>|`1` = reset maximum PWM range to 1023<BR>`255..1023` = set maximum PWM range
 Reset<a class="cmnd" id="reset"></a>|`1` = reset device settings to firmware defaults and restart (see warning below)<BR>`2` = erase flash, reset device settings to firmware defaults and restart<BR> `3` = erase System Parameter Area in flash (Wi-Fi calibration and related data) and restart (see warning below)<BR>`4` = reset device settings to firmware defaults but retain Wi-Fi credentials and restart<BR> `5` = erase all flash and reset parameters to firmware defaults but keep Wi-Fi settings and restart<BR>`6` = erase all flash and reset parameters to firmware defaults but keep Wi-Fi and MQTT settings and restart<BR>*(Erase of flash can take a few seconds to complete and there is no output during the erase process on the serial or web console)*<BR>`99` = reset device bootcount to zero<BR>:warning: For `reset 3`and `reset 1`, device must be power-cycled in order to load new Wifi System parameters.
-Restart<a class="cmnd" id="restart"></a>|`1` = restart device with configuration saved to flash<BR>`2` = halt system (needs hardware reset or power cycle to restart)<BR>`3` = (ESP32 only) restart device into safeboot with configuration saved<BR>`99` = force restart device without configuration save<BR>_For debug and testing stack trace dumps only:_<BR>`-1` = force an Exception (28) crash<BR>`-2` = force a Soft WDT reset (after a freeze of 2 seconds)<BR>`-3` = force an OS watchdog reset (after a freeze of 120 seconds, **caution!**)
+Restart<a class="cmnd" id="restart"></a>|`1` = restart device with configuration saved to flash<BR>`2` = halt system (needs hardware reset or power cycle to restart)<BR>`3` = (ESP32 only) restart device into safeboot with configuration saved<BR>`9` = save all changes and go into deepsleep waiting for a reset<BR>`99` = force restart device without configuration save<BR>_For debug and testing stack trace dumps only:_<BR>`-1` = force an Exception (28) crash<BR>`-2` = force a Soft WDT reset (after a freeze of 2 seconds)<BR>`-3` = force an OS watchdog reset (after a freeze of 120 seconds, **caution!**)
 RtcNtpServer<x\><a class="cmnd" id="rtcntpserver"></a>|Use Tasmota NTP server when enabled by define ``RTC_NTP_SERVER``<BR>`0` = disabled<BR>`1` = enabled
 SaveData<a class="cmnd" id="savedata"></a>|`0` = save parameter changes only manually, e.g. with `Restart 1`<BR>`1` = save parameter changes every second *(default)*<BR>`2..3600` = save parameter changes every x second
 SerialLog<a class="cmnd" id="seriallog"></a>|Disable hardware serial bridge and<BR>`0` =  disable serial logging<BR> `1` = show only error messages<BR> `2` = show error and info messages *(default)*<BR>`3` = show error, info and debug messages<BR>`4` = show error, info and more debug messages<BR>`SerialLog` will be disabled automatically 10 minutes after the device reboots.
@@ -241,9 +242,9 @@ WebSensor<x\><a class="cmnd" id="websensor"></a>|Control display of sensor telem
 Webserver<a class="cmnd" id="webserver"></a>|`0` = stop web server<BR>`1` = start web server in user mode<BR>`2` = start web server in admin mode
 Wifi<a class="cmnd" id="wifi"></a>|`0` = disable Wi-Fi<BR>`1` = enable Wi-Fi _(default)_ <BR>ESP8266 only:<BR>`2` = Wi-Fi mode 802.11b<BR>`3` = Wi-Fi mode 802.11b/g<BR>`4` = Wi-Fi mode 802.11b/g/n<BR> When wifi is Off it is always returned On after a restart except for a wake-up from deepsleep.
 WifiConfig<a class="cmnd" id="wificonfig"></a>|`0` = disable Wi-Fi Manager and reboot (used with alternate AP)<BR>`2` = set [Wi-Fi Manager](https://github.com/tzapu/WiFiManager/blob/master/README.md#how-it-works) as the current configuration tool and start Wi-Fi Manager (web server at 192.168.4.1) for 3 minutes, then reboot and try to connect Wi-Fi network<BR>`4` = retry other AP without rebooting _(default)_<BR>`5` = wait until selected AP is available again without rebooting<BR>`6` = Wi-Fi parameters can only be entered via commands in the serial console<BR>`7` = set [Wi-Fi Manager](https://github.com/tzapu/WiFiManager/blob/master/README.md#how-it-works) (web server at 192.168.4.1) as the current configuration tool restricted to reset settings only. <BR>_This setting is recommended for devices without an external control/reset button_.<BR>&emsp;_No longer supported_ <BR>`1` = set [SmartConfig](https://community.particle.io/t/smart-config-the-missing-manual-now-available/442) ([Android](https://play.google.com/store/apps/details?id=com.iotmaker&hl=en_US)/iOS) for 3 minutes<BR>`3` = set [WPS](https://en.wikipedia.org/wiki/Wi-Fi_Protected_Setup) for 3 minutes
-WifiPower<a class="cmnd" id="wifipower"></a>|set Wi-Fi transmit power level in decibel-milliwatts (dBm) *(default = `17`)*
+WifiPower<a class="cmnd" id="wifipower"></a>|set Wi-Fi transmit power level in decibel-milliwatts (dBm) *(default = `17`)*<BR>`0` = enable dynamic Wi-Fi power based on RSSI<BR>`1` = restore default Wi-Fi power
 WiFiScan<a class="cmnd" id="wifiscan"></a>|`1` = start a network scan. Results will be sent as a JSON payload. [Read more...](https://github.com/arendst/Tasmota/pull/16141)
-WiFiTest<x\><a class="cmnd" id="wifitest"></a>|Only available in AP mode. Test whether the Wi-Fi SSId and Password are correct and Tasmota can connect to the network. `<x>` = `0..2`<BR>&nbsp;&nbsp;`0` = test credentials, if successful save them in SSID slot 1, restart Tasmota<BR>&nbsp;&nbsp;`1` = test credentials, if successful save them in SSID slot 1 without restart<BR>&nbsp;&nbsp;`2` = test credentials, if successful save them in SSID slot 2 without restart<BR>`ssid+password` = credentials used for testing, `+` symbol is the separator since it is not allowed in an SSId name.* [Read more...](https://github.com/arendst/Tasmota/pull/16141)
+WiFiTest<x\><a class="cmnd" id="wifitest"></a>|Only available in AP mode. Test whether the Wi-Fi SSId and Password are correct and Tasmota can connect to the network. `<x>` = `0..3`<BR>&nbsp;&nbsp;`0` = test credentials, if successful save them in SSID slot 1, restart Tasmota<BR>&nbsp;&nbsp;`1` = test credentials, if successful save them in SSID slot 1 without restart<BR>&nbsp;&nbsp;`2` = test credentials, if successful save them in SSID slot 2 without restart<BR>&nbsp;&nbsp;`3` = test credentials without storing anything persistently and without restart<BR>`ssid+password` = credentials used for testing, `+` symbol is the separator since it is not allowed in an SSId name.* [Read more...](https://github.com/arendst/Tasmota/pull/16141)
 See also|[`SetOption55`](#setoption55) - mDNS service control<BR>[`SetOption56`](#setoption56) - Wi-Fi network scan to select strongest signal on restart<BR>[`SetOption57`](#setoption57) - Wi-Fi network re-scan, alternate AP
 
 ### MQTT
@@ -328,6 +329,9 @@ CounterDebounceLow<a class="cmnd" id="counterdebouncelow"></a>|`0` = turn off co
 CounterDebounceHigh<a class="cmnd" id="counterdebouncehigh"></a>|`0` = turn off counter debounce high<BR> `1..32000` = set counter debounce high time in milliseconds. Allow individual debounce times for high pulse widths to discard non valid falling edges. These are checked before legacy CounterDebounce checks distance between two valid falling edges. When unequal zero tasmota will check falling and rising edges on the counter's GPIO. For CounterDebounceHigh any GPIO change from high to low hat happens after the GPIO was not high for at least CounterDebounceHigh will be ignored. As an example you can set `CounterDebounceHigh 100` to allow a valid minimum distance between a rising and falling edge equal to 100ms while having a final CounterDebounce 500 check between to successive valid falling edges equal to 500ms.
 CounterType<x\><a class="cmnd" id="countertype"></a>|`0` = set Counter<x\> as pulse Counter<BR>`1` = set Counter<x\> as pulse Timer
 DhtDelay<x\><a class="cmnd" id="dhtdelay"></a>|`<low_delay>,<high_delay>` = set delay for sensor <x\><BR>`1` = reset sensor <x\> to default
+Driver15<x\><a class="cmnd" id="driver15"></a>|[TBC] for PCA9685
+Driver44<x\><a class="cmnd" id="driver44"></a>|[TBC] for Wemos motors `<command>,<motor>,<direction>{,<duty>}`
+Driver64<x\><a class="cmnd" id="driver64"></a>|[TBC] for PCA9632
 DS18Alias<a class="cmnd" id="ds18alias"></a>|List [DS18x20](DS18x20.md) sensors with full IDs<BR>`<sensor ID>,<n>` = set sensor alias (number)<BR>`<sensor ID>,0` = remove alias
 GlobalHum<a class="cmnd" id="globalhum"></a>|`0.0..100.0` = Set global Humidity for some Sensors that uses global Humidity.
 GlobalHum2<a class="cmnd" id="globalhum2"></a>|`1..250` = select Global Humidity source indexed from teleperiod occurrence data.
@@ -345,6 +349,9 @@ Sensor20<a class="cmnd" id="sensor20"></a>|[Nova Fitness SDS011](SDS011) dust se
 Sensor27<a class="cmnd" id="sensor27"></a>|[APDS-9960](APDS-9960) sensor commands<BR>`0` = enable light level and proximity sensor / disable gestures *(default)* <BR> `1` = enable gesture mode/ disable light level and proximity sensor<BR> `2` = enable gestures with half gain / disable light and proximity sensor<BR>`3..255` = Set [ATIME register](APDS-9960#known-issues) for different integration times
 Sensor29<a class="cmnd" id="sensor29"></a>|MCP23008 / MCP23017 I<sup>2</sup>C GPIO Expander configuration.  [Read more...](MCP230xx)<BR>`Reset<x>` = reset all pins<BR>x = `1..6`<BR>`1` = INPUT mode, no reporting, no pull-up<BR>`2` = INPUT mode, report on CHANGE, pull-up enabled<BR>`3` = INPUT mode, report on LOW, pull-up enabled<BR>`4` = INPUT mode, report on HIGH, pull-up enabled<BR>`5` = OUTPUT mode (if enabled by `#define USE_MCP230xx_OUTPUT`)<BR>`6` = inverted OUTPUT mode (if enabled by `#define USE_MCP230xx_OUTPUT`)<BR><BR>`pin,pinmode{,intpullup|outstate{,repmode}}`<br>[Continue reading...](MCP230xx#device-configuration)
 Sensor34<a class="cmnd" id="sensor34"></a>|<BR>[HX711 load cell](https://github.com/bogde/HX711) sensor calibration. Note that without setting [WeightRes](https://tasmota.github.io/docs/Commands/#weightres) the default resolution is to the nearest 1kg. Set `WeightRes 3` to read fractions of a kilogram. This applies to the JSON payload too.<BR>`1` = reset display to 0<BR>`2` = start calibration<BR>`2` `<value>` = set reference weight in grams and start calibration<BR>`3` = show reference weight in grams<BR>`3` `<value>` = set reference weight in grams<BR>`4` = show calibrated scale value<BR>`4` `<value>` = set calibrated scale value<BR>`5` = show max weight in gram<BR>`5` `<value>` = set max weight in grams<BR>`6` = show single item weight in grams<BR>`6` `<value>` = set single item weight in grams. Once the item weight is set, when items are added to the scale, the telemetry message will report `Count` as the number of items on the scale<BR>`7` = save current weight to be used as start weight on restart (deprecated since v11.0.0.7)<BR>`8` `0/1` <BR>&emsp;`0` = disable JSON message on weight change over 4 grams<BR>&emsp;`1` = enable JSON message on weight change (see below)<BR>`9` `<value>` = set minimum delta to trigger JSON message (see above). <BR>&emsp;`0` = 4 grams (old default)<BR>&emsp;`1..100` = set delta to 0-99 grams<BR>&emsp;`101-255` = set delta to 110-1650 grams (10g increments)
+Sensor36<a class="cmnd" id="Sensor36"></a>|See [MGC3130](MGC3130#commands)
+Sensor40<a class="cmnd" id="Sensor40"></a>|See [PN532](PN532#usage)
+Sensor44<a class="cmnd" id="Sensor44"></a>|See [SPS30](SPS30)
 Sensor50<a class="cmnd" id="Sensor50"></a>|[PAJ7620](PAJ7620) gesture sensor<BR>`0` = sensor muted, no readings in Tasmota<BR>`1`= gesture mode<BR>`2` = proximity mode<BR>`3` = corner mode<br>`4` = PIN mode<br>`5` = cursor mode
 Sensor52<a class="cmnd" id="sensor52"></a>|iBeacon driver with [HM10](HM-10) or [HM17/HM16](HM-17)<BR>`1` and `2` = required only once to initialize the module  <BR>`u<x>` = sets update interval in seconds (scan tags every <x\> seconds) _(default = 10)_<BR>`t<x>` = set timeout interval in seconds (send RSSI=0 if tag is not detected after <x\> seconds) _(default = 30)_<BR>`d1` = enable debug mode (shows all serial traffic in console)<BR>`d0` = disable debug mode_(default = 30)_<BR>`c` = clears iBeacon list<BR>`s AT+<command>`  = send native AT commands
 Sensor53<a class="cmnd" id="sensor53"></a>|[Smart Meter Interface](Smart-Meter-Interface)<BR>`r` = reset the driver with a new descriptor specified with the Tasmota [Scripting](Scripting-Language) language.<BR>`c<x> <value>` = preset counter (x = `1..5`) to `value` when the driver is set to counter mode<BR>`d<x>` = disable data decoding and dump meter (x = `1..5`) data to the Console. This is used to decipher the meter's data format to define the variable encoding in the meter's descriptor.<BR>`d0` = disable data dump mode and revert to decoding mode.<BR>`l<x>` = monitor the serial activity at a GPIO with a connected LED. x = GPIO of the LED.<BR>`l255` = disable monitoring (default)<BR>`m<x>` = serial meter number (x = `1..5`) to be monitored<BR>`m0` = monitor all serial meters (default)
@@ -354,6 +361,8 @@ Sensor68<a class="cmnd" id="sensor68"></a>|WindMeter sensor - Analog (pulse coun
 Sensor78<a class="cmnd" id="sensor78"></a>|EZO sensors - commands<BR>Ascii commands are sent directly to the sensor as-is.  See your specific [EZO device datasheet](https://atlas-scientific.com/#) for the list of commands available.<BR>By default, the specific command is sent to all EZO devices that are found.  If using multiple EZO sensors, and the command should be issued to a single device, the index can be specified as part of the command: Sensor78-# where `#` represent the index of the device (ex: Sensor78-1 i).  For more details please see Tasmota's support for [EZO devices](EZO.md).
 Sensor80<a class="cmnd" id="sensor80"></a>|Set antenna gain for MFRC522 RFID Reader.<BR>Sensor80 1 <0..7><BR>0 18dB<BR>1 23dB<BR>2 18dB<BR>3 23dB<BR>4 33dB<BR>5 38dB<BR>6 43dB<BR>7 48dB
 Sensor90<a class="cmnd" id="sensor90"></a>|Send [commands](https://rainsensors.com/wp-content/uploads/sites/3/2020/07/rg-15_instructions_sw_1.000.pdf) to Hydreon RG-15 Rain Sensor<BR>`A` Reads accumulation data<BR>`R` Read all available data<BR>`K` Restart the rain sensor<BR>`P` Set to polling only mode (not supported)<BR>`C` Set to continuous mode, where data is sent when accumulation changes (default)<BR>`H` Force high resolution<BR>`L` Force low resolution<BR>`I` Force imperial (not supported)<BR>`M` Force metric (default)<BR>`S` Revert to jumper configured values<BR>`O` Reset the accumulation counter
+Sensor95<a class="cmnd" id="Sensor95"></a>|CM110x automatic baseline correction, 1=enable (default), 0=disable
+Sensor96<a class="cmnd" id="Sensor96"></a>|USE_FLOWRATEMETER settings
 SpeedUnit<a class="cmnd" id="SpeedUnit"></a>|[TX20/TX23](TX2x) and WindMeter anemometer speed unit<BR>`1` = m/s<BR>`2`= km/h<BR>`3` = kn<br>`4` = mph<BR>`5` = ft/s<BR>`6` = yd/s
 TempRes<a class="cmnd" id="tempres"></a>|Temperature sensor resolution<BR>`0..3` = maximum number of decimal places
 TempOffset<a class="cmnd" id="tempoffset"></a>|`-12.6..12.6` = Set calibration offset value for reported temperature telemetry<BR>This setting affects **all** temperature sensors on the device.
@@ -368,7 +377,8 @@ See also|[`SetOption8`](#setoption8)  - Show temperature in Celsius *(default)*
 Command|Parameters
 :---|:---
 AmpRes<a class="cmnd" id="ampres"></a>|Current sensor resolution<BR>`0..3` = maximum number of decimal places
-CurrentCal<a class="cmnd" id="currentcal"></a>|<value> `1000..32000` *(default = `3500`)*<BR>Set calibration offset value for reported `Current` telemetry<BR>Allows finer calibration for energy monitoring devices
+BatteryPercentage<a class="cmnd" id="batterypercentage"></a>|<value> `0..101` *(default = `101`= disabled)*<BR>Set the current battery level as a percentage reported by STATE and STATUS11. This can be used to monitor e.g. in `Home Automation" the battery lifetime.<BR>The intended use-case is to generate a rule that calculates the percentage based on e.g. A0 value or something else.
+CurrentCal<a class="cmnd" id="currentcal"></a>|<value> `1000..32000` *(default = `3500`)*<BR>Set calibration offset ry<BR>Allows finer calibration for energy monitoring devices
 CurrentHigh<a class="cmnd" id="currenthigh"></a>|`0` = disable current high threshold *(default)*<BR>`<value>` = set current high threshold value in milliamps
 CurrentLow<a class="cmnd" id="currentlow"></a>|`0` = disable current low threshold *(default)*<BR>`<value>` = set current low threshold value in milliamps
 CurrentSet<x\><a class="cmnd" id="currentset"></a>|`<value>` = [calibrate](Power-Monitoring-Calibration) current to target value in mA<BR>x = `1` or `2` indicating phase
@@ -1035,8 +1045,8 @@ Command|Parameters
 Wc<a class="cmnd" id="wc"></a>|Query all camera settings
 WcAEC<a class="cmnd" id="wcaec"></a>|`1` = enable auto exposure control (sensor), `0` = disable *(default)*
 WcAECDSP<a class="cmnd" id="wcaecdsp"></a>|`1` = enable auto exposure control (DSP), `0` = disable *(default)*
-WcAECLevel<a class="cmnd" id="wcaeclevel"></a>|`-2..+2` = set auto exposure control level
 WcAECValue<a class="cmnd" id="wcaecvalue"></a>|`0..1024` = setauto exposure control value
+WcAELevel<a class="cmnd" id="wcaelevel"></a>|`-2..+2` = set auto exposure control level
 WcAGC<a class="cmnd" id="wcagc"></a>|`1` = enable auto gain control, `0` = disable *(default)*
 WcAGCGain<a class="cmnd" id="wcagcgain"></a>|`0..30` = set auto gain control gain value 
 WcAWB<a class="cmnd" id="wcawb"></a>|`1` = enable Auto White Balance, `0` = disable *(default)*
diff --git a/docs/DS18x20.md b/docs/DS18x20.md
index cf4463266b..7fb6f07f8b 100644
--- a/docs/DS18x20.md
+++ b/docs/DS18x20.md
@@ -67,17 +67,21 @@ Every sensors will get a unique ID used in webUI and MQTT telemetry.
 ```
 
 #### Sensor Aliases
-By default, sensors are named using the `<sensor model>-<n>` scheme (e.g. `DS18B20-1`), where the number is practically random (based on the sensor's address). This means when you add or remove a sensor, the numbers of the sensors change.
+By default, sensors are named using the `<sensor model>-<n>` scheme (e.g. `DS18B20-1`), where the number is practically random (based on the sensor's address). This means when you add or remove a sensor, the numbers of the sensors may change.
 
-To assign static alias to a certain ID, you can use `DS18Alias` command which can be enabled by setting `#define DS18x20_USE_ID_ALIAS` in `user_config_override.h` and [compiling your own](Compile-your-build.md) binary.
+To assign a static alias to a certain ID, you can use `DS18Alias` command. This must be enabled by setting `#define DS18x20_USE_ID_ALIAS` in `user_config_override.h` and then [compile your own binary](Compile-your-build.md).
 
-Then you can run `DS18Alias`, which returns full IDs of all the connected sensors and set a static index by using `DS18Alias <sensor ID>,<n>` command, for example `DS18Alias 113C01F096174528,2`. This will rename the sensors to the `DS18Sens-<n>` scheme, leading to the following output of the `DS18Alias` command:
+To display the full IDs of all connected sensors, run the command `DS18Alias` without any parameters.  
+To set a static index, use the `DS18Alias <sensor ID>,<n>` command. For example `DS18Alias 113C01F096174528,2`. This will rename the sensor to the scheme `DS18Sens-<n>`
+and it leads to the following output of the command `DS18Alias`:
 
 ```json
 {"DS18Sens-2":{"Id":"113C01F096174528"},"DS18Sens-1":{"Id":"783C01F096F2BB28"},"DS18Sens-3":{"Id":"8B0316C310F3FF28"}}
 ```
 
-This is not persistent across reboots, therefore you should add a `System#Boot` [rule](Rules.md) (or [`autoexec.bat`](UFS.md#autoexecbat)) so that your aliases are set again after each boot. For example:
+When you set `<n>` to an alphanumeric value (not starting with a number), the whole name is replaced with the given value. E.g. `DS18Alias 113C01F096174528,Outdoor` 
+
+As this settings are not persistent across reboots, you should add a `System#Boot` [rule](Rules.md) (or an entry in [`autoexec.bat`](UFS.md#autoexecbat)). This will set your aliases again after each boot. For example:
 
 ```
 Rule1 ON System#Boot DO
@@ -87,7 +91,8 @@ DS18Alias 8B0316C310F3FF28,3
 ENDON
 ```
 
-To remove the alias and revert to the default naming, use 0 as the number index `DS18Alias <sensor ID>,0`, for example `DS18Alias 113C01F096174528,0`.
+To remove the alias and return to the default naming scheme, use 0 as the number index: `DS18Alias <sensor ID>,0`  
+For example: `DS18Alias 113C01F096174528,0`
 
 ### Compile Options
 
diff --git a/docs/DeepSleep.md b/docs/DeepSleep.md
index a161b079cb..909bf341bf 100644
--- a/docs/DeepSleep.md
+++ b/docs/DeepSleep.md
@@ -67,6 +67,18 @@ Once device maintenance is completed, place it back into DeepSleep mode using or
    
 ## Rules
 
+!!! example
+    An example of a ruleset which deepsleeps a device with a RTC module attached during a certain portion of the day (i.e. at night). Mem1 is set to wakeup time in the morning (i.e. 540) and Mem2 to sleep time (i.e. 1080). For network attached devices with no RTC module, `time#initialized` trigger is better than `system#init`. Might be smart to have a DeepSleep gpio assigned if you need to access the device outside of normal awake hours.
+    ```
+    rule1 
+    on system#init do backlog event timecheck=%time%; ruletimer1 1 endon
+    on time#minute do event timecheck=%time%; ruletimer1 1 endon
+    on event#timecheck<%mem1% do Var1 3600 endon
+    on event#timecheck>%mem1% do Var1 0 endon
+    on event#timecheck>%mem2% do Var1 3600 endon
+    on rules#timer=1 do deepsleeptime %var1% endon
+    ```
+    
 The following triggers can be used to execute commands upon wake-up or right before entering DeepSleep:
 - `Power1#Boot` : is the earliest trigger. But valid only if you have a `Relay` output defined.
 - `Switch1#Boot` : is the next trigger, also occur very early in the boot process. But valid only if you have `Switch` input defined.
@@ -205,7 +217,8 @@ For this, we consider that:
 
 * the battery level is measured by the ESP ADC with the appropriate voltage divider,
 * the Tasmota ADC mode is set to Range mode,
-* `AdcParams 6` has been used so the range value represent the battery voltage in millivolts   
+* `AdcParams 6` has been used so the range value represent the battery voltage in millivolts
+* There is a `BatteryPercentage` feature that can be feeded by a rule and used here to drive DeepSleep behavior
 
 The below graph represent the adaptation paths we want to follow to adjust DeepSleepTime: one path
 while the level is dropping, another path while the level is rising.
diff --git a/docs/Displays.md b/docs/Displays.md
index 143280db87..9eda1a7484 100644
--- a/docs/Displays.md
+++ b/docs/Displays.md
@@ -679,8 +679,9 @@ AA is device address
 SCL, SDA are the pins used (or * for tasmota definition)  
 IRQ,RST optional IRQ and RST pins
   
-`:TS,CS_PIN`   
+`:TS,CS_PIN,(IRQ_PIN),(BUS Nr)`   
 Defines a touch panel an SPI bus with chip select `CS_PIN` (or *)  
+optionally defines an IRQ_PIN (or -1) and the SPI BUS number  
 
 `:TR` 
 enable simple resistive touch via data lines (e.g. cheap il9341 displays)  
diff --git a/docs/I2S-Audio.md b/docs/I2S-Audio.md
index 40227164ce..51c5572591 100644
--- a/docs/I2S-Audio.md
+++ b/docs/I2S-Audio.md
@@ -51,9 +51,9 @@ Those channels can be driven via the I2S driver when using the “built-in DAC m
 |I2SGain | `0..100` = sets the volume of the audio signal |
 |I2SPlay | `/file.mp3` = plays a .mp3 audio file from the file system, the systems blocks until sound is played<BR>`+/file.mp3` = plays a .mp3 audio file from the file system, sound is played in a separate task not blocking the system|
 |I2SRtttl| `string` = play [Ring Tones Text Transfer Language (RTTTL)](https://www.mobilefish.com/tutorials/rtttl/rtttl_quickguide_specification.html) ringtones (requires defined `USE_I2S_RTTTL`) |
-|I2Say   | `text` = speaks the text you typed (only English language supported)|
+|I2SSay  | `text` = speaks the text you typed (only English language supported)|
 |I2STime | tells current Tasmota time in English (requires defined `USE_I2S_SAY_TIME`)|
-|I2SWr | `url` = starts playing an [mp3 radio](http://fmstream.org/) stream, no blocking (requires defined `USE_I2S_WEBRADIO`)<BR>no parameter = stops playing the stream|
+|I2SWr   | `url` = starts playing an [mp3 radio](http://fmstream.org/) stream, no blocking (requires defined `USE_I2S_WEBRADIO`)<BR>no parameter = stops playing the stream|
 
 ## Audio Input
 
diff --git a/docs/Smart-Meter-Interface.md b/docs/Smart-Meter-Interface.md
index e2373177ff..ed1bd22201 100644
--- a/docs/Smart-Meter-Interface.md
+++ b/docs/Smart-Meter-Interface.md
@@ -420,6 +420,39 @@ Energy provider supplied a PIN code to enable output of additional data.
     #
     ```
 
+### Apator 12EC3
+
+Energy provider supplied a PIN code to enable output of additional data.
+
+??? summary "View script"
+    ```
+    >D
+    >B
+    =>sensor53 r
+    >M 1
+    +1,3,o,0,300,Strom,1,30,2F3F210D0A,063030300D0A
+    1,1.8.0*00(@1,Gesamtverbrauch,KWh,Pges,2
+    1,1.8.1*00(@1,Tagesverbrauch,KWh,Total_day,2
+    1,1.8.2*00(@1,Nachtverbrauch,KWh,Total_night,2
+    1,2.8.0*00(@1,Einspeisung,KWh,Total_out,2
+    #
+    ```
+
+### Apator 12EC3G
+
+No PIN code needed for output data. It can only display total consumption.
+
+??? summary "View script"
+    ```
+    >D
+    >B
+    =>sensor53 r
+    >M 1
+    +1,3,o,0,300,Strom,1,30,2F3F210D0A,063030300D0A
+    1,1.8.0*00(@1,Gesamtverbrauch,KWh,Pges,2
+    #
+    ```
+
 ### Carlo Gavazzi EM340 (MODBUS RTU)
 
 ??? summary "View script"
@@ -1730,6 +1763,24 @@ This is script for a two-direction meter (consumption and delivery) for the Isra
     1,77070100000009ff@#,Service ID,,Meter_id,0|
     #
     ```
+    
+### Iskra eHZ-MT681-D4A52-K0p
+
+2023 Version Zweiwegezähler
+
+??? summary "View script"
+    ```
+    >D
+    >B
+    =>sensor53 r
+    >M 1
+    +1,3,s,0,9600,MT681
+    1,77070100010800ff@1000,Verbrauch,KWh,Total_in,4
+    1,77070100100700ff@1,Leistung,W,Power_cur,0
+    1,77070100020800ff@1000,Erzeugung,KWh,Total_out,4
+    1,77070100000009ff@#,Service ID,,Meter_id,0|
+    #
+    ```
 
 ### Itron (SML V1.04)
     
@@ -1830,6 +1881,7 @@ By default, the KAIFA MB310H4BDE will only deliver the Total_in and Total_out va
     1,77070100020800ff@1000,Zaehlerstand Out,KWh,Total_out,2
     1,77070100100700ff@1,Leistung-akt.,W,Power_curr,0
     1,77070100600100ff@#,Server-ID,,Meter_Number,0
+    #
     ```
 
 ### Kamstrup Multical 4xx / 6xx / 8xx
@@ -3014,12 +3066,12 @@ These heating regulators have a [lot of registers](https://raw.githubusercontent
     >M 1
     +1,3,s,0,9600,SML
     1,77070100010800ff@1000,Total Verbrauch,KWh,Total_in,3
-    1,77070100020800ff@1000,Total Einspeisung,kWh,Total_in,3
+    1,77070100020800ff@1000,Total Einspeisung,kWh,Total_out,3
     1,=h==================
     1,77070100100700ff@1,Actual load,W,Power_curr,0
     1,=h==================
     1,=m 9+10+11 @1,Currents L1+L2+L3,A,Curr_summ,3
-    ;1,=m 12+13+14/#3 @1,Voltage L1+L2+L3/3,V,Volt_avg,3
+    1,=m 12+13+14/#3 @1,Voltage L1+L2+L3/3,V,Volt_avg,3
     1,=h==================
     1,77070100240700ff@1,Consumption P1,W,Power_p1,2
     1,77070100380700ff@1,Consumption P2,W,Power_p2,2
diff --git a/docs/Supported-Peripherals.md b/docs/Supported-Peripherals.md
index 136c326e54..6677f2caf8 100644
--- a/docs/Supported-Peripherals.md
+++ b/docs/Supported-Peripherals.md
@@ -34,8 +34,10 @@ Name|Description|Connection
 DS3502 | Digital potentiometer| I^2^C
 **[EZO](EZO)** | EZO series of chemical Sensors | I^2^C
 **F&F LE-01MR** | F&F LE-01MR Single Phase Modbus Energy meter
-[**GPS-NTP-server**](GPS-NTP-server) | GPS-NTP-server | serial
+[**GDK101**](https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_xsns_sensor/xsns_106_gdk101.ino) | Gamma radiation sensor | I^2^C
 [**GGreg20_V3**](https://github.com/iotdevicesdev/ggreg20-v3-tasmota-esp32-driver) | Ionizing Radiation Detector | gpio _(ESP32 only)_
+[**GM861**](https://github.com/arendst/Tasmota/discussions/18399#discussioncomment-5817001) | Barcode/QR reader | serial
+[**GPS-NTP-server**](GPS-NTP-server) | GPS-NTP-server | serial
 **HDC1080** | Texas Instruments HDC1080 Humidity and Temperature Sensor | I^2^C
 **HDC2010** | Texas Instruments HDC2010 Humidity and Temperature Sensor | I^2^C
 **[HM-10](HM-10)** |  BLE Bluetooth gateway | serial
@@ -48,7 +50,8 @@ DS3502 | Digital potentiometer| I^2^C
 **HRXL** | MaxBotix HRXL line of Sonar Ranging Sensors| gpio
 **[HC-SR04<BR>HC-SR04P<BR>JSN-SR04T)](HC-SR04)** | Ultrasonic Sensor | gpio
 **HM330x** | SeedStudio Grove HM3301 Particulate Matter Sensor | I^2^C
-HLK-LD2410 | 24GHz mmWave Presence Sensor| serial
+[**HMC5883L**](https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_xsns_sensor/xsns_101_hmc5883l.ino) | 3-Axis Digital Compass sensor | I^2^C
+**HLK-LD2410** | 24GHz mmWave Presence Sensor | serial
 **[Honeywell HIH](Honeywell-HIH)** | Temperature and Humidity Sensor| I^2^C
 **Honeywell HPMA115xx** | Particulate Matter Sensor| serial
 **HTU21** | Temperature and Humidity Sensor| I^2^C
@@ -63,10 +66,11 @@ HLK-LD2410 | 24GHz mmWave Presence Sensor| serial
 **K30, K70, S8** | SenseAir CO~2~ Sensors | serial | 
 [**LM75AD**](LM75AD) |  Temperature Sensor | I^2^C
 [**LMT01**](LMT01) | Temperature Sensor | gpio
+[**MAX17043**](https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_xsns_sensor/xsns_110_max17043.ino) | LiPo Fuel Gauge | I^2^C
 **MAX31855**<br>**MAX6675** | Thermocouple Sensor | SPI
 **MAX31865** | RTD Temperature Sensor Amplifier | SPI
 **MAX44009** | Ambient Light Sensor | I^2^C
-[**MCP23008<BR>MCP23017**](MCP230xx) | I/O Expander | I^2^C
+[**MCP23008<BR>MCP23017<BR>MCP23S17**](MCP230xx) | I/O Expander | I^2^C
 **MCP2515** | CAN bus controller | SPI
 [**MCP9808**](MCP9808) |  Temperature Sensor | I^2^C
 [**ME007**](https://github.com/mathias-buder/water-level-measure) | Ultrasonic Distance Sensor | gpio
@@ -87,9 +91,10 @@ HLK-LD2410 | 24GHz mmWave Presence Sensor| serial
 [**PIR**](PIR-Motion-Sensors#am312) | Passive Infrared Sensor| gpio
 [**PCA9557**](PCA9557) | I/O Expander | I^2^C
 [**PCA9685**](PCA9685) | 16-channel, 12-bit PWM LED controller| I^2^C
+[**PCA9632**](https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_xdrv_driver/xdrv_64_pca9632.ino) | 4-channel, 8-bit PWM LED controller| I^2^C
 [**PCF8574(A)**](PCF8574) 8-port I/O Expander | I^2^C
-**PMS3003<BR>[PMS5003](https://www.superhouse.tv/38-diy-air-quality-Sensor-part-1-basic-model/)<BR>PMS7003** | Particle Concentration Sensor | serial
-**PMSx003T** | Particle Concentration, Temperature and Humidity Sensor | serial
+**PMS3003<BR>[PMS5003](https://www.superhouse.tv/38-diy-air-quality-Sensor-part-1-basic-model/)<BR>PMS7003**<BR>**PMSx003T** | Particle Concentration Sensor | serial
+[**PMSA003I**](https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_xsns_sensor/xsns_104_pmsa003i.ino) | Air quality sensor | I^2^C
 [**PN532**](PN532) | NFC/RFID controller
 [**PZEM-004<BR>PZEM-016**](PZEM-0XX) | Energy Monitor| serial
 **QMC5883L** | Magnetic Field sensor | I^2^C
@@ -107,8 +112,10 @@ HLK-LD2410 | 24GHz mmWave Presence Sensor| serial
 **YF-DN50** | Flow rate meter | gpio
 [**SDS011<BR>SDS021**](SDS011) | Laser Dust Sensor
 **SEN0390** |  Ambient Light Sensor| I^2^C
+[**SEN5X**](https://blakadder.com/seeedstudio-grove-all-in-one-environmental-sensor-sen5x/) | All-in-one Environmental Sensor | I^2^C
 **SGP30** | Gas and Air Quality Sensor| I^2^C
 **SGP40** | Gas and Air Quality Sensor| I^2^C
+[**SGP41**](https://github.com/arendst/Tasmota/pull/18880#issue-1757083089) | VOC and NOx Sensor| I^2^C
 **SHT1x** | Temperature and Humidity Sensor| I^2^C
 [**SHT30**](SHT30) | Humidity & Temperature Sensor| I^2^C
 **SHT4x** | Temperature and Humidity Sensor| I^2^C
@@ -119,6 +126,7 @@ HLK-LD2410 | 24GHz mmWave Presence Sensor| serial
 [**SolaX X1**](SolaX-X1) | SolaX Power X1 inverter | serial
 [**SPS30**](SPS30) | Particulate Matter| PM) | Sensor | I^2^C
 **T6703**<BR>**T6713** | Telaire T6700 Series CO~2~ sensor | I^2^C
+[**TC74**](https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_xsns_sensor/xsns_108_tc74.ino) | Temperature Sensor| I^2^C
 [**Téléinfo**](Teleinfo) | French energy measuring system | serial
 **TFMini** | TFmini, TFmini Plus, TFmini Plus (Indoor Version), TFmini-S LiDAR module | serial
 **TM1638** | 8 Switch, LED and 7 Segment Unit Sensor| gpio
diff --git a/docs/Zigbee.md b/docs/Zigbee.md
index beb668d137..d5e070f0db 100644
--- a/docs/Zigbee.md
+++ b/docs/Zigbee.md
@@ -45,7 +45,7 @@ Before using Zigbee with Tasmota, you need to understand a few concepts. Here is
 |**PanID**<BR>(Personal Area Network IDentifier)<BR>This parameter is unique in a Zigbee network (16-bit integer, 0x0000–0x3FFF).<BR>At initial start a pseudo-random PanID is derived from the ESP MAC address.|SSID (the Wi-Fi network name)|
 |**ShortAddr**<BR>Address of the device on the Zigbee network. This address is randomly assigned when the device first connects to the coordinator (16 bits integer, 0x0000–0xFFF7). The coordinator has address 0x0000.<BR>You need to track which device has which address or assign a "Friendly Name" to each new discovered device.|IP address|
 |**GroupAddr**<BR>Group address of a collection of devices, it allows a single message to address multiple devices at once (16 bits integer, 0x0000–0xFFFF). For example a remote can turn on/off a group of lights. GroupAddr 0x0000 is not assigned.|Multicast|
-|**Endpoint**<BR>The endpoint on the coordinator or on the Zigbee device the message is sent from/to. You can see endpoints as logical devices providing distinct features (8 bits integer, 1–240).|IP Port|
+|**Endpoint**<BR>The endpoint on the coordinator or on the Zigbee device the message is sent from/to. You can see endpoints as logical devices providing distinct features (8 bits integer, 1–240).|TCP port|
 |**IEEEAddr**<BR>Device hardware address (64 bits). This is unique per device and factory assigned.|MAC address|
 |**Channel** 11-26<BR>*Default: 11* (See [Zigbee-Wifi coexistence](https://www.metageek.com/training/resources/zigbee-wifi-coexistence.html))|Wi-Fi Channel|
 |**Encryption Key**<BR>128-bit encryption key.<BR>At initial start a pseudo-random Encryption key is derived from the ESP MAC address.|Wi-Fi password|
diff --git a/docs/index.md b/docs/index.md
index 546afab87b..c118cca66d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,7 +15,7 @@ Incredibly expandable and flexible.
 
 [![Latest release](https://img.shields.io/github/downloads/arendst/Tasmota/total.svg?style=flat-square&color=green)](http://ota.tasmota.com/tasmota/release) [![License](https://img.shields.io/github/license/arendst/Tasmota.svg?style=flat-square)](https://github.com/arendst/Tasmota/blob/development/LICENSE.txt) [![Chat](https://img.shields.io/discord/479389167382691863.svg?style=flat-square&color=blueviolet)](https://discord.gg/Ks2Kzd4) [![Donate](https://img.shields.io/badge/donate-PayPal-blue.svg?style=flat-square)](https://paypal.me/tasmota)
 
-<span style="font-size: 1.5rem">Current Release<BR><a href="https://github.com/arendst/Tasmota/releases/tag/v13.0.0">Tasmota 13.0.0 Qasim</a></span>
+<span style="font-size: 1.5rem">Current Release<BR><a href="https://github.com/arendst/Tasmota/releases/tag/v13.1.0">Tasmota 13.1.0 Quentin</a></span>
 
 ## Breaking Changes
 
@@ -23,18 +23,21 @@ Incredibly expandable and flexible.
 - Support dropped for C3 < chip rev. 3. You can still build a [custom binary](https://github.com/arendst/Tasmota/pull/18998) if you wish to ugprade.
 - Change command FileUpload index binary data detection from >199 to >299
 - Matter relay numbering starts at 1 instead of 0 to match Tasmota numbering
+- Berry `bool( [] )` and `bool( {} )` now evaluate as false
+- Berry import strict now detects useless expression without side effects
 
 ## New Features
 
-- Matter support for shutters with tilt, occupancy (via switch), contact, humidity, pressure and illuminance sensors
-- Matter bridge for ESP8266 remote endpoints (experimental)
+- Matter enhancements with option to disable bridge mode, mini-profiler and fabric_filtered request (for Google compatibility)
 - Added support for:
-  - TC74 temperature sensor
-  - GM861 1D and 2D bar code reader
-  - PCA9557 8-bit I/O expander
-  - ST7735 128x160 display
+  - MAX17043 fuel-gauge systems
+  - multiple PCA9685 with extended functionality
+  - SGP41 TVOC/NOx Sensor
+  - DeepSleep battery level percentage
   - support for Zigbee air sensors
-- New commands: [`SetOption152`](Commands.md#setoption152), [`I2cScan0`](Commands.md#i2cscan0)
+- Preparations for Arduino Core v3 and esp-idf v5
+- Removed support in release builds for ESP32-C3 with chip revision below 3 (old development boards)
+- New commands: [`BrRestart`](Commands.md#brrestart), [`I2cScan0`](Commands.md#i2cscan0)
 
 See [release notes](https://github.com/arendst/Tasmota/releases/) for a complete list of new features, changes and bug fixes.